canon 0.2.8 → 0.2.9

data/lib/canon/diff/xml_serialization_formatter.rb

@@ -4,59 +4,25 @@ module Canon
   module Diff
     # Detects and classifies XML serialization-level formatting differences.
     #
-    # Serialization-level formatting differences are differences in XML syntax
-    # that do not affect the semantic content of the document. These differences
-    # arise from different valid ways to serialize the same semantic content.
-    #
-    # These differences are ALWAYS non-normative (formatting-only) regardless
-    # of match options, because they are purely syntactic variations.
-    #
-    # Examples:
-    # - Self-closing vs explicit closing tags: <tag/> vs <tag></tag>
-    # - Attribute quote style: attr="value" vs attr='value' (parser-normalized)
-    # - Whitespace within tags: <tag a="1" b="2"> vs <tag a="1"  b="2"> (parser-normalized)
-    #
-    # Note: Some serialization differences are normalized away by XML parsers
-    # (attribute quotes, tag spacing). This class focuses on differences that
-    # survive parsing and comparison, such as self-closing vs explicit closing.
+    # Serialization formatting differences are ALWAYS non-normative (formatting-only)
+    # regardless of match options, because they are purely syntactic variations.
     class XmlSerializationFormatter
-      # Detect if a diff node represents an XML serialization formatting difference.
-      #
-      # Serialization formatting differences are ALWAYS non-normative because they
-      # represent different valid serializations of the same semantic content.
-      #
-      # @param diff_node [DiffNode] The diff node to check
-      # @return [Boolean] true if this is a serialization formatting difference
+      NI = Canon::Comparison::NodeInspector
+
       def self.serialization_formatting?(diff_node)
-        # Currently only handles text_content dimension
-        # Future: add detection for other dimensions
         return false unless diff_node.dimension == :text_content
 
         empty_text_content_serialization_diff?(diff_node)
       end
 
-      # Check if a text_content difference is from XML serialization format.
-      #
-      # Specifically detects self-closing tags (<tag/>) vs explicit closing tags
-      # (<tag></tag>), which create different text node structures:
-      # - Self-closing: no text node (nil)
-      # - Explicit closing: empty or whitespace-only text node ("", " ", "\n", etc.)
-      #
-      # Per XML standards, these forms are semantically equivalent.
-      #
-      # @param diff_node [DiffNode] The diff node to check
-      # @return [Boolean] true if this is a serialization formatting difference
       def self.empty_text_content_serialization_diff?(diff_node)
         return false unless diff_node.dimension == :text_content
 
         node1 = diff_node.node1
         node2 = diff_node.node2
 
-        # Both nodes are nil - no actual difference, not a serialization formatting diff
         return false if node1.nil? && node2.nil?
 
-        # Only one is nil (e.g., one doc has self-closing, other has text)
-        # If the non-nil one is blank, it's still serialization formatting
         if node1.nil? || node2.nil?
           non_nil = node1 || node2
           return false unless text_node?(non_nil)
@@ -65,68 +31,29 @@ module Canon
           return blank?(text)
         end
 
-        # Both must be text nodes
         return false unless text_node?(node1) && text_node?(node2)
 
         text1 = extract_text_content(node1)
         text2 = extract_text_content(node2)
 
-        # Check if both texts are blank/whitespace-only
-        # This indicates self-closing vs explicit closing tag syntax
         blank?(text1) && blank?(text2)
       end
 
-      # Check if a value is blank (nil or whitespace-only)
-      # @param value [String, nil] Value to check
-      # @return [Boolean] true if blank
       def self.blank?(value)
-        value.nil? ||
-          (value.respond_to?(:empty?) && value.empty?) ||
-          (value.respond_to?(:strip) && value.strip.empty?)
+        value.nil? || value.to_s.strip.empty?
       end
 
-      # Check if a node is a text node
-      # @param node [Object] The node to check
-      # @return [Boolean] true if the node is a text node
       def self.text_node?(node)
         return false if node.nil?
+        return true if node.is_a?(String)
 
-        case node
-        when Canon::Xml::Nodes::TextNode
-          true
-        when Canon::Xml::Node
-          node.node_type == :text
-        when Nokogiri::XML::Node
-          node.node_type == Nokogiri::XML::Node::TEXT_NODE
-        when Moxml::Node
-          node.text?
-        when String
-          true
-        else
-          false
-        end
+        NI.text_node?(node)
       end
 
-      # Extract text content from a node
-      # @param node [Object] The node to extract text from
-      # @return [String, nil] The text content or nil
       def self.extract_text_content(node)
         return nil if node.nil?
 
-        case node
-        when Canon::Xml::Nodes::TextNode
-          node.value
-        when Canon::Xml::Node
-          node.text_content
-        when Nokogiri::XML::Node
-          node.content.to_s
-        when Moxml::Node
-          node.content.to_s
-        when String
-          node
-        else
-          node.to_s
-        end
+        NI.text_content(node)
       rescue StandardError
         nil
       end

data/lib/canon/diff_formatter/by_line/base_formatter.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require "diff/lcs"
-require "diff/lcs/hunk"
+require "diff/lcs" unless RUBY_ENGINE == "opal"
+require "diff/lcs/hunk" unless RUBY_ENGINE == "opal"
 require_relative "../debug_output"
 require_relative "../theme"
 
@@ -233,7 +233,7 @@ module Canon
         # @return [Rainbow::Presenter] Colorized presenter
         def apply_color(presenter, color)
           valid_colors = normalize_color_for_rainbow(color)
-          valid_colors.each { |c| presenter = presenter.send(c) }
+          valid_colors.each { |c| presenter = presenter.public_send(c) }
           presenter
         end
 
@@ -385,7 +385,7 @@ module Canon
           rainbow = Rainbow.new
           rainbow.enabled = true
           presenter = rainbow.wrap(text)
-          valid_colors.each { |c| presenter = presenter.send(c) }
+          valid_colors.each { |c| presenter = presenter.public_send(c) }
           presenter.to_s
         end
 
@@ -675,13 +675,13 @@ module Canon
             # Handle Rainbow color methods - :bright_blue -> .blue.bright, etc.
             if color.to_s.start_with?("bright_")
               base_color = color.to_s.sub(/^bright_/, "").to_sym
-              presenter = presenter.send(base_color).bright
+              presenter = presenter.public_send(base_color).bright
             elsif color.to_s.start_with?("light_")
               # Rainbow doesn't have light_ versions, treat as white on bg
               base_color = color.to_s.sub(/^light_/, "").to_sym
-              presenter = presenter.send(base_color)
+              presenter = presenter.public_send(base_color)
             else
-              presenter = presenter.send(color)
+              presenter = presenter.public_send(color)
             end
 
             presenter.to_s

data/lib/canon/diff_formatter/by_line/json_formatter.rb

@@ -253,7 +253,7 @@ module Canon
 
           if color && @use_color
             require "rainbow"
-            Rainbow(visual).send(color).bright.to_s
+            Rainbow(visual).public_send(color).bright.to_s
           else
             visual
           end

data/lib/canon/diff_formatter/by_line/simple_formatter.rb

@@ -151,7 +151,7 @@ module Canon
           # Apply color if provided and color is enabled
           if color && @use_color
             require "rainbow"
-            Rainbow(visual).send(color).bright.to_s
+            Rainbow(visual).public_send(color).bright.to_s
           else
             visual
           end

data/lib/canon/diff_formatter/by_line/xml_formatter.rb

@@ -1205,11 +1205,11 @@ informative: false, formatting: false)
             # Apply effect if specified (map :strikethrough to :cross_out for Rainbow)
             if effect
               rainbow_effect = effect == :strikethrough ? :cross_out : effect
-              presenter = presenter.send(rainbow_effect)
+              presenter = presenter.public_send(rainbow_effect)
             end
 
             # Apply color if specified
-            presenter = presenter.send(color) if color
+            presenter = presenter.public_send(color) if color
 
             presenter.to_s
           else

data/lib/canon/diff_formatter/by_line/yaml_formatter.rb

