diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4dbcedc..04705e4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,13 +4,13 @@ jobs: build: strategy: matrix: - version: ["ruby:3.3", "ruby:3.2", "ruby:3.1"] + version: ["ruby:3.4", "ruby:3.3", "ruby:3.2"] runs-on: ubuntu-latest container: ${{ matrix.version }} steps: - uses: actions/checkout@v2 - name: Bundler cache - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: vendor/bundle key: ${{ runner.os }}-${{ matrix.version }}-bundler-${{ hashFiles('Gemfile.lock') }} diff --git a/.ruby-version b/.ruby-version index a0891f5..f989260 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.3.4 +3.4.4 diff --git a/lib/reynard/context.rb b/lib/reynard/context.rb index d7228ab..7e532b5 100644 --- a/lib/reynard/context.rb +++ b/lib/reynard/context.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'ostruct' - class Reynard # Exposes a public interface to build a request context. class Context diff --git a/lib/reynard/object_builder.rb b/lib/reynard/object_builder.rb index 0d9c599..c802e6f 100644 --- a/lib/reynard/object_builder.rb +++ b/lib/reynard/object_builder.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'ostruct' - class Reynard # Defines dynamic classes based on schema and instantiates them for a response. class ObjectBuilder diff --git a/lib/reynard/specification/finder.rb b/lib/reynard/specification/finder.rb index 6e001e5..773d3a2 100644 --- a/lib/reynard/specification/finder.rb +++ b/lib/reynard/specification/finder.rb @@ -18,7 +18,7 @@ def find_each(&) def find_into(path, &block) data = @specification.dig(*path) - yield path if data.respond_to?(:key?) && (data.key?('type') && (@query.type == data['type'])) + yield path if data.respond_to?(:key?) && data.key?('type') && (@query.type == data['type']) return unless data.respond_to?(:each_key) diff --git a/test/integration/reynard_test.rb b/test/integration/reynard_test.rb index c0a2b74..e945f0d 100644 --- a/test/integration/reynard_test.rb +++ b/test/integration/reynard_test.rb @@ -2,6 +2,8 @@ require_relative '../test_helper' +require 'open3' + module Integration class ReynardTest < Reynard::Test def setup diff --git a/test/support/simple_service.rb b/test/support/simple_service.rb index ea70135..ac9812e 100644 --- a/test/support/simple_service.rb +++ b/test/support/simple_service.rb @@ -1,8 +1,5 @@ # frozen_string_literal: true -require 'open3' -require 'ostruct' - require 'multi_json' require 'webrick' diff --git a/test/test_helper.rb b/test/test_helper.rb index a0172ba..8ef3099 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -8,7 +8,6 @@ require 'minitest/autorun' require 'webmock/minitest' -require 'ostruct' require 'logger' $LOAD_PATH << File.expand_path('../lib', __dir__)