canon 0.2.9 → 0.2.12

data/lib/canon/comparison/strategies/match_strategy_factory.rb

@@ -1,72 +1,23 @@
 # frozen_string_literal: true
 
-require_relative "base_match_strategy"
-
 module Canon
   module Comparison
     module Strategies
       # Factory for creating match strategies
       #
-      # Selects the appropriate match strategy based on match options.
-      # This provides a single point for strategy instantiation and enables
-      # easy extension with new matching algorithms.
-      #
-      # @example Create a strategy
-      #   strategy = MatchStrategyFactory.create(
-      #     format: :xml,
-      #     match_options: { semantic_diff: true }
-      #   )
-      #   differences = strategy.match(doc1, doc2)
-      #
+      # After semantic dispatch normalization, this factory is only called
+      # with semantic_diff: true. DOM matching is handled directly by
+      # the format comparators (XmlComparator, HtmlComparator, etc.).
       class MatchStrategyFactory
-        # Create appropriate match strategy
-        #
-        # Examines match options to determine which strategy to use:
-        # - If semantic_diff is enabled: SemanticTreeMatchStrategy
-        # - Otherwise (default): DomMatchStrategy
-        #
-        # Future strategies can be added here by checking additional
-        # options and returning the appropriate strategy class.
-        #
-        # @param format [Symbol] Document format (:xml, :html, :json, :yaml)
-        # @param match_options [Hash] Match options
-        # @option match_options [Boolean] :semantic_diff Use semantic tree matching
-        # @return [BaseMatchStrategy] Instantiated strategy
-        #
-        # @example DOM matching (default)
-        #   strategy = MatchStrategyFactory.create(
-        #     format: :xml,
-        #     match_options: {}
-        #   )
-        #   # Returns DomMatchStrategy
-        #
-        # @example Semantic tree matching
-        #   strategy = MatchStrategyFactory.create(
-        #     format: :xml,
-        #     match_options: { semantic_diff: true }
-        #   )
-        #   # Returns SemanticTreeMatchStrategy
-        #
         def self.create(format:, match_options:)
-          # Check for semantic diff option
-          if match_options[:semantic_diff]
-            require_relative "semantic_tree_match_strategy"
-            SemanticTreeMatchStrategy.new(format: format,
-                                          match_options: match_options)
-          else
-            # Default to DOM matching
-            require_relative "dom_match_strategy"
-            DomMatchStrategy.new(format: format, match_options: match_options)
+          unless match_options[:semantic_diff]
+            raise ArgumentError,
+                  "MatchStrategyFactory requires semantic_diff: true; " \
+                  "DOM matching is handled by format comparators directly"
           end
 
-          # Future: Add more strategies here
-          # Example:
-          # elsif match_options[:hybrid_diff]
-          #   require_relative "hybrid_match_strategy"
-          #   HybridMatchStrategy.new(format, match_options)
-          # elsif match_options[:fuzzy_diff]
-          #   require_relative "fuzzy_match_strategy"
-          #   FuzzyMatchStrategy.new(format, match_options)
+          SemanticTreeMatchStrategy.new(format: format,
+                                        match_options: match_options)
         end
       end
     end

data/lib/canon/comparison/strategies/semantic_tree_match_strategy.rb

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "base_match_strategy"
-require_relative "../../tree_diff/tree_diff_integrator"
-require_relative "../../tree_diff/operation_converter"
-require_relative "../xml_node_comparison"
-
 module Canon
   module Comparison
     module Strategies
@@ -126,7 +121,7 @@ module Canon
         # @return [Array<String>] Preprocessed strings
         def preprocess_xml(doc1, doc2)
           xml1 = if doc1.is_a?(Canon::Xml::Node)
-                   XmlNodeComparison.serialize_node_to_xml(doc1)
+                   Canon::Diff::NodeSerializer.serialize(doc1)
                  elsif Canon::XmlParsing.xml_node?(doc1)
                    Canon::XmlParsing.serialize(doc1)
                  else
@@ -134,7 +129,7 @@ module Canon
                  end
 
           xml2 = if doc2.is_a?(Canon::Xml::Node)
-                   XmlNodeComparison.serialize_node_to_xml(doc2)
+                   Canon::Diff::NodeSerializer.serialize(doc2)
                  elsif Canon::XmlParsing.xml_node?(doc2)
                    Canon::XmlParsing.serialize(doc2)
                  else
@@ -162,7 +157,7 @@ module Canon
           # For XML::DocumentFragment (from parse_node_as_fragment), use to_s
           # to avoid Nokogiri auto-inserting meta tags during to_html serialization
           html1 = if doc1.is_a?(Canon::Xml::Node)
-                    XmlNodeComparison.serialize_node_to_xml(doc1)
+                    Canon::Diff::NodeSerializer.serialize(doc1)
                   elsif doc1.is_a?(Nokogiri::XML::DocumentFragment)
                     doc1.to_s
                   elsif Canon::XmlParsing.xml_node?(doc1)
@@ -172,7 +167,7 @@ module Canon
                   end
 
           html2 = if doc2.is_a?(Canon::Xml::Node)
-                    XmlNodeComparison.serialize_node_to_xml(doc2)
+                    Canon::Diff::NodeSerializer.serialize(doc2)
                   elsif doc2.is_a?(Nokogiri::XML::DocumentFragment)
                     doc2.to_s
                   elsif Canon::XmlParsing.xml_node?(doc2)
@@ -194,7 +189,6 @@ module Canon
         # @param doc2 [Object] Second JSON document
         # @return [Array<String>] Preprocessed strings
         def preprocess_json(doc1, doc2)
-          require_relative "../../formatters/json_formatter"
           [Canon.format(doc1, :json), Canon.format(doc2, :json)]
         end
 
@@ -206,7 +200,6 @@ module Canon
         # @param doc2 [Object] Second YAML document
         # @return [Array<String>] Preprocessed strings
         def preprocess_yaml(doc1, doc2)
-          require_relative "../../formatters/yaml_formatter"
           [Canon.format(doc1, :yaml), Canon.format(doc2, :yaml)]
         end
       end

data/lib/canon/comparison/strategies.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Canon
+  module Comparison
+    # Match strategy framework. Children are autoloaded — never
+    # `require_relative` them.
+    module Strategies
+      autoload :BaseMatchStrategy,
+               "canon/comparison/strategies/base_match_strategy"
+      autoload :MatchStrategyFactory,
+               "canon/comparison/strategies/match_strategy_factory"
+      autoload :SemanticTreeMatchStrategy,
+               "canon/comparison/strategies/semantic_tree_match_strategy"
+    end
+  end
+end

data/lib/canon/comparison/xml_comparator/attribute_comparator.rb

@@ -15,8 +15,8 @@ module Canon
         # @return [Symbol] Comparison result
         def self.compare(node1, node2, opts, differences)
           # Get attributes using the appropriate method for each node type
-          raw_attrs1 = node1.respond_to?(:attribute_nodes) ? node1.attribute_nodes : node1.attributes
-          raw_attrs2 = node2.respond_to?(:attribute_nodes) ? node2.attribute_nodes : node2.attributes
+          raw_attrs1 = get_raw_attributes(node1)
+          raw_attrs2 = get_raw_attributes(node2)
 
           attrs1 = XmlComparatorHelpers::AttributeFilter.filter(raw_attrs1,
                                                                 opts)
@@ -158,9 +158,6 @@ differences)
         # @param differences [Array] Array to append difference to
         def self.add_attribute_difference(n1:, n2:, diff1:, diff2:,
 dimension:, differences:, **opts)
-          # Import DiffNodeBuilder to avoid circular dependency
-          require_relative "diff_node_builder"
-
           diff_node = Canon::Comparison::DiffNodeBuilder.build(
             node1: n1,
             node2: n2,
@@ -171,6 +168,23 @@ dimension:, differences:, **opts)
           )
           differences << diff_node if diff_node
         end
+
+        # Get raw attributes from a node, dispatching by type.
+        # Nokogiri::XML::Element has attribute_nodes (NodeSet),
+        # Canon::Xml::Nodes::ElementNode has attribute_nodes (Array),
+        # Moxml::Element has attributes (Hash-like).
+        def self.get_raw_attributes(node)
+          case node
+          when Canon::Xml::Nodes::ElementNode
+            node.attribute_nodes
+          else
+            if Canon::XmlBackend.nokogiri? && node.is_a?(Nokogiri::XML::Element)
+              node.attribute_nodes
+            else
+              node.attributes
+            end
+          end
+        end
       end
     end
   end

data/lib/canon/comparison/xml_comparator/attribute_filter.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "../match_options"
-require_relative "../../xml/namespace_helper"
-
 module Canon
   module Comparison
     module XmlComparatorHelpers

data/lib/canon/comparison/xml_comparator/child_comparison.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "../node_inspector"
-
 module Canon
   module Comparison
     module XmlComparatorHelpers
@@ -38,7 +36,6 @@ module Canon
             # pretty_printed_received → drop \n-starting whitespace nodes from node2
             # The ephemeral _pretty_print_side_active flag is consumed by node_excluded?
             # and must NOT be forwarded into recursive compare_nodes calls.
-            require_relative "../xml_node_comparison"
             opts1 = XmlNodeComparison.opts_for_side(opts, :expected)
             opts2 = XmlNodeComparison.opts_for_side(opts, :received)
 
@@ -78,9 +75,6 @@ module Canon
           # Use ElementMatcher for semantic comparison
           def use_element_matcher_comparison(children1, children2, parent_node, comparator,
                                              opts, child_opts, diff_children, differences)
-            require_relative "../../xml/element_matcher"
-            require_relative "../../xml/nodes/root_node"
-
             # Create temporary RootNode wrappers
             temp_root1 = Canon::Xml::Nodes::RootNode.new
             temp_root1.children = children1.dup

data/lib/canon/comparison/xml_comparator/namespace_comparator.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "../../xml/namespace_helper"
-
 module Canon
   module Comparison
     module XmlComparatorHelpers
@@ -153,10 +151,7 @@ changed, opts, differences)
             end.join(', ')}"
           end
 
-          # Import DiffNodeBuilder to avoid circular dependency
-          require_relative "diff_node_builder"
-
-          diff_node = DiffNodeBuilder.build(
+          diff_node = Canon::Comparison::DiffNodeBuilder.build(
             node1: node1,
             node2: node2,
             diff1: Comparison::UNEQUAL_ATTRIBUTES,

data/lib/canon/comparison/xml_comparator/node_parser.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "../../xml/c14n"
-
 module Canon
   module Comparison
     module XmlComparatorHelpers
@@ -37,8 +35,7 @@ module Canon
           # Select parser backend
           resolved_parser = parser || resolve_parser_config
 
-          if resolved_parser == :sax
-            require_relative "../../xml/sax_builder"
+          if resolved_parser == :sax && RUBY_ENGINE != "opal"
             Canon::Xml::SaxBuilder.parse(xml_string,
                                          preserve_whitespace: preserve_whitespace)
           else
@@ -97,8 +94,7 @@ parser: nil)
 
           resolved_parser = parser || resolve_parser_config
 
-          if resolved_parser == :sax
-            require_relative "../../xml/sax_builder"
+          if resolved_parser == :sax && RUBY_ENGINE != "opal"
             Canon::Xml::SaxBuilder.parse(xml_str,
                                          preserve_whitespace: preserve_whitespace)
           else