rr 3.0.7 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7690f50ed3d2cb136611f0fe21955d6b29fc8a58be9dabcb7e342034dad13b66
-  data.tar.gz: c3ec0e439daecf5d736042cdd78e550c8e178fd3160bde8d47a1109c9552a68d
+  metadata.gz: 0d71cc71b67af7c0225441915cc94cdd540a8e7a5c4ac697419af1085fc4d668
+  data.tar.gz: 134e2e47decbf840ab066db584a0ebc35806478515844febc7e461da7f7498e7
 SHA512:
-  metadata.gz: ccc4cab0df8cc92fd7e568ed36b392244ede5ef8ec908b01b15ac2d41eaf7d5cd3a8bb9c63f394894e43697d3baf6f326e643337b0286b3b0f02fcd38c11e2e7
-  data.tar.gz: ec16ec1798ed218454263a8bdb3facc5b2b66270ac35aaec3ef683d64cfb58350e223274a938c970a296719c05d163041bf8627651b95268f7cf52dc956792f7
+  metadata.gz: 727be4c51bade728231983816ce4cbb4d95e37adbaffc09c0186c6cdee2589b1aa0fc431c14f5b64772e24a8bdc503da4e641871c3764e528c78fc7efac3845a
+  data.tar.gz: 0f9da75d9ca9e34d98f3bba0dd46efa4a90da791981a76d79c3addb5896da25086909afb3413ecf3af6d9889348c29e6a3c9ee6366b1b993c3081cb8cce0a9da

data/CHANGES.md

@@ -1,5 +1,48 @@
 # Changelog
 
+## 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
@@ -83,7 +126,7 @@
 ### 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,10 @@
 source 'https://rubygems.org'
 
 gemspec
+
+case ENV["RR_INTEGRATION"]
+when "minitest"
+  gem "minitest"
+when "minitest-active-support"
+  gem "activesupport"
+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/integrations/minitest_4.rb

@@ -41,11 +41,11 @@ module RR
 
           if defined?(::ActiveSupport::TestCase)
             is_active_support_test_case = lambda do |target|
-              false
+              target.is_a?(::ActiveSupport::TestCase)
             end
           else
             is_active_support_test_case = lambda do |target|
-              target.is_a?(::ActiveSupport::TestCase)
+              false
             end
           end
 
@@ -53,7 +53,7 @@ module RR
             alias_method :setup_without_rr, :setup
             define_method(:setup_with_rr) do
               setup_without_rr
-              return is_active_support_test_case.call(self)
+              return if is_active_support_test_case.call(self)
               RR.reset
               RR.trim_backtrace = true
               RR.overridden_error_class = assertion_error_class
@@ -63,7 +63,7 @@ module RR
             alias_method :teardown_without_rr, :teardown
             define_method(:teardown_with_rr) do
               begin
-                RR.verify if is_active_support_test_case.call(self)
+                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 <=> "3.0.0") >= 0
+      if (RUBY_VERSION <=> "3.0.0") >= 0 and RUBY_ENGINE != "truffleruby"
         def fully_supported?
           true
         end

data/lib/rr/version.rb

@@ -1,4 +1,4 @@
 module RR
-  VERSION = '3.0.7'.freeze
+  VERSION = '3.1.0'.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',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rr
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.1.0
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-17 00:00:00.000000000 Z
+date: 2022-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -362,7 +362,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.0.dev
+rubygems_version: 3.4.0.dev
 signing_key: 
 specification_version: 4
 summary: RR is a test double framework that features a rich selection of double techniques