rr 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b7ca60f4fec0c9f87e1710f6b7faf5ed8a1d52d6c8dd7a8ba82667c1ba920d7
-  data.tar.gz: 8c80f469725cc6875ea30384439dc6347e2c998f042c9522eb2c8964a9f7f316
+  metadata.gz: 4ae999de4b35d2e97dd9805d858a1b573cf8201e8bc4a72c57ab2277ba30400e
+  data.tar.gz: 807039ad92e52e43aaad160042ef82e4513ef79d4eb6724c0c4a6c29ffc22b93
 SHA512:
-  metadata.gz: '07490a4037a941546b5b8c2139520d3c0d91d752a73e59cc52ef1bdae2ba2b0579deb57cd202db69eb96b67f89a5c5533699a0f6d439a787f8c999cf10f5bf7d'
-  data.tar.gz: '094e48f18e353e818ed21492f95fdc9fb15c23d01ae17689e0c044f86e6282736a73622451633daf88b04602f31b2848a84996cdd62965be717187dcc1f36b08'
+  metadata.gz: 20c952e868437e27e4904e8e1297844e7f6c301f30ae5b8e8ed22915c5eca4817dec14dd2a8185ed3e154a83b89f3f0789baba6edd38d42a3889bfb2f45bd46c
+  data.tar.gz: f8750bae03dd96e49c7b0d129685ea9c2be4a35d4dee7cdebf6054c6ba99917eed9ba93fe504c2c0241d37c4b8eb2fd37d91afe76d2b3cd9290868f8ee58b9db

data/CHANGES.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 3.0.3 - 2021-06-22
+
+### Improvements
+
+  * Improved keyword arguments support.
+    [GitHub#83][Patch by akira yamada]
+
+### Thanks
+
+  * akira yamada
+
 ## 3.0.2 - 2021-06-18
 
 ### Improvements

data/lib/rr/double_definitions/strategies/strategy.rb

@@ -36,6 +36,8 @@ module RR
           def permissive_argument
             if args.empty? and kwargs.empty?
               definition.with_any_args
+            elsif kwargs.empty?
+              definition.with(*args)
             else
               definition.with(*args, **kwargs)
             end

data/lib/rr/injections/double_injection.rb

@@ -137,7 +137,7 @@ module RR
         id = BoundObjects.size
         BoundObjects[id] = subject_class
 
-        if KeywordArguments.fully_supported?
+        if KeywordArguments.fully_supported? && KeywordArguments.accept_kwargs?(subject_class, method_name)
           subject_class.class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
             def #{method_name}(*args, **kwargs, &block)
               ::RR::Injections::DoubleInjection::BoundObjects[#{id}].class_eval do
@@ -163,7 +163,7 @@ module RR
         id = BoundObjects.size
         BoundObjects[id] = subject_class
 
-        if KeywordArguments.fully_supported?
+        if KeywordArguments.fully_supported? && KeywordArguments.accept_kwargs?(subject_class, method_name)
           subject_class.class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
             def #{method_name}(*args, **kwargs, &block)
               arguments = MethodArguments.new(args, kwargs, block)

data/lib/rr/keyword_arguments.rb

@@ -10,6 +10,12 @@ module RR
           false
         end
       end
+
+      def accept_kwargs?(subject_class, method_name)
+        subject_class.instance_method(method_name).parameters.any? { |t, _| t == :key || t == :keyrest }
+      rescue NameError
+        true
+      end
     end
   end
 end

data/lib/rr/method_dispatches/method_dispatch.rb

@@ -31,7 +31,7 @@ module RR
 
       def call_original_method
         if subject_has_original_method?
-          if KeywordArguments.fully_supported?
+          if KeywordArguments.fully_supported? && !kwargs.empty?
             subject.__send__(original_method_alias_name, *args, **kwargs, &block)
           else
             subject.__send__(original_method_alias_name, *args, &block)
@@ -53,7 +53,7 @@ module RR
           call_original_method
         else
           if implementation
-            if KeywordArguments.fully_supported?
+            if KeywordArguments.fully_supported? && kwargs.empty?
               implementation.call(*args, **kwargs, &block)
             else
               implementation.call(*args, &block)

data/lib/rr/method_dispatches/method_missing_dispatch.rb

@@ -52,7 +52,7 @@ module RR
           if double_injection = Injections::DoubleInjection.find(subject_class, method_name)
             double_injection.bind_method
             # The DoubleInjection takes care of calling double.method_call
-            if KeywordArguments.fully_supported?
+            if KeywordArguments.fully_supported? && !kwargs.empty?
               subject.__send__(method_name, *args, **kwargs, &block)
             else
               subject.__send__(method_name, *args, &block)

data/lib/rr/version.rb

@@ -1,4 +1,4 @@
 module RR
-  VERSION = '3.0.2'.freeze
+  VERSION = '3.0.3'.freeze
   def self.version; VERSION; end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rr
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-18 00:00:00.000000000 Z
+date: 2021-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler