rematch 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18b629b32aa8af9d7c9218946f7467630f68e639930942b44a94f5bea4c77f8a
-  data.tar.gz: a49dbb4d655e006ab36147a0b94b6b6d125c436f148e2d4dcf876a621ec6f274
+  metadata.gz: 75263525e5c9f837c2308c800c6ddd0fa8efa1472dc32aaca3eab36d4ba20990
+  data.tar.gz: 734123f5f1ea481c6d1d8c31cddfa074483e5dbd7289e6f8965f33a724b0eb46
 SHA512:
-  metadata.gz: 8c80817ea424ed8be19329fb01bb6d13a027eedf6aa5e3d20175fec32b5e6413eb4fb311f1fbae0c7fbe64a28f0ed90a00b2ab45199d064ac703d67f2af25dad
-  data.tar.gz: e2fbe2c78ae7c19f06412256485b14f4511f0c790586943c31aa6cf3a2a1bff7d7da66d1406470069645490a6af0ef89a870896c34fcca02f19774cf815ec509
+  metadata.gz: 3c54c23fd47f85a99f53c3d7deead137ce5b5fcfaa2559ce957c440f2f142246091fde3aa1b6a0407029377519f28751c45ce0f42a8abd02c035843121a857d3
+  data.tar.gz: d3f5337a74934922e9d889564dc67f18be1a7371a2c24df4699cedb764df30c5278cca25b7872192235c4b4a93b4f044cfbe6393ef4e12bcfa769d7f06dda3bd

data/lib/minitest/rematch_plugin.rb

@@ -30,19 +30,26 @@ module Minitest
   module Assertions
     # Main assertion
     def assert_rematch(actual, *args)
+      # Extract options (id) if present
+      opts      = args.last.is_a?(Hash) && args.last.key?(:id) ? args.pop : {}
+      id        = opts[:id]
       assertion = :assert_equal
       message   = nil
       args.each { |arg| arg.is_a?(Symbol) ? assertion = arg : message = arg }
       if actual.nil?   # use specific assert_nil after deprecation of assert_equal nil
-        assert_nil @rematch.rematch(actual), message
+        assert_nil @rematch.rematch(actual, id: id), message
       else
-        send assertion, @rematch.rematch(actual), actual, message  # assert that the stored value is the same actual value
+        # assert that the stored value is the same actual value
+        send assertion, @rematch.rematch(actual, id: id), actual, message
       end
     end
 
     # Temporarily used to store the actual value, useful for reconciliation of expected changed values
-    def store_assert_rematch(actual, *_args)
-      @rematch.rematch(actual, overwrite: true)
+    def store_assert_rematch(actual, *args)
+      opts = args.last.is_a?(Hash) && args.last.key?(:id) ? args.pop : {}
+      id   = opts[:id]
+
+      @rematch.rematch(actual, overwrite: true, id: id)
       # 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
@@ -53,6 +60,6 @@ module Minitest
     expectation_class.infect_an_assertion :assert_rematch, :must_rematch, :reverse
     expectation_class.alias_method :to_rematch, :must_rematch # to use with expect().to_rematch
     expectation_class.infect_an_assertion :store_assert_rematch, :store_must_rematch, :reverse
-    expectation_class.alias_method :store_to_rematch, :store_must_rematch # to use with expect().store_to_rematch
+    expectation_class.alias_method :store_to_rematch, :store_must_rematch
   end
 end

data/lib/rematch.rb

@@ -6,7 +6,7 @@ require_relative 'rematch/store'
 
 # Handles the key/value store for each test
 class Rematch
-  VERSION = '4.0.0'
+  VERSION = '4.1.0'
   CONFIG  = { ext: '.yaml' }  # rubocop:disable Style/MutableConstant
 
   @rebuild      = false  # rebuild the store?
@@ -36,8 +36,8 @@ class Rematch
   end
 
   # Retrieve the stored value for the current assertion if its key is known; store the value otherwise
-  def rematch(value, overwrite: nil)
-    key = assertion_key
+  def rematch(value, overwrite: nil, id: nil)
+    key = assertion_key(id)
     @store.transaction do |s|
       if s.root?(key) && !overwrite       # there is the key and not overwrite
         s[key]                            # return it
@@ -51,8 +51,7 @@ class Rematch
   end
 
   def store_warning(key)
-    warn "Rematch stored new value for: #{key.inspect}\n#{@store.path}\n\n" \
-    unless Rematch.skip_warning
+    warn "Rematch stored new value for: #{key.inspect}\n#{@store.path}\n\n" unless Rematch.skip_warning
   end
 
   protected
@@ -64,10 +63,10 @@ class Rematch
 
   private
 
-  # Generate the key based on the line number and test ID
-  def assertion_key
+  # Generate the key based on the line number, optional id, and test ID
+  def assertion_key(id)
     line = caller_locations.find { |l| l.path == @path }&.lineno
-    "L#{line} #{@id}"
+    %(L#{line}#{" [#{id}]" if id} #{@id})
   end
 
   # Ensure the keys are sorted by the order of the tests in the file
@@ -88,7 +87,7 @@ class Rematch
     end
     # Extract all data
     data = store.roots.to_h { |key| [key, store.delete(key)] }
-    # Re-add data in the correct order, filter orphans and sort
+    # Re-add data in the correct order, filter orphans, and sort
     data.select { |key, _| valid_ids.include?(key.split.last) }
         .sort_by { |key, _| key[/L(\d+)/, 1].to_i }
         .each { |key, value| store[key] = value }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rematch
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Domizio Demichelis