rr 3.0.2 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b7ca60f4fec0c9f87e1710f6b7faf5ed8a1d52d6c8dd7a8ba82667c1ba920d7
-  data.tar.gz: 8c80f469725cc6875ea30384439dc6347e2c998f042c9522eb2c8964a9f7f316
+  metadata.gz: 82a39c0be764a7469ef744b7d1ad4628b515e036013928623104e3876e70b01b
+  data.tar.gz: 78167900a5154d427ec6e0416f3ed740a79b92d3f24b85d4682acd34013b0f4d
 SHA512:
-  metadata.gz: '07490a4037a941546b5b8c2139520d3c0d91d752a73e59cc52ef1bdae2ba2b0579deb57cd202db69eb96b67f89a5c5533699a0f6d439a787f8c999cf10f5bf7d'
-  data.tar.gz: '094e48f18e353e818ed21492f95fdc9fb15c23d01ae17689e0c044f86e6282736a73622451633daf88b04602f31b2848a84996cdd62965be717187dcc1f36b08'
+  metadata.gz: d07f274243be2338d218a19ff6ce448012875ad75f10eb9a29027b3a029b4541675d3cf92c4dd6cf5886a01abfb131ad39274a602c901f1cae9a04cf690cb0a2
+  data.tar.gz: febd48a6b12d689603d6f9ad9c31f97b034399b1227352b15acccd6d7b15f90496058f189c5290c0acb0510d35279656f06923f763da296cb539a5c3d682c332

data/CHANGES.md

@@ -1,5 +1,49 @@
 # Changelog
 
+## 3.0.6 - 2021-08-07
+
+### Improvements
+
+  * `assert_received`: Add support for keyword arguments.
+    [GitHub#86][Reported by imadoki]
+
+### Thanks
+
+  * imadoki
+
+## 3.0.5 - 2021-06-26
+
+### Improvements
+
+  * Improved keyword arguments support on Ruby 2.7.
+    [GitHub#85][Patch by akira yamada]
+
+### Thanks
+
+  * akira yamada
+
+## 3.0.4 - 2021-06-23
+
+### Fixes
+
+  * Fix inverted condition in keyword arguments related code.
+    [GitHub#84][Patch by akira yamada]
+
+### Thanks
+
+  * akira yamada
+
+## 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/double_definition_create_blank_slate.rb

@@ -22,6 +22,7 @@ module RR
         def method_missing(method_name, *args, &block)
           @double_definition_create.call(method_name, args, {}, &block)
         end
+        ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
       end
 
       def __double_definition_create__

data/lib/rr/injections/double_injection.rb

@@ -137,25 +137,15 @@ module RR
         id = BoundObjects.size
         BoundObjects[id] = subject_class
 
-        if KeywordArguments.fully_supported?
-          subject_class.class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-            def #{method_name}(*args, **kwargs, &block)
-              ::RR::Injections::DoubleInjection::BoundObjects[#{id}].class_eval do
-                remove_method(:#{method_name})
-              end
-              method_missing(:#{method_name}, *args, **kwargs, &block)
+        subject_class.class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
+          def #{method_name}(*args, &block)
+            ::RR::Injections::DoubleInjection::BoundObjects[#{id}].class_eval do
+              remove_method(:#{method_name})
             end
-          RUBY
-        else
-          subject_class.class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-            def #{method_name}(*args, &block)
-              ::RR::Injections::DoubleInjection::BoundObjects[#{id}].class_eval do
-                remove_method(:#{method_name})
-              end
-              method_missing(:#{method_name}, *args, &block)
-            end
-          RUBY
-        end
+            method_missing(:#{method_name}, *args, &block)
+          end
+          ruby2_keywords(:#{method_name}) if respond_to?(:ruby2_keywords, true)
+        RUBY
         self
       end
 
@@ -192,6 +182,7 @@ module RR
                 arguments.block
               )
             end
+            ruby2_keywords(:#{method_name}) if respond_to?(:ruby2_keywords, true)
           RUBY
         end
         self

data/lib/rr/injections/method_missing_injection.rb

@@ -106,6 +106,7 @@ module RR
                 ).call
               end
             end
+            ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
           METHOD
         end
       end

data/lib/rr/keyword_arguments.rb

@@ -1,7 +1,7 @@
 module RR
   module KeywordArguments
     class << self
-      if (RUBY_VERSION <=> "2.7.0") >= 0
+      if (RUBY_VERSION <=> "3.0.0") >= 0
         def fully_supported?
           true
         end

data/lib/rr/space.rb

@@ -22,6 +22,7 @@ module RR
         def method_missing(method_name, *args, &block)
           instance.__send__(method_name, *args, &block)
         end
+        ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
       end
     end
 

data/lib/rr/spy_verification.rb

@@ -1,9 +1,9 @@
 module RR
   class SpyVerification
-    def initialize(subject, method_name, args)
+    def initialize(subject, method_name, args, kwargs)
       @subject = subject
       @method_name = method_name.to_sym
-      set_argument_expectation_for_args(args)
+      set_argument_expectation_for_args(args, kwargs)
       @ordered = false
       once
     end
@@ -44,9 +44,17 @@ module RR
   protected
     attr_writer :times_matcher
 
-    def set_argument_expectation_for_args(args)
-      # with_no_args and with actually set @argument_expectation
-      args.empty? ? with_no_args : with(*args)
+    def set_argument_expectation_for_args(args, kwargs)
+      if args.empty? and kwargs.empty?
+        # with_no_args and with actually set @argument_expectation
+        with_no_args
+      else
+        if KeywordArguments.fully_supported?
+          with(*args, **kwargs)
+        else
+          with(*args)
+        end
+      end
     end
 
     def install_method_callback(return_value_block)

data/lib/rr/spy_verification_proxy.rb

@@ -5,9 +5,16 @@ module RR
     def initialize(subject)
       @subject = subject
     end
-  
-    def method_missing(method_name, *args, &block)
-      SpyVerification.new(@subject, method_name, args)
-    end  
+
+    if KeywordArguments.fully_supported?
+      def method_missing(method_name, *args, **kwargs, &block)
+        SpyVerification.new(@subject, method_name, args, kwargs)
+      end
+    else
+      def method_missing(method_name, *args, &block)
+        SpyVerification.new(@subject, method_name, args, {})
+      end
+      ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
+    end
   end
-end
+end

data/lib/rr/version.rb

@@ -1,4 +1,4 @@
 module RR
-  VERSION = '3.0.2'.freeze
+  VERSION = '3.0.6'.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.6
 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-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler