rr 3.0.0 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a67997dc1e6efa65e6b99101306915242163d3d6b65f73cec7a1ba2e3dbb3229
-  data.tar.gz: 34ed2995cdf97291cb5f1334737d8fc93dbd9078a420197635a307414d61255c
+  metadata.gz: 9cea7d2ae33f69e834e528cb9a8b19f2797a6f95ee15830381a71fd820bf6770
+  data.tar.gz: acf1f682697811388e6bfdbc4638d1459e5aba2fd57355e07e1fd396c77e613f
 SHA512:
-  metadata.gz: 0bb271fe1108d5b1fc1b35c8c14d1d38bcf2254e9863a7cc48d8e20ca67aabc3ee6d02e8cb9bcd30875c285a3b5c14e3386faa31b7907f04be501678025a5278
-  data.tar.gz: 85641d68043365de3f062ef34164492ba69c5be725b14a12eef75f06895df73a05dbea3d53d196e6f3402d1f4ce108bcc2bdc2b8c65e2bfb015d2f7d7f6bff7c
+  metadata.gz: 63098d8156773c425dc260f79b9a085b523f4bc1a115c80240a6715ef7016918d854520725bb96fca03be105584bf0c377075b512d98f0b4b4ce2eee37aebab0
+  data.tar.gz: 05e8599c14737a96b7250ab84bfb6d09abd13b9d7e5a05556fb379b20ad2af5596083e103fd22a80616eceb41c72f879128a3394cdf0065a011a5670f17e8815

data/CHANGES.md

@@ -1,11 +1,159 @@
 # Changelog
 
+## 3.1.2 - 2025-04-08
+
+### Improvements
+
+  * TruffleRuby: Enabled full keyword argument support.
+
+  * Suppressed a "test is missing assertions" warning reported with
+    Active Support 7.2 or later:
+    * [GH-104](https://github.com/rr/rr/issues/104)
+    * Patch by Erick Guan
+
+### Thanks
+
+  * Erick Guan
+
+## 3.1.1 - 2024-08-30
+
+### Improvements
+
+  * Suppressed a warning:
+    * GH-99
+    * Patch by Kevin Newton
+
+### Thanks
+
+  * Kevin Newton
+
+## 3.1.0 - 2022-07-14
+
+### Improvements
+
+  * Improved CI.
+    [GitHub#89](https://github.com/rr/rr/pull/89)[Patch by Peter Goldstein]
+    [GitHub#90](https://github.com/rr/rr/pull/90)[Patch by mishina]
+    [GitHub#91](https://github.com/rr/rr/pull/91)[Patch by mishina]
+
+  * Improved `wildcard_match?` against `Hash`.
+    [GitHub#94](https://github.com/rr/rr/issues/94)
+    [Reported by kawamotosatoshi]
+
+### Fixes
+
+  * Fixed document.
+    [GitHub#92](https://github.com/rr/rr/pull/92)[Patch by mishina]
+
+### Thanks
+
+  * Peter Goldstein
+
+  * mishina
+
+  * kawamotosatoshi
+
+## 3.0.9 - 2021-12-07
+
+### Improvements
+
+  * Marked TruffleRuby as "keyword arguments aren't fully supported yet".
+
+## 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
+
+  * 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
+
+  * `stub`: Added support for Ruby 3.0's keyword arguments.
+    [GitHub#82][Reported by akira yamada]
+
+### Thanks
+
+  * akira yamada
+
+## 3.0.1 - 2021-06-18
+
+### Improvements
+
+  * Suppressed keyword arguments related warnings on Ruby 2.7.
+    [GitHub#81][Reported by akira yamada]
+
+### Thanks
+
+  * akira yamada
+
 ## 3.0.0 - 2021-03-31
 
 ### Improvements
 
   * Added support for Ruby 3.0's keyword arguments.
-    [GitHub#17][Reported by Takuro Ashie]
+    [GitHub#77][Reported by Takuro Ashie]
 
 ### Fixes
 

data/Gemfile

@@ -1,3 +1,23 @@
-source 'https://rubygems.org'
+# -*- ruby -*-
+
+source "https://rubygems.org"
 
 gemspec
+
+group :development, :test do
+  gem("bundler")
+  gem("rake")
+
+  case ENV["RR_INTEGRATION"]
+  when "minitest"
+    gem("minitest")
+  when "minitest-active-support"
+    gem("activesupport")
+  end
+end
+
+group :test do
+  gem("ostruct")
+  gem("test-unit")
+  gem("test-unit-rr")
+end

data/README.md

@@ -151,6 +151,7 @@ RR is designed and tested to work against the following Ruby versions:
 * 2.5
 * 2.6
 * 2.7
+* 3.0
 * JRuby 1.7.4
 
 as well as the following test frameworks:

data/Rakefile

@@ -7,6 +7,8 @@ require 'pp'
 # build, install, release
 require 'bundler/gem_tasks'
 
+require_relative "lib/rr/version"
+
 default_tasks = []
 
 begin
@@ -40,4 +42,26 @@ task :test do
 end
 default_tasks << :test
 
+namespace :"gh-pages" do
+  namespace :version do
+    desc "Update version"
+    task :update do
+      config_yml_path = "gh-pages/_config.yml"
+      config_yml = File.read(config_yml_path)
+      config_yml = config_yml.gsub(/^version: .*$/, "version: #{RR::VERSION}")
+      File.write(config_yml_path, config_yml)
+    end
+  end
+end
+
 task :default => default_tasks
+
+release_task = Rake.application["release"]
+# We use Trusted Publishing.
+release_task.prerequisites.delete("build")
+release_task.prerequisites.delete("release:rubygem_push")
+release_task_comment = release_task.comment
+if release_task_comment
+  release_task.clear_comments
+  release_task.comment = release_task_comment.gsub(/ and build.*$/, "")
+end

data/lib/rr/core_ext/hash.rb

@@ -2,21 +2,40 @@ class Hash
   def wildcard_match?(other)
     return false unless other.is_a?(Hash)
 
-    other_keys = other.keys
-    return false if keys.size != other_keys.size
+    return false if size != other.size
 
-    other_values = other.values
-    each_with_index do |(key, value), i|
-      if key.respond_to?(:wildcard_match?)
-        return false unless key.wildcard_match?(other_keys[i])
-      else
-        return false unless key == other_keys[i]
-      end
+    wildcards, exacts = partition {|key, _| key.respond_to?(:wildcard_match?)}
+    other = other.dup
+    exacts.each do |key, value|
+      return false unless other.key?(key)
+      other_value = other.delete(key)
       if value.respond_to?(:wildcard_match?)
-        return false unless value.wildcard_match?(other_values[i])
+        return false unless value.wildcard_match?(other_value)
       else
-        return false unless value == other_values[i]
+        return false unless value == other_value
       end
     end
+    # TODO: Add support for the following case:
+    #   {
+    #      is_a(Symbol) => anything,
+    #      is_a(Symbol) => 1,
+    #   }.wildcard_match?(d: 1, c: 3)
+    wildcards.each do |key, value|
+      found = false
+      other.each do |other_key, other_value|
+        next unless key.wildcard_match?(other_key)
+        if value.respond_to?(:wildcard_match?)
+          next unless value.wildcard_match?(other_value)
+        else
+          next unless value == other_value
+        end
+        other.delete(other_key)
+        found = true
+        break
+      end
+      return false unless found
+    end
+
+    true
   end
 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/injections/double_injection.rb

@@ -144,6 +144,7 @@ module RR
             end
             method_missing(:#{method_name}, *args, &block)
           end
+          ruby2_keywords(:#{method_name}) if respond_to?(:ruby2_keywords, true)
         RUBY
         self
       end
@@ -181,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

@@ -3,6 +3,7 @@ module RR
     class MiniTest4
       module Mixin
         def assert_received(subject, &block)
+          self.assertions += 1
           block.call(received(subject)).call
         end
       end
@@ -39,10 +40,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 +64,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
@@ -66,4 +78,3 @@ module RR
     RR.register_adapter MiniTest4
   end
 end
-

data/lib/rr/method_dispatches/base_method_dispatch.rb

@@ -74,12 +74,12 @@ module RR
 
       def extract_subject_from_return_value(return_value)
         case return_value
-          when DoubleDefinitions::DoubleDefinition
-            return_value.root_subject
-          when DoubleDefinitions::DoubleDefinitionCreateBlankSlate
-            return_value.__double_definition_create__.root_subject
-          else
-            return_value
+        when DoubleDefinitions::DoubleDefinition
+          return_value.root_subject
+        when DoubleDefinitions::DoubleDefinitionCreateBlankSlate
+          return_value.__double_definition_create__.root_subject
+        else
+          return_value
         end
       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.0'.freeze
+  VERSION = '3.1.2'.freeze
   def self.version; VERSION; end
 end

data/rr.gemspec

@@ -1,6 +1,5 @@
 # encoding: utf-8
 
-require 'rake'
 require File.expand_path('../lib/rr/version', __FILE__)
 
 Gem::Specification.new do |gem|
@@ -13,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.homepage = 'https://rr.github.io/rr'
   gem.license = 'MIT'
 
-  gem.files = FileList[
+  gem.files = Dir[
     'Appraisals',
     'CHANGES.md',
     'CREDITS.md',
@@ -29,9 +28,4 @@ Gem::Specification.new do |gem|
   ].to_a
 
   gem.require_paths = ['lib']
-
-  gem.add_development_dependency("bundler")
-  gem.add_development_dependency("rake")
-  gem.add_development_dependency("test-unit")
-  gem.add_development_dependency("test-unit-rr")
 end

metadata

@@ -1,73 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: rr
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.2
 platform: ruby
 authors:
 - Kouhei Sutou
 - Brian Takita
 - Elliot Winkler
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-31 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: test-unit-rr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2025-04-07 00:00:00.000000000 Z
+dependencies: []
 description: RR is a test double framework that features a rich selection of double
   techniques and a terse syntax.
 email:
@@ -347,7 +290,6 @@ homepage: https://rr.github.io/rr
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -362,8 +304,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.0.dev
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: RR is a test double framework that features a rich selection of double techniques
   and a terse syntax.