Support Ruby 3.0. Fix errors related to the keyword arguments changes

Author: andrykonchin

lib/dynamoid/adapter.rb

@@ -158,8 +158,14 @@ def delete_table(table_name, options = {})
     #
     # @since 0.2.0
     def method_missing(method, *args, &block)
-      return benchmark(method, *args) { adapter.send(method, *args, &block) } if adapter.respond_to?(method)
+      # Don't use keywork arguments delegating (with **kw). It works in
+      # different way in different Ruby versions: <= 2.6, 2.7, 3.0 and in some
+      # future 3.x versions. Providing that there are no downstream methods
+      # with keyword arguments in adapter.
+      #
+      # https://eregon.me/blog/2019/11/10/the-delegation-challenge-of-ruby27.html
 
+      return benchmark(method, *args) { adapter.send(method, *args, &block) } if adapter.respond_to?(method)
       super
     end
 

lib/dynamoid/adapter_plugin/aws_sdk_v3.rb

@@ -12,6 +12,15 @@ module Dynamoid
   # @private
   module AdapterPlugin
     # The AwsSdkV3 adapter provides support for the aws-sdk version 2 for ruby.
+
+    # Note: Don't use keyword arguments in public methods as far as method
+    # calls on adapter are delegated to the plugin.
+    #
+    # There are breaking changes in Ruby related to delegating keyword
+    # arguments so we have decided just to avoid them when use delegation.
+    #
+    # https://eregon.me/blog/2019/11/10/the-delegation-challenge-of-ruby27.html
+
     class AwsSdkV3
       EQ = 'EQ'
       RANGE_MAP = {
@@ -281,7 +290,7 @@ def create_table(table_name, key = :id, options = {})
         false
       end
 
-      def update_time_to_live(table_name:, attribute:)
+      def update_time_to_live(table_name, attribute)
         request = {
           table_name: table_name,
           time_to_live_specification: {

lib/dynamoid/criteria.rb

@@ -15,6 +15,13 @@ module ClassMethods
         #
         # @since 0.2.0
         define_method(meth) do |*args, &blk|
+          # Don't use keywork arguments delegating (with **kw). It works in
+          # different way in different Ruby versions: <= 2.6, 2.7, 3.0 and in some
+          # future 3.x versions. Providing that there are no downstream methods
+          # with keyword arguments in Chain.
+          #
+          # https://eregon.me/blog/2019/11/10/the-delegation-challenge-of-ruby27.html
+
           chain = Dynamoid::Criteria::Chain.new(self)
           if args
             chain.send(meth, *args, &blk)

lib/dynamoid/loadable.rb

@@ -23,7 +23,7 @@ def reload
         options[:range_key] = range_value
       end
 
-      self.attributes = self.class.find(hash_key, options).attributes
+      self.attributes = self.class.find(hash_key, **options).attributes
       @associations.values.each(&:reset)
       self
     end

lib/dynamoid/persistence.rb

@@ -112,7 +112,7 @@ def create_table(options = {})
 
         if created_successfuly && self.options[:expires]
           attribute = self.options[:expires][:field]
-          Dynamoid.adapter.update_time_to_live(table_name: table_name, attribute: attribute)
+          Dynamoid.adapter.update_time_to_live(table_name, attribute)
         end
       end
 

lib/dynamoid/persistence/update_fields.rb

@@ -4,8 +4,8 @@ module Dynamoid
   module Persistence
     # @private
     class UpdateFields
-      def self.call(*args)
-        new(*args).call
+      def self.call(*args, **options)
+        new(*args, **options).call
       end
 
       def initialize(model_class, partition_key:, sort_key:, attributes:, conditions:)

lib/dynamoid/persistence/upsert.rb

@@ -4,8 +4,8 @@ module Dynamoid
   module Persistence
     # @private
     class Upsert
-      def self.call(*args)
-        new(*args).call
+      def self.call(*args, **options)
+        new(*args, **options).call
       end
 
       def initialize(model_class, partition_key:, sort_key:, attributes:, conditions:)

spec/dynamoid/adapter_plugin/aws_sdk_v3_spec.rb

@@ -1224,11 +1224,11 @@ def dynamo_request(table_name, scan_hash = {}, select_opts = {})
         )
         .and_call_original
 
-      Dynamoid.adapter.update_time_to_live(table_name: table_name, attribute: :ttl)
+      Dynamoid.adapter.update_time_to_live(table_name, :ttl)
     end
 
     it 'updates a table schema' do
-      Dynamoid.adapter.update_time_to_live(table_name: table_name, attribute: :ttl)
+      Dynamoid.adapter.update_time_to_live(table_name, :ttl)
 
       response = Dynamoid.adapter.client.describe_time_to_live(table_name: table_name)
       expect(response.time_to_live_description.time_to_live_status).to eq 'ENABLED'

spec/dynamoid/persistence_spec.rb

@@ -416,8 +416,13 @@ def self.dynamoid_field_type
       end
 
       it 'sets up TTL for table' do
+        # Run the spec when a fix in rspec-mock is released
+        # - https://github.com/rspec/rspec-mocks/issues/1306
+        # - https://github.com/rspec/rspec-mocks/pull/1385
+        skip "There is an issue with Ruby 3.0 and rspec-mocks related to keyword arguments"
+
         expect(Dynamoid.adapter).to receive(:update_time_to_live)
-          .with(table_name: class_with_expiration.table_name, attribute: :ttl)
+          .with(class_with_expiration.table_name, :ttl)
           .and_call_original
 
         class_with_expiration.create_table