@@ -261,7 +261,7 @@ module Canon
 
           if color && @use_color
             require "rainbow"
-            Rainbow(visual).send(color).bright.to_s
+            Rainbow(visual).public_send(color).bright.to_s
           else
             visual
           end

data/lib/canon/diff_formatter/by_line_formatter.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "paint"
+require "paint" unless RUBY_ENGINE == "opal"
 
 module Canon
   class DiffFormatter

data/lib/canon/diff_formatter/by_object/base_formatter.rb

@@ -26,7 +26,7 @@ show_diffs: :all, theme: nil)
         # @return [String] Formatted output
         def format(differences, _format)
           # Handle both ComparisonResult (production) and Array (low-level tests)
-          if differences.respond_to?(:equivalent?)
+          if differences.is_a?(Canon::Comparison::ComparisonResult)
             # ComparisonResult object
             return success_message if differences.equivalent?
 
@@ -130,15 +130,11 @@ show_diffs: :all, theme: nil)
           return differences if @show_diffs.nil? || @show_diffs == :all
 
           differences.select do |diff|
-            # Handle both DiffNode objects and legacy Hash format
-            is_normative = if diff.respond_to?(:normative?)
-                             diff.normative?
-                           elsif diff.is_a?(Hash) && diff.key?(:normative)
-                             diff[:normative]
-                           else
-                             # Default to normative if unknown
-                             true
-                           end
+            is_normative = begin
+              diff.normative?
+            rescue NoMethodError
+              diff.is_a?(Hash) && diff.key?(:normative) ? diff[:normative] : true
+            end
 
             case @show_diffs
             when :normative
@@ -207,9 +203,9 @@ show_diffs: :all, theme: nil)
           parts = []
           current = node
 
-          while current.respond_to?(:name)
+          while Canon::XmlParsing.xml_node?(current) || current.is_a?(Canon::Xml::Node)
             parts.unshift(current.name) if current.name
-            current = current.parent if current.respond_to?(:parent)
+            current = current.parent
           end
 
           parts.join(".")
@@ -328,13 +324,13 @@ show_diffs: :all, theme: nil)
             # Handle bright_ colors: :bright_blue -> .blue.bright
             if c.to_s.start_with?("bright_")
               base = c.to_s.sub(/^bright_/, "").to_sym
-              presenter = presenter.send(base).bright
+              presenter = presenter.public_send(base).bright
             elsif c.to_s.start_with?("light_")
               # Rainbow doesn't have light_ versions
               base = c.to_s.sub(/^light_/, "").to_sym
-              presenter = presenter.send(base)
+              presenter = presenter.public_send(base)
             else
-              presenter = presenter.send(c)
+              presenter = presenter.public_send(c)
             end
           end
           presenter.to_s

data/lib/canon/diff_formatter/by_object/xml_formatter.rb

@@ -171,7 +171,8 @@ module Canon
           text2 = extract_text(node2)
 
           # Show parent element if available
-          if node1.respond_to?(:parent) && node1.parent.respond_to?(:name)
+          if (Canon::XmlParsing.xml_node?(node1) || node1.is_a?(Canon::Xml::Node)) &&
+              node1.parent
             output << "#{prefix}    #{colorize(
               "Element: <#{node1.parent.name}>",
               theme_color(:informative, :content) || :blue,
@@ -274,9 +275,9 @@ module Canon
           parts = []
           current = node
 
-          while current.respond_to?(:name)
+          while Canon::XmlParsing.xml_node?(current) || current.is_a?(Canon::Xml::Node)
             parts.unshift(current.name) if current.name
-            current = current.parent if current.respond_to?(:parent)
+            current = current.parent
           end
 
           parts.join(".")
@@ -287,13 +288,10 @@ module Canon
         # @param node [Object] Node with content or text
         # @return [String] Text content
         def extract_text(node)
