rr 3.0.9 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1053e9c05c201e89415c92c0751d397aeb0cf54c122156b572f92b882ffa24a8
-  data.tar.gz: 197c473a885192c537f2d3eb68aa8e0efb8b3f4a88e089385cf396c7433c214e
+  metadata.gz: 0d71cc71b67af7c0225441915cc94cdd540a8e7a5c4ac697419af1085fc4d668
+  data.tar.gz: 134e2e47decbf840ab066db584a0ebc35806478515844febc7e461da7f7498e7
 SHA512:
-  metadata.gz: 4e90a367b42a7a0a4ef9d68296c0ffa65450b16b2bceb04347210ae15796b90857e42ae3c960a7720808e6cf3172320d985357096ec334aa42b435c98b6ef691
-  data.tar.gz: 856409966ac4f007b3f397c729978b8547c12f924aac17d92d30fc830f1fd6bb0266d228c772cf750aaffae20b3102deb84a7b77a37fc14cafedd2a63d2a2e64
+  metadata.gz: 727be4c51bade728231983816ce4cbb4d95e37adbaffc09c0186c6cdee2589b1aa0fc431c14f5b64772e24a8bdc503da4e641871c3764e528c78fc7efac3845a
+  data.tar.gz: 0f9da75d9ca9e34d98f3bba0dd46efa4a90da791981a76d79c3addb5896da25086909afb3413ecf3af6d9889348c29e6a3c9ee6366b1b993c3081cb8cce0a9da

data/CHANGES.md

@@ -1,5 +1,31 @@
 # 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
@@ -100,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/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/version.rb

@@ -1,4 +1,4 @@
 module RR
-  VERSION = '3.0.9'.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.9
+  version: 3.1.0
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-07 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