canon 0.3.52 → 0.3.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e699f814a8d0944cf2cef44825a9d417302adf157a7672ee3d94974a372b8ade
-  data.tar.gz: ef0e376d61027009a26ba783cb71ab5bedf0efc947cfea7a2b465d5504b32597
+  metadata.gz: c8094be0b06c7cd2a74e5e5fa4085f2a3ac654c54ed9ec106fcfa930490d4d11
+  data.tar.gz: 71c81085b65c0648b059a9d6a4d12663d71867b2f032f42e6ed95df2c38fcb26
 SHA512:
-  metadata.gz: d0ef1400915d857311938307896e5e276bf3fb56088f98716218d2d92d82429f0b5864f4e24ce35eb0a99d249ed04c862b948de6483269df9cd21879845827d2
-  data.tar.gz: 5d95e02de1d7eb031a15f41a5705414cebd8360fc9bbaec0b1f90a34b1fb0689d504c3c5f258b3de7b66d91951b2889e2ad5dbc1d75d3485eb6d5f15e8588114
+  metadata.gz: 2a2401a1455182a4c4dc9b553fdbc51f6d63b4a9153ecf99f248bbf42fe43ac2f1ee801df0e22e52aebd1d4bfbecd0409e39d35e4fa02f440de7c674ccb44777
+  data.tar.gz: 894d3d399acd98b30c8dbd6da4fcce1915f12355347e5df6f77373c37fc7a9d7a2cfd21bbafbe53617d4ab6eb0e37a0820091ce61850554da25b5741a25945e1

data/lib/canon/comparison/comparison_result.rb

@@ -5,12 +5,14 @@ module Canon
     # Encapsulates the result of a comparison operation
     # Provides methods to query equivalence based on normative diffs
     class ComparisonResult
-      attr_reader :differences, :preprocessed_strings, :format, :html_version,
-                  :match_options, :algorithm, :original_strings,
+      attr_reader :differences, :format, :html_version,
+                  :match_options, :algorithm,
                   :parse_errors_expected, :parse_errors_received
 
       # @param differences [Array<DiffNode>] Array of difference nodes
-      # @param preprocessed_strings [Array<String, String>] Pre-processed content for display
+      # @param preprocessed_strings [Array<String, String>, Proc] Pre-processed
+      #   content for display, or a Proc returning the Array (materialized on
+      #   first read)
       # @param format [Symbol] Format type (:xml, :html, :json, :yaml)
       # @param html_version [Symbol, nil] HTML version (:html4 or :html5) for HTML format only
       # @param match_options [Hash, nil] Resolved match options used for comparison
@@ -23,7 +25,7 @@ html_version: nil, match_options: nil, algorithm: :dom, original_strings: nil,
 parse_errors_expected: nil, parse_errors_received: nil)
         @differences = differences
         @preprocessed_strings = preprocessed_strings
-        @original_strings = original_strings || preprocessed_strings
+        @original_strings = original_strings
         @format = format
         @html_version = html_version
         @match_options = match_options
@@ -32,6 +34,28 @@ parse_errors_expected: nil, parse_errors_received: nil)
         @parse_errors_received = Array(parse_errors_received)
       end
 
+      # Display strings for the compared inputs. When the comparator
+      # supplied a builder Proc (the display strings require serializing
+      # both parsed documents), materialization is deferred to the first
+      # read: by_object consumers never pay it, by_line and preprocessed
+      # display trigger it exactly once.
+      #
+      # @return [Array<String, String>]
+      def preprocessed_strings
+        unless @preprocessed_strings.is_a?(Array)
+          @preprocessed_strings = @preprocessed_strings.call
+        end
+        @preprocessed_strings
+      end
+
+      # Unprocessed input strings; falls back to the preprocessed pair
+      # when the comparator did not provide originals.
+      #
+      # @return [Array<String, String>]
+      def original_strings
+        @original_strings || preprocessed_strings
+      end
+
       # Whether either side reported parse errors.  Used by the diff
       # formatter to decide whether to render the parse-error banner.
       #
@@ -147,8 +171,8 @@ show_diffs: :all, diff_mode: :separate, legacy_terminal: false)
         formatter.format(
           self,
           @format,
-          doc1: @preprocessed_strings[0],
-          doc2: @preprocessed_strings[1],
+          doc1: preprocessed_strings[0],
+          doc2: preprocessed_strings[1],
           html_version: @html_version,
         )
       end

data/lib/canon/comparison/html_comparator.rb

@@ -131,8 +131,10 @@ module Canon
           if opts[:verbose]
             ComparisonResult.new(
               differences: differences,
-              preprocessed_strings: [serialize_for_display(node1),
-                                     serialize_for_display(node2)],
+              preprocessed_strings: lambda do
+                [serialize_for_display(node1),
+                 serialize_for_display(node2)]
+              end,
               original_strings: [original_str1, original_str2],
               format: :html,
               html_version: html_version,

data/lib/canon/comparison/json_comparator.rb

@@ -44,12 +44,16 @@ module Canon
                                                         differences, "")
 
           if opts[:verbose]