-          if node.respond_to?(:value)
-            # CommentNode and similar nodes use .value
-            node.value.to_s
-          elsif node.respond_to?(:content)
-            node.content.to_s
-          elsif node.respond_to?(:text)
-            node.text.to_s
+          if node.is_a?(Canon::Xml::Node)
+            node.text_content.to_s
+          elsif Canon::XmlParsing.xml_node?(node)
+            Canon::XmlParsing.text_content(node).to_s
           else
             ""
           end

data/lib/canon/diff_formatter/by_object_formatter.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "paint"
+require "paint" unless RUBY_ENGINE == "opal"
 
 module Canon
   class DiffFormatter

data/lib/canon/diff_formatter/debug_output.rb

@@ -283,22 +283,8 @@ module Canon
             content = node.value.to_s
             preview = content.length > 30 ? "#{content[0..27]}..." : content
             "<!--#{preview}-->"
-          elsif node.respond_to?(:name)
+          elsif Canon::XmlParsing.xml_node?(node) || node.is_a?(Canon::Xml::Node)
             "<#{node.name}>"
-          elsif node.respond_to?(:content)
-            content = node.content.to_s
-            if content.length > 30
-              "\"#{content[0..27]}...\""
-            else
-              "\"#{content || ''}\""
-            end
-          elsif node.respond_to?(:text)
-            text = node.text.to_s
-            if text.length > 30
-              "\"#{text[0..27]}...\""
-            else
-              "\"#{text || ''}\""
-            end
           else
             node.class.name
           end
@@ -311,14 +297,16 @@ module Canon
 
           # For attribute differences, show which attributes differ
           if diff.dimension == :attribute_whitespace &&
-              node1.respond_to?(:attributes) && node2.respond_to?(:attributes)
+              (Canon::XmlParsing.xml_node?(node1) || node1.is_a?(Canon::Xml::Node)) &&
+              (Canon::XmlParsing.xml_node?(node2) || node2.is_a?(Canon::Xml::Node))
             attrs1 = format_attributes(node1)
             attrs2 = format_attributes(node2)
             return ["<#{node1.name}> #{attrs1}", "<#{node2.name}> #{attrs2}"]
           end
 
           # For element differences, show element names
-          if node1.respond_to?(:name) && node2.respond_to?(:name)
+          if (Canon::XmlParsing.xml_node?(node1) || node1.is_a?(Canon::Xml::Node)) &&
+              (Canon::XmlParsing.xml_node?(node2) || node2.is_a?(Canon::Xml::Node))
             if node1.name == node2.name
               # Same element name, different content
             end
@@ -340,7 +328,7 @@ module Canon
         end
 
         def format_attributes(node)
-          return "" unless node.respond_to?(:attributes)
+          return "" unless Canon::XmlParsing.xml_node?(node) || node.is_a?(Canon::Xml::Node)
 
           attrs = node.attributes
           return "" if attrs.empty?
@@ -350,9 +338,9 @@ module Canon
             name = if key.is_a?(String)
                      key
                    else
-                     (key.respond_to?(:name) ? key.name : key.to_s)
+                     key.name
                    end
-            value = val.respond_to?(:value) ? val.value : val.to_s
+            value = val.is_a?(String) ? val : val.value
             "#{name}=\"#{value}\""
           end.sort
 
@@ -365,10 +353,10 @@ module Canon
         end
 
         def get_node_content(node)
-          if node.respond_to?(:content)
-            node.content.to_s
-          elsif node.respond_to?(:text)
-            node.text.to_s
+          if Canon::XmlParsing.xml_node?(node)
+            Canon::XmlParsing.text_content(node).to_s
+          elsif node.is_a?(Canon::Xml::Node)
+            node.text_content.to_s
           else
             ""
           end

data/lib/canon/diff_formatter/diff_detail_formatter/color_helper.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "rainbow"
+require "rainbow" unless RUBY_ENGINE == "opal"
 
 module Canon
   class DiffFormatter
@@ -19,7 +19,7 @@ module Canon
         def self.colorize(text, color, use_color, bold: false)
           return text unless use_color
 
-          presenter = Rainbow(text).send(color)
+          presenter = Rainbow(text).public_send(color)
           presenter = presenter.bright if bold
           presenter.to_s
         end