Support Ruby 3

.github/workflows/CI.yml

@@ -12,8 +12,9 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - '2.6'
+          - '3.0'
           - '2.7'
+          - '2.6'
         activerecord:
           - '6.1'
           - '6.0'

lib/amountable.rb

@@ -119,6 +119,7 @@ def where(opts, *rest)
         super
       end
     end
+    ruby2_keywords :where if Module.private_method_defined?(:ruby2_keywords)
 
     def where_json(opts, *rest)
       values = []
@@ -136,6 +137,7 @@ def where_json(opts, *rest)
       query = [query.join(' AND ')] + values
       where(query, *rest).where(opts, *rest)
     end
+    ruby2_keywords :where_json if Module.private_method_defined?(:ruby2_keywords)
 
     def pg_json_field_access(name, field = :cents)
       name = name.to_sym

lib/amountable/table_methods.rb

@@ -19,15 +19,15 @@ def set_amount(name, value)
       amount.value
     end
 
-    def save(args = {})
+    def save(**args)
       ActiveRecord::Base.transaction do
-        save_amounts if super(args)
+        save_amounts if super
       end
     end
 
-    def save!(args = {})
+    def save!(**args)
       ActiveRecord::Base.transaction do
-        save_amounts! if super(args)
+        save_amounts! if super
       end
     end
 

spec/support/database.rb

@@ -1,11 +1,17 @@
 # Copyright 2015-2021, Instacart
 
+require "activerecord-import/import"
+
 db_name = ENV['DB'] || 'postgresql'
 spec_dir = Pathname.new(File.dirname(__FILE__)) / '..'
 database_yml = spec_dir.join('internal/config/database.yml')
 
 fail "Please create #{database_yml} first to configure your database. Take a look at: #{database_yml}.sample" unless File.exist?(database_yml)
 
+module ActiveRecord::Import::Connection
+  ruby2_keywords :establish_connection if Module.private_method_defined?(:ruby2_keywords)
+end
+
 ActiveRecord::Migration.verbose = false
 ActiveRecord::Base.default_timezone = :utc
 ActiveRecord::Base.configurations = YAML.load_file(database_yml)