rematch 1.4.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f699e5e0c1d64349c09caa39f25bbacb14611337ab42a96f648869bebdb76a0c
-  data.tar.gz: ecfb4cca03ca59e1d7e48678cc5a275638b8274afa3ea86e46cb2489fc1baeed
+  metadata.gz: e4215339cb95a5fa7ecc1973a0941c0f25c6246fc13ac9b8df167d84100899db
+  data.tar.gz: 8ff79fd882236eff9ca9c874b9b447f4f8309206a221ce720620d1a31e2f112a
 SHA512:
-  metadata.gz: be3f22dcd4354450f4e540eb1102813b681e0b06a4b241db47be3d4bb56cbb94e26ed0610921e3143ea56e23fff5638bad7c0f0a73f89735bd300bb0eece75d2
-  data.tar.gz: ba28a07503d7ab0f3c8c362a5b7117cddeb8efde244041c5b9e82ba8f5137b5aabbad4166d79870d1c9a336e860da4fad62ad74e856105e84bad6ad0d32f4d63
+  metadata.gz: 30090d94864f2fc45082671d94bef638a9c6611576642c7345c38ae28d72d9cf509832203ecff243a809a944b86db94c8c23aff82d7124710738fc66353cae11
+  data.tar.gz: 63ed9212a5a0d3cddaa0b9d99301d29e4c4fe40abee1e339bb87551898b22502a0e8250c4eb44ef1cdfba9526d774d917978d29a86ce53313ac960b5cbfa812f

data/lib/minitest/rematch_plugin.rb

@@ -23,16 +23,20 @@ module Minitest
   # Reopen the minitest module
   module Assertions
     # Main assertion
-    def assert_rematch(actual, *args)
+    def assert_rematch(key, actual, *args)
       assertion = :assert_equal
       message   = nil
       args.each { |arg| arg.is_a?(Symbol) ? assertion = arg : message = arg }
-      send assertion, @rematch.rematch(actual), actual, message  # assert that the stored value is the same actual value
+      if actual.nil?   # use specific assert_nil after deprecation of assert_equal nil
+        assert_nil @rematch.rematch(key, actual), message
+      else
+        send assertion, @rematch.rematch(key, actual), actual, message  # assert that the stored value is the same actual value
+      end
     end
 
     # Temporarily used to store the actual value, useful for reconciliation of expected changed values
-    def store_assert_rematch(actual, *_args)
-      @rematch.store(actual)
+    def store_assert_rematch(key, actual, *_args)
+      @rematch.store(key, actual)
       # Always fail after storing, forcing the restore of the original assertion/expectation
       raise Minitest::Assertion, '[rematch] the value has been stored: remove the "store_" prefix to pass the test'
     end
@@ -41,7 +45,7 @@ module Minitest
   # Reopen the minitest module
   module Expectations
     # Add the expectations pointing to the assertions
-    infect_an_assertion :assert_rematch, :must_rematch, true # dont_flip
-    infect_an_assertion :store_assert_rematch, :store_must_rematch, true # dont_flip
+    infect_an_assertion :assert_rematch, :must_rematch
+    infect_an_assertion :store_assert_rematch, :store_must_rematch
   end
 end

data/lib/rematch.rb

@@ -5,7 +5,7 @@ require 'fileutils'
 
 # Handles the key/value store for each test
 class Rematch
-  VERSION = '1.4.2'
+  VERSION = '2.1.0'
   EXT     = '.rematch'
 
   @rebuild = false  # rebuild the store?
@@ -29,24 +29,34 @@ class Rematch
     self.class.check_rebuild(path)
     @store = YAML::Store.new(path, true)
     @id    = id
-    @count = 0
   end
 
   # Retrieve the stored value for the current assertion if its key is known; store the value otherwise
-  def rematch(value)
-    key = assertion_key
-    @store.transaction { |s| s.root?(key) ? s[key] : s[key] = value }
+  def rematch(key, value)
+    # key = assertion_key(key)
+    @store.transaction do |s|
+      if s.root?(@id)                # there is the root id
+        if s[@id].key?(key)          # there is the key
+          s[@id][key]                # return it
+        else                         # not such a key
+          s[@id][key] = value        # set
+        end
+      else                           # there is no root yet
+        s[@id] = { key => value }    # the key is the first one
+        value                        # always return the value
+      end
+    end
   end
 
   # Store the value
-  def store(value)
-    @store.transaction { |s| s[assertion_key] = value }
-  end
-
-  private
-
-  # Return the key for the current assertion
-  def assertion_key
-    "[#{@count += 1}] #{@id}"
+  def store(key, value)
+    @store.transaction do |s|
+      if s.root?(@id)                # there is the root id
+        s[@id][key] = value          # set
+      else                           # there is no root yet
+        s[@id] = { key => value }    # the key is the first one
+        value                        # always return the value
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rematch
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-11 00:00:00.000000000 Z
+date: 2024-02-07 00:00:00.000000000 Z
 dependencies: []
 description: Instead of copying and pasting large outputs or big ruby structures into
   all the affected test files every time your code change, you can do it the easy
@@ -38,14 +38,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.5.3
 signing_key: 
 specification_version: 4
 summary: Declutter your test files from large hardcoded data and update them automatically