Update appraisals and handle new ruby versions

.github/workflows/ruby.yml

@@ -24,8 +24,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.7', '3.0', '3.1', '3.2']
-        activerecord: ['6.0', '6.1', '7.0', 'main']
+        ruby-version: ['3.1', '3.2', '3.3']
+        activerecord: ['7.0', '7.1', 'main']
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.activerecord }}.gemfile
     steps:

Appraisals

@@ -1,12 +1,8 @@
-appraise "rails-6.0" do
-  gem 'rails', '~> 6.0'
-end
-
-appraise "rails-6.1" do
-  gem 'rails', '~> 6.1'
+appraise "rails-7.0" do
+  gem 'rails', '~> 7.0'
 end
 
-appraise "rails-7.0" do
+appraise "rails-7.1" do
   gem 'rails', '~> 7.0'
 end
 

active_record-acts_as.gemspec

@@ -1,36 +1,32 @@
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+# frozen_string_literal: true
 
-require 'active_record/acts_as/version'
+require_relative "lib/active_record/acts_as/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "active_record-acts_as"
   spec.version       = ActiveRecord::ActsAs::VERSION
   spec.authors       = ["Hassan Zamani", "Manuel Meurer", "Chedli Bourguiba"]
-  spec.email         = ["[email protected]", "[email protected]", "[email protected]"]
+  spec.email         = ["[email protected]"]
   spec.summary       = %q{Simulate multi-table inheritance for activerecord models}
   spec.description   = %q{Simulate multi-table inheritance for activerecord models using a polymorphic association}
   spec.homepage      = "http://github.com/chaadow/active_record-acts_as"
-  spec.metadata         = { "source_code_uri" => "http://github.com/chaadow/active_record-acts_as" }
+  spec.metadata         = {
+    "homepage_uri"    => "http://github.com/chaadow/active_record-acts_as",
+    "source_code_uri" => "http://github.com/chaadow/active_record-acts_as",
+    "changelog_uri"   => "http://github.com/chaadow/active_record-acts_as/blob/master/CHANGELOG.md",
+    "bug_tracker_uri" => "http://github.com/chaadow/active_record-acts_as/issues"
+  }
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.files         = Dir["README.md", "MIT-LICENSE", "lib/**/*.rb"]
 
-  spec.required_ruby_version = ">= 2.5"
+  spec.required_ruby_version = ">= 3.1"
 
-  spec.add_development_dependency "sqlite3"
-  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rspec", "~> 3"
-  spec.add_development_dependency "psych", "3.3.2"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "appraisal", "~> 2.1"
+  spec.add_development_dependency "appraisal"
   spec.add_development_dependency "guard-rspec", "~> 4.7"
 
   spec.add_dependency "activesupport", ">= 6.0"
   spec.add_dependency "activerecord", ">= 6.0"
-  spec.add_dependency "ruby2_keywords"
 
 end

gemfiles/rails_7.0.gemfile

@@ -4,5 +4,6 @@ source "https://rubygems.org"
 
 gem "coveralls", require: false
 gem "rails", "~> 7.0"
+gem "sqlite3", "~> 1.4"
 
 gemspec path: "../"

gemfiles/rails_6.0.gemfile → gemfiles/rails_7.1.gemfile

@@ -3,6 +3,7 @@
 source "https://rubygems.org"
 
 gem "coveralls", require: false
-gem "rails", "~> 6.0"
+gem "rails", "~> 7.0"
+gem "sqlite3", "~> 1.4"
 
 gemspec path: "../"

gemfiles/rails_main.gemfile

@@ -4,5 +4,6 @@ source "https://rubygems.org"
 
 gem "coveralls", require: false
 gem "rails", github: "rails/rails", branch: "main"
+gem "sqlite3"
 
 gemspec path: "../"

lib/active_record/acts_as/class_methods.rb

@@ -23,9 +23,9 @@ def respond_to_missing?(method, include_private = false)
         acting_as_model.methods_callable_by_submodel.include?(method) || super
       end
 
-      ruby2_keywords def method_missing(method, *args, &block)
+      def method_missing(method, ...)
         if acting_as_model.methods_callable_by_submodel.include?(method)
-          result = acting_as_model.public_send(method, *args, &block)
+          result = acting_as_model.public_send(method, ...)
           if result.is_a?(ActiveRecord::Relation)
             all.joins(acting_as_name.to_sym).merge(result)
           else

lib/active_record/acts_as/instance_methods.rb

@@ -117,9 +117,9 @@ def dup
         duplicate
       end
 
-      ruby2_keywords def method_missing(method, *args, &block)
+      def method_missing(method, ...)
         if !self_respond_to?(method) && acting_as.respond_to?(method)
-          acting_as.send(method, *args, &block)
+          acting_as.send(method, ...)
         else
           super
         end

spec/actable_spec.rb

@@ -49,7 +49,7 @@
 
   it "raises NoMethodError for undefined methods on specific" do
     pen.save
-    expect{ pen.product.raise_error }.to raise_error(NoMethodError, /undefined method `non_existant_method' for #<Pen/)
+    expect{ pen.product.raise_error }.to raise_error(NoMethodError, /undefined method `non_existant_method' for /)
   end
 
   it "deletes specific subclass on destroy" do