canon 0.3.37 → 0.3.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc8ab08578b3b1ceed40cb8f14ee8e83fdb116d26214a4a546789108950802dc
-  data.tar.gz: 435c4f9300160c8b502b8441096b2eea9aec0e182f025e84789f8f0fd492451d
+  metadata.gz: dc55555287eb70fb4fc5201029aea89c2af55d8a9df26549d1d17b639a6de5de
+  data.tar.gz: 59ac3ba881495f29ee1355eda305da05d03d62a5611aa738404bf029f66d1721
 SHA512:
-  metadata.gz: a9c49d99613a801415eec95e663caa577319e9c4ce63546c1708c0599c891289e225c415279131c2652f83e9cec17b225c15f0bbc620da1a1237cc321eb2d381
-  data.tar.gz: fa8e1ea33c6527b7a215c0b8e097f4266d3db0cc00e865bc39c883b8b3de8a8683533beb66bccf1538d89059aeb348a716c5c1d9fb2b4eefd14d257b23cc993c
+  metadata.gz: 6b2d535b82b40ece128bea902b603b1b43c06c7bf4f40535f651e3b43c24674345de4e0c0767380fd6fc50d2986dc80ecf0e2c1b2d5286a7dd02524d65641920
+  data.tar.gz: '09af782d9c914502a54ca9b961448c89502bb20c3cffa93ec9268b7afc72099bcea2dcc2f7f8e36ccbf7fd6a6f8e3320ced5b7edfd67f7d70d0f5f95e7cf8d85'

data/lib/canon/comparison/ruby_object_comparator.rb

@@ -29,9 +29,7 @@ module Canon
         # difference exists (strict key_order compares insertion
         # order, which keys == keys preserves). Most object pairs in
         # similar documents hit this and skip the path-building walk.
-        if obj1 == obj2 && (!obj1.is_a?(Hash) || obj1.keys == obj2.keys)
-          return Comparison::EQUIVALENT
-        end
+        return Comparison::EQUIVALENT if deep_equal?(obj1, obj2)
 
         case obj1
         when Hash
@@ -68,8 +66,16 @@ module Canon
         # Sort keys if order should be ignored (based on match options)
         match_opts = opts[:match_opts]
         if match_opts && match_opts[:key_order] != :strict
-          keys1 = keys1.sort_by(&:to_s)
-          keys2 = keys2.sort_by(&:to_s)
+          # Identical key arrays: one sort replaces two (the sorted
+          # forms are trivially equal, and the set algebra below
+          # degenerates — missing/extra empty, common = the sorted
+          # keys themselves).
+          if keys1 == keys2
+            keys1 = keys2 = keys1.sort_by(&:to_s)
+          else
+            keys1 = keys1.sort_by(&:to_s)
+            keys2 = keys2.sort_by(&:to_s)
+          end
         elsif match_opts && match_opts[:key_order] == :strict
           # Strict mode: key order matters
           # Check if keys are in same order
@@ -85,8 +91,8 @@ module Canon
         end
 
         # Check for missing keys
-        missing_in_second = keys1 - keys2
-        missing_in_first = keys2 - keys1
+        missing_in_second = keys1 == keys2 ? EMPTY_KEYS : keys1 - keys2
+        missing_in_first = keys1 == keys2 ? EMPTY_KEYS : keys2 - keys1
 
         missing_in_second.each do |key|
           key_path = path.empty? ? key.to_s : "#{path}.#{key}"
@@ -102,13 +108,19 @@ module Canon
 
         has_missing_keys = !missing_in_first.empty? || !missing_in_second.empty?
 
-        # Compare common keys
-        common_keys = keys1 & keys2
+        # Compare common keys. The path string is built lazily: deep-equal
+        # pairs (the overwhelming majority in similar documents) answer
+        # equivalent without ever needing it.
+        common_keys = keys1 == keys2 ? keys1 : keys1 & keys2
         all_equivalent = true
         common_keys.each do |key|
+          value1 = hash1[key]
+          value2 = hash2[key]
+          next if deep_equal?(value1, value2)
+
           key_path = path.empty? ? key.to_s : "#{path}.#{key}"
-          result = compare_objects(hash1[key], hash2[key], opts,
-                                   differences, key_path)
+          result = compare_objects(value1, value2, opts, differences,
+                                   key_path)
           all_equivalent = false unless result == Comparison::EQUIVALENT
         end
 
@@ -138,6 +150,8 @@ module Canon
         all_equivalent = true
         arr1.each_with_index do |elem1, index|
           elem2 = arr2[index]
+          next if deep_equal?(elem1, elem2)
+
           elem_path = "#{path}[#{index}]"
           result = compare_objects(elem1, elem2, opts, differences,
                                    elem_path)
@@ -166,6 +180,16 @@ module Canon
         end
       end
 
+      # Deep-equal with identical key order — compare_objects returns
+      # EQUIVALENT without consulting the path for such pairs, which
+      # is what makes lazy path construction in the hash/array walks
+      # behavior-identical.
+      def self.deep_equal?(obj1, obj2)
+        obj1 == obj2 && (!obj1.is_a?(Hash) || obj1.keys == obj2.keys)
+      end
+
+      EMPTY_KEYS = [].freeze
+
       # Add a Ruby object difference
       #
       # @param path [String] Path to the difference

data/lib/canon/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Canon
-  VERSION = "0.3.37"
+  VERSION = "0.3.38"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canon
 version: !ruby/object:Gem::Version
-  version: 0.3.37
+  version: 0.3.38
 platform: ruby
 authors:
 - Ribose Inc.