canon 0.3.48 → 0.3.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcfa53c5436e38941e6c789536bf9c268fb5b587930aeaca6020c22993def0a2
-  data.tar.gz: a814221d4dd934e35f8f6eb1169f8694fadf2e2fd60e49a9f8f61e6355ff9853
+  metadata.gz: 8f3f2bed07760530a3f122f18e184ac0e925db9d6551bacc46ef896552fb79ce
+  data.tar.gz: 4de5e38b9be98f354a843bb3fdd1c725534fab28f6078cbf95a7c278d0c2596b
 SHA512:
-  metadata.gz: 1ac2772108ab1d9cae92a479a98c94cbc02bff2a431a64e3dc9052ff4df5ec595a38c81849c3d9ddc1c1329b6a86bdfbb7d3aeae6b5bbacfa2d6d8d283acc0a6
-  data.tar.gz: 7794b9a9392eaa18bb43b85ec7a2e830d3c0f172bfd827e13b7e3f6290c82cb6b3491312090f8230671c1a7442e722a7c1b3d66a44398965b89ab4664ec11a4d
+  metadata.gz: '002904526d2626e462005b4a3627540a1d6587c458b60adb871ad03134054485c2712707579106f727fa00066b213d8db903f96be5d695470aed08ec82157461'
+  data.tar.gz: 537566ace8ff29b3124bbd9fd2789250d95d539de60b0e8ba89a3d5ebf83dee871fe0e7525d8d76381286f8adf71886957a3c4a29b1887f861fc0201b44bd862

data/lib/canon/diff/diff_node_enricher.rb

@@ -41,6 +41,11 @@ module Canon
         # Track occurrences for text_content dimension to find correct element instance
         @text_occurrence1 = Hash.new(0)
         @text_occurrence2 = Hash.new(0)
+        # Opener-offset caches: one scan per unique element name per
+        # document replaces the per-call regex walk (which was also
+        # quadratic on repeated element names).
+        @opener_offsets1 = {}
+        @opener_offsets2 = {}
       end
 
       def enrich
@@ -1461,27 +1466,44 @@ range_start, range_end)
       # tag (no inside-the-element correction — see
       # locate_element_at_index).
       def count_elements_before_position_open(text, char_offset, opener)
-        count = 0
-        pos = 0
-        while (hit = text.index(opener, pos)) && hit < char_offset
-          count += 1
-          pos = hit + 1
-        end
-        count
+        count_openers_before(opener_offsets(text, opener), char_offset)
       end
 
       def count_elements_before_position(text, char_offset, element_name)
-        # Index loop instead of copying the prefix per call — the
-        # copy was O(offset) on every occurrence check.
-        opener = /<#{element_name}[>\s]/
-        count = 0
+        # Subtract 1 because the count includes the element we are inside
+        [count_openers_before(opener_offsets(text, opener_for(element_name)),
+                              char_offset) - 1, 0].max
+      end
+
+      # Count of opener offsets strictly before char_offset — binary
+      # search over the cached, ascending offset array.
+      def count_openers_before(offsets, char_offset)
+        idx = offsets.bsearch_index { |offset| offset >= char_offset }
+        idx || offsets.length
+      end
+
+      # All opener offsets for one opener regex in one document,
+      # cached per text (one linear scan per unique element name per
+      # document — callers previously re-scanned per occurrence
+      # check, which was also quadratic on repeated element names).
+      def opener_offsets(text, opener)
+        if text.equal?(@text1)
+          (@opener_offsets1[opener.source] ||= scan_opener_offsets(text, opener))
+        elsif text.equal?(@text2)
+          (@opener_offsets2[opener.source] ||= scan_opener_offsets(text, opener))
+        else
+          scan_opener_offsets(text, opener)
+        end
+      end
+
+      def scan_opener_offsets(text, opener)
+        offsets = []
         pos = 0
-        while (hit = text.index(opener, pos)) && hit < char_offset
-          count += 1
+        while (hit = text.index(opener, pos))
+          offsets << hit
           pos = hit + 1
         end
-        # Subtract 1 because the count includes the element we are inside
-        [count - 1, 0].max
+        offsets
       end
     end
   end

data/lib/canon/version.rb

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

metadata

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