rr 3.0.4 → 3.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 303d118de2a2762d0b82b84ce5074540e77008a95805fb0b3b8df64872e3bb26
-  data.tar.gz: 84a6e68fae515e2c5c1e6bed26dd55cbfba98e846e54d03b353266acb681a056
+  metadata.gz: 7450b7a3e656ff288e54d65cd2c9b899229706d72637a6e7b6944451b311bbe2
+  data.tar.gz: 44d9fa9e2e2f39809320e5d93819df20261dc6ad4ee83ec7e3fba9c81a03aa7f
 SHA512:
-  metadata.gz: c5b89becb9e9df041c472826206c92e0c9b9b6755246ce8e0c6bd84b81b5cb498c77222aaf22dbaa20f55b3315483dff85dd3b910f2ef16a0b4405d51c697dc9
-  data.tar.gz: f590f980d6fb93a5c173efe8a0f85676402262bd4fcec944e9804602f2372426b2a78cd9e2120569520667e9eaf213e72cb70c5db08d62373bee831a2f75387e
+  metadata.gz: ce0dc401f91fd48daeace9aabcc745e9d8f99a27362a82c890cfef326b21f465c826fcad5990f5f4b9f7a1757d5634431b2bdf71c9c6d02d319fc4ca3f9c2c99
+  data.tar.gz: acc8046b8610d2b35571414f736d58ba2e9dcfecf0b59da715c50f972bafbe839c4b627cee6e5d42fa023dd6ab7b2d7b645384f33a4f45c70af79f4e5fc64150

data/CHANGES.md

@@ -1,5 +1,50 @@
 # Changelog
 
+## 3.0.8 - 2021-10-17
+
+### Fixes
+
+  * Minitest integration: Fixed a bug that `NameError` is raised.
+    [GitHub#88][Reported by Matijs van Zuijlen]
+
+### Thanks
+
+  * Matijs van Zuijlen
+
+## 3.0.7 - 2021-08-17
+
+### Fixes
+
+  * Minitest + Active Support integration: Fixed a bug that `stub` in
+    `setup {...}` is ignored.
+    [GitHub#87][Reported by Boris]
+
+### Thanks
+
+  * Boris
+
+## 3.0.6 - 2021-08-07
+
+### Improvements
+
+  * `assert_received`: Added 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

data/Gemfile

@@ -1,3 +1,10 @@
 source 'https://rubygems.org'
 
 gemspec
+
+case ENV["RR_INTEGRATION"]
+when "minitest"
+  gem "minitest"
+when "minitest-active-support"
+  gem "activesupport"
+end

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/double_definitions/strategies/strategy.rb

@@ -36,8 +36,6 @@ 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,25 +137,15 @@ module RR
         id = BoundObjects.size
         BoundObjects[id] = subject_class
 
-        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
-                remove_method(:#{method_name})
-              end
-              method_missing(:#{method_name}, *args, **kwargs, &block)
-            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)
+        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
-        end
+            method_missing(:#{method_name}, *args, &block)
+          end
+          ruby2_keywords(:#{method_name}) if respond_to?(:ruby2_keywords, true)
+        RUBY
         self
       end
 
@@ -163,7 +153,7 @@ module RR
         id = BoundObjects.size
         BoundObjects[id] = subject_class
 
-        if KeywordArguments.fully_supported? && KeywordArguments.accept_kwargs?(subject_class, method_name)
+        if KeywordArguments.fully_supported?
           subject_class.class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
             def #{method_name}(*args, **kwargs, &block)
               arguments = MethodArguments.new(args, kwargs, block)
@@ -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/integrations/minitest_4.rb

@@ -39,10 +39,21 @@ module RR
           include RR::DSL
           include Mixin
 
+          if defined?(::ActiveSupport::TestCase)
+            is_active_support_test_case = lambda do |target|
+              target.is_a?(::ActiveSupport::TestCase)
+            end
+          else
+            is_active_support_test_case = lambda do |target|
+              false
+            end
+          end
+
           unless instance_methods.any? { |method_name| method_name.to_sym == :setup_with_rr }
             alias_method :setup_without_rr, :setup
             define_method(:setup_with_rr) do
               setup_without_rr
+              return if is_active_support_test_case.call(self)
               RR.reset
               RR.trim_backtrace = true
               RR.overridden_error_class = assertion_error_class
@@ -52,7 +63,7 @@ module RR
             alias_method :teardown_without_rr, :teardown
             define_method(:teardown_with_rr) do
               begin
-                RR.verify
+                RR.verify unless is_active_support_test_case.call(self)
               ensure
                 teardown_without_rr
               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
@@ -10,12 +10,6 @@ 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? && !kwargs.empty?
+          if KeywordArguments.fully_supported?
             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? && !kwargs.empty?
+            if KeywordArguments.fully_supported?
               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? && !kwargs.empty?
+            if KeywordArguments.fully_supported?
               subject.__send__(method_name, *args, **kwargs, &block)
             else
               subject.__send__(method_name, *args, &block)

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.4'.freeze
+  VERSION = '3.0.8'.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.4
+  version: 3.0.8
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-23 00:00:00.000000000 Z
+date: 2021-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler