Drop Ruby 2.5 and 2.6 support (#191)

.github/workflows/rubocop.yml

@@ -19,7 +19,7 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6
+        ruby-version: 3.3
         bundler-cache: true
 
     - name: Rubocop run

.github/workflows/test.yml

@@ -16,8 +16,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - ruby: ruby:2.5
-          - ruby: ruby:2.6
           - ruby: ruby:2.7
           - ruby: ruby:3.0
           - ruby: ruby:3.1

.rubocop.yml

@@ -3,7 +3,7 @@ inherit_from: .rubocop_todo.yml
 AllCops:
   NewCops: enable
   SuggestExtensions: false
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.7
   Exclude:
     - 'spec/rails/**/*'
     - 'vendor/**/*'

lib/rspec/openapi/minitest_hooks.rb

@@ -12,7 +12,7 @@ def run(*args)
         file_path = method(name).source_location.first
         human_name = name.sub(/^test_/, '').gsub('_', ' ')
         example = Example.new(self, human_name, {}, file_path)
-        path = RSpec::OpenAPI.path.yield_self { |p| p.is_a?(Proc) ? p.call(example) : p }
+        path = RSpec::OpenAPI.path.then { |p| p.is_a?(Proc) ? p.call(example) : p }
         record = RSpec::OpenAPI::RecordBuilder.build(self, example: example)
         RSpec::OpenAPI.path_records[path] << record if record
       end

lib/rspec/openapi/rspec_hooks.rb

@@ -4,7 +4,7 @@
 
 RSpec.configuration.after(:each) do |example|
   if RSpec::OpenAPI.example_types.include?(example.metadata[:type]) && example.metadata[:openapi] != false
-    path = RSpec::OpenAPI.path.yield_self { |p| p.is_a?(Proc) ? p.call(example) : p }
+    path = RSpec::OpenAPI.path.then { |p| p.is_a?(Proc) ? p.call(example) : p }
     record = RSpec::OpenAPI::RecordBuilder.build(self, example: example)
     RSpec::OpenAPI.path_records[path] << record if record
   end

lib/rspec/openapi/schema_merger.rb

@@ -13,9 +13,9 @@ def merge!(base, spec)
   def normalize_keys(spec)
     case spec
     when Hash
-      spec.map do |key, value|
+      spec.to_h do |key, value|
         [key.to_s, normalize_keys(value)]
-      end.to_h
+      end
     when Array
       spec.map { |s| normalize_keys(s) }
     else

rspec-openapi.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = 'Generate OpenAPI from RSpec request specs'
   spec.homepage      = 'https://github.com/exoego/rspec-openapi'
   spec.license       = 'MIT'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.5.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.7.0')
 
   spec.metadata = {
     'homepage_uri' => 'https://github.com/exoego/rspec-openapi',