canon 0.3.58 → 0.3.59

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1b3bba3210fd3ca95a66a4a3e439f6b9e1a0f95b30ddf4d90f4069a2b5a6d8b
-  data.tar.gz: fadf6bdf8fb892fbb3998d53754f599b17fac80b099936d77a7dae0881e4f5c5
+  metadata.gz: 59a766120de370a517050c389b3ec809574e8e0f876b6a9b3ae351386cfc7333
+  data.tar.gz: 6a64cdc990d0d295645ec1f893e37da8b03858c06a2b3992d0e00926d04c939b
 SHA512:
-  metadata.gz: e551b02b98c802c3d2593c1f684c89d271b223892fb32dbd20f186fe6cb13e06d18bd079839298325eb1d8a798b962876af9c95177763268ae291fc503828552
-  data.tar.gz: 8485c2e7e3049386ff977fca9c4162b44d439a2c218067f3aefe4a3b596d0f351b60c0c18a7f9fd0d5bcbf77192a0525c84dac7c1b35fe7f92369737f6dc2308
+  metadata.gz: 0f659e6d2708dc675e2bc0df68eb57773ca16224083249e95a9906b1f7d967c92a917882f73a810490ca3b11c228afb9b581d1ceb80b0dc674d98d46014aba42
+  data.tar.gz: 974a7dfa4cdcacb21e76952c193160022ecd83de6887b4a5582c60d5853feb5c89a3e69be559ef36484c37a8f9228da1cad8a9168829d23b3e096d51d09fca6d

data/lib/canon/tree_diff/core/matching.rb

@@ -215,9 +215,10 @@ module Canon
 
           # Check prefix closure constraint
           # If ancestors are matched, they must be matched to each other
-          node1.ancestors.each_with_index do |anc1, idx|
+          ancestors1 = node1.ancestors
+          anc2_ancestors = node2.ancestors
+          ancestors1.each_with_index do |anc1, idx|
             # Get corresponding ancestor in tree2
-            anc2_ancestors = node2.ancestors
             return false if idx >= anc2_ancestors.size
 
             anc2 = anc2_ancestors[idx]

data/lib/canon/tree_diff/core/node_signature.rb

@@ -81,34 +81,7 @@ module Canon
         #
         # @return [Array<String>] Path components
         def compute_path
-          # Build path from root to node
-          ancestors = @node.ancestors.reverse
-          components = ancestors.map do |ancestor|
-            path_component(ancestor)
-          end
-
-          # Add the node itself
-          components << path_component(@node)
-
-          components
-        end
-
-        # Get path component for a node
-        #
-        # @param node [TreeNode] Node to get component for
-        # @return [String]
-        def path_component(node)
-          # For element nodes: use label with sorted attributes
-          # For text nodes: use "#text"
-          # CRITICAL: Text nodes should use "#text" not "text"
-          # Check the label - actual text nodes have no label or label == "text"
-          label_str = node.label.to_s.downcase
-          if node.label.nil? || label_str.empty? || label_str == "#text" || label_str == "text"
-            "#text"
-          else
-            # Memoized on the node — see TreeNode#signature_component.
-            node.signature_component(include_attributes: @include_attributes)
-          end
+          @node.signature_path(include_attributes: @include_attributes)
         end
 
         # Compute signature string from path

data/lib/canon/tree_diff/core/tree_node.rb

@@ -66,6 +66,20 @@ module Canon
           end
         end
 
+        # Signature path components from root to this node, built by
+        # parent chaining (see NodeSignature). Memoized per variant —
+        # signatures previously re-walked the ancestor chain per node.
+        #
+        # @param include_attributes [Boolean]
+        # @return [Array<String>]
+        def signature_path(include_attributes: true)
+          if include_attributes
+            @signature_path_attrs ||= build_signature_path(true)
+          else
+            @signature_path ||= build_signature_path(false)
+          end
+        end
+
         # Check if this is a leaf node (no children)
         #
         # @return [Boolean]
@@ -77,7 +91,21 @@ module Canon
         # text value participates in the signature (see NodeSignature).
         WHITESPACE_SENSITIVE_TAGS = %w[pre code textarea script style].freeze
 
+        def build_signature_path(include_attributes)
+          component = signature_component(include_attributes: include_attributes)
+          if parent
+            parent.signature_path(include_attributes: include_attributes) + [component]
+          else
+            [component]
+          end
+        end
+
         def build_signature_component(include_attributes)
+          label_str = label.to_s.downcase
+          if label.nil? || label_str.empty? || label_str == "#text" || label_str == "text"
+            return "#text"
+          end
+
           component = label.to_s
 
           # Sorted attributes distinguish same-label nodes while
@@ -95,7 +123,7 @@ module Canon
 
           component
         end
-        private :build_signature_component
+        private :build_signature_component, :build_signature_path
 
         # Check if this is a text node (leaf with value)
         #

data/lib/canon/tree_diff/matchers/hash_matcher.rb

@@ -118,11 +118,19 @@ module Canon
 
         def subtrees_match?(node1, node2)
           return false unless nodes_match?(node1, node2)
-          return false unless node1.children.size == node2.children.size
 
-          node1.children.zip(node2.children).all? do |child1, child2|
-            subtrees_match?(child1, child2)
+          children1 = node1.children
+          children2 = node2.children
+          return false unless children1.size == children2.size
+
+          index = 0
+          while index < children1.size
+            return false unless subtrees_match?(children1[index],
+                                                children2[index])
+
+            index += 1
           end
+          true
         end
 
         def nodes_match?(node1, node2)
@@ -142,6 +150,11 @@ module Canon
           return true if (text1.nil? || text1.empty?) && (text2.nil? || text2.empty?)
           return false if (text1.nil? || text1.empty?) || (text2.nil? || text2.empty?)
 
+          # Identical raw text is equivalent under every mode — skips
+          # the gsub normalization for the overwhelmingly common
+          # matched-leaf case.
+          return true if text1 == text2
+
           norm1 = normalize_text(text1)
           norm2 = normalize_text(text2)
           return true if norm1.empty? && norm2.empty?

data/lib/canon/version.rb

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

metadata

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