-            json_str1 = obj1.is_a?(String) ? obj1 : JSON.pretty_generate(obj1)
-            json_str2 = obj2.is_a?(String) ? obj2 : JSON.pretty_generate(obj2)
+            preprocessed = lambda do
+              [
+                obj1.is_a?(String) ? obj1 : JSON.pretty_generate(obj1),
+                obj2.is_a?(String) ? obj2 : JSON.pretty_generate(obj2),
+              ]
+            end
 
             ComparisonResult.new(
               differences: differences,
-              preprocessed_strings: [json_str1, json_str2],
+              preprocessed_strings: preprocessed,
               format: :json,
               match_options: match_opts_hash,
             )

data/lib/canon/comparison/xml_comparator.rb

@@ -131,11 +131,14 @@ module Canon
 
           if opts[:verbose]
             # Serialize parsed nodes for consistent formatting
-            # This ensures both sides formatted identically, showing only real differences
-            preprocessed = [
-              serialize_node(node1).gsub("><", ">\n<"),
-              serialize_node(node2).gsub("><", ">\n<"),
-            ]
+            # This ensures both sides formatted identically, showing only real
+            # differences. Deferred: by_object consumers never read these.
+            preprocessed = lambda do
+              [
+                serialize_node(node1).gsub("><", ">\n<"),
+                serialize_node(node2).gsub("><", ">\n<"),
+              ]
+            end
 
             ComparisonResult.new(
               differences: differences,
@@ -181,16 +184,16 @@ module Canon
         def build_trivial_equivalent_result(n1, n2, opts)
           return true unless opts[:verbose]
 
-          # Parse nodes for verbose display
-          preserve_whitespace = true
-          node1 = parse_node(n1, :none,
-                             preserve_whitespace: preserve_whitespace)
-          node2 = parse_node(n2, :none,
-                             preserve_whitespace: preserve_whitespace)
-          preprocessed = [
-            serialize_node(node1).gsub("><", ">\n<"),
-            serialize_node(node2).gsub("><", ">\n<"),
-          ]
+          # Parse nodes for verbose display — deferred with the strings:
+          # nothing but the display pair ever reads them.
+          preprocessed = lambda do
+            [
+              serialize_node(parse_node(n1, :none,
+                                        preserve_whitespace: true)).gsub("><", ">\n<"),
+              serialize_node(parse_node(n2, :none,
+                                        preserve_whitespace: true)).gsub("><", ">\n<"),
+            ]
+          end
           original1 = n1.is_a?(String) ? n1 : serialize_node(n1)
           original2 = n2.is_a?(String) ? n2 : serialize_node(n2)
 

data/lib/canon/comparison/yaml_comparator.rb

@@ -69,13 +69,17 @@ module Canon
                                                         differences, "")
 
           if opts[:verbose]
-            # Format YAML for display
-            yaml_str1 = obj1.is_a?(String) ? obj1 : Canon::YamlParsing.dump(obj1)
-            yaml_str2 = obj2.is_a?(String) ? obj2 : Canon::YamlParsing.dump(obj2)
+            # Format YAML for display — deferred until first read
+            preprocessed = lambda do
+              [
+                obj1.is_a?(String) ? obj1 : Canon::YamlParsing.dump(obj1),
+                obj2.is_a?(String) ? obj2 : Canon::YamlParsing.dump(obj2),
+              ]
+            end
 
             ComparisonResult.new(
               differences: differences,
-              preprocessed_strings: [yaml_str1, yaml_str2],
+              preprocessed_strings: preprocessed,
               format: :yaml,
               match_options: match_opts_hash,
             )

data/lib/canon/comparison.rb

@@ -407,11 +407,11 @@ module Canon
 
         # CRITICAL: Use strategy's preprocess_for_display to ensure proper
         # line-breaking. This matches DOM diff preprocessing pattern
-        # (xml_comparator.rb:106-109).
+        # (xml_comparator.rb). Deferred via the lazy ComparisonResult seam:
+        # by_object consumers never pay the serialization.
         strategy = Comparison::Strategies::SemanticTreeMatchStrategy.new(
           format: format1, match_options: match_options_only,
         )
-        str1, str2 = strategy.preprocess_for_display(doc1, doc2)
 
         # Store tree diff data in match_options for access via result.
         enhanced_match_options = match_opts_hash.merge(
@@ -423,7 +423,7 @@ module Canon
         # Create ComparisonResult for unified handling.
         result = Canon::Comparison::ComparisonResult.new(
           differences: diff_nodes,
-          preprocessed_strings: [str1, str2],
+          preprocessed_strings: -> { strategy.preprocess_for_display(doc1, doc2) },
           original_strings: [original_str1, original_str2],
           format: format1,
           html_version: %i[html4 html5].include?(format1) ? format1 : nil,

data/lib/canon/diff/node_serializer.rb

@@ -62,12 +62,14 @@ module Canon
       # @param element [Canon::Xml::Nodes::ElementNode] Element to serialize
       # @return [String] Serialized element
       def self.serialize_element_node(element)
-        # Build opening tag with attributes
+        # Mutating build: no intermediate per attribute (one child
+        # string per element via map+join below is the remaining
+        # necessary product).
         tag = "<#{element.name}"
 
         # Add attributes
         element.sorted_attribute_nodes.each do |attr|
-          tag += " #{attr.name}=\"#{attr.value}\""
+          tag << " " << attr.name << '="' << attr.value << '"'
         end
 
         # Check if element has children

data/lib/canon/version.rb

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

metadata

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