From 460ee6a7126ce6ea7cea4163866d7ba1ec646f67 Mon Sep 17 00:00:00 2001 From: Manfred Stienstra Date: Sat, 12 Jul 2025 13:36:03 +0200 Subject: [PATCH 1/6] Bump development version to 3.4.4. --- .ruby-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 4e547c92e81921f3729eef2dad7fca9be5772adc Mon Sep 17 00:00:00 2001 From: Manfred Stienstra Date: Sat, 12 Jul 2025 13:36:49 +0200 Subject: [PATCH 2/6] Add Ruby 3.4 to and remove Ruby 3.1 from text matrix. --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4dbcedc..c3086c6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,7 +4,7 @@ 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: From 750c53cc54b8846f1301751b427ae036a75c716b Mon Sep 17 00:00:00 2001 From: Manfred Stienstra Date: Sat, 12 Jul 2025 13:37:20 +0200 Subject: [PATCH 3/6] Don't require unused ostruct. --- lib/reynard/context.rb | 2 -- lib/reynard/object_builder.rb | 2 -- test/support/simple_service.rb | 1 - test/test_helper.rb | 1 - 4 files changed, 6 deletions(-) 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/test/support/simple_service.rb b/test/support/simple_service.rb index ea70135..fcdfab5 100644 --- a/test/support/simple_service.rb +++ b/test/support/simple_service.rb @@ -1,7 +1,6 @@ # 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__) From 6d9391012a215962190c4eda751d9a6093065f52 Mon Sep 17 00:00:00 2001 From: Manfred Stienstra Date: Sat, 12 Jul 2025 13:37:41 +0200 Subject: [PATCH 4/6] Require open3 in the file that uses it. --- test/integration/reynard_test.rb | 2 ++ test/support/simple_service.rb | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) 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 fcdfab5..ac9812e 100644 --- a/test/support/simple_service.rb +++ b/test/support/simple_service.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'open3' - require 'multi_json' require 'webrick' From 5d483ec6986af105243356baff6967d83d9da9c3 Mon Sep 17 00:00:00 2001 From: Manfred Stienstra Date: Sat, 12 Jul 2025 13:38:49 +0200 Subject: [PATCH 5/6] [RuboCopo] Remove redundant parentheses. --- lib/reynard/specification/finder.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) From d71a1b574a32e4b321dfb6a55393f39843ee0a32 Mon Sep 17 00:00:00 2001 From: Manfred Stienstra Date: Sat, 12 Jul 2025 13:40:09 +0200 Subject: [PATCH 6/6] Use actions/cache@v4 on CI. --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c3086c6..04705e4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,7 +10,7 @@ jobs: 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') }}