canon 0.2.8 → 0.2.9

data/lib/canon/diff_formatter/legend.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "unicode/name"
+require "unicode/name" unless RUBY_ENGINE == "opal"
 
 module Canon
   class DiffFormatter
@@ -175,7 +175,7 @@ module Canon
 
         require "rainbow"
         presenter = Rainbow(text)
-        colors.each { |c| presenter = presenter.send(c) }
+        colors.each { |c| presenter = presenter.public_send(c) }
         presenter.to_s
       end
 

data/lib/canon/diff_formatter/pretty_diff_formatter.rb

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

data/lib/canon/diff_formatter/theme.rb

@@ -797,19 +797,19 @@ _invalid_values)
           return env_theme if env_theme
 
           # Check config theme_inheritance (custom theme with base + overrides)
-          if @config.respond_to?(:xml) && @config.xml.diff.respond_to?(:theme_inheritance)
+          if @config.is_a?(Canon::Config)
             inheritance = @config.xml.diff.theme_inheritance
             return resolve_inheritance_theme(inheritance) if inheritance
           end
 
           # Check config custom_theme (full custom theme hash)
-          if @config.respond_to?(:xml) && @config.xml.diff.respond_to?(:custom_theme)
+          if @config.is_a?(Canon::Config)
             custom = @config.xml.diff.custom_theme
             return custom if custom.is_a?(Hash) && !custom.empty?
           end
 
           # Check config theme name
-          if @config.respond_to?(:xml) && @config.xml.diff.respond_to?(:theme)
+          if @config.is_a?(Canon::Config)
             theme_name = @config.xml.diff.theme
             return Theme[theme_name] if Theme.include?(theme_name)
           end
@@ -826,7 +826,7 @@ _invalid_values)
           return env_name if env_name && Theme.include?(env_name)
 
           # Check config
-          if @config.respond_to?(:xml) && @config.xml.diff.respond_to?(:theme)
+          if @config.is_a?(Canon::Config)
             theme_name = @config.xml.diff.theme
             return theme_name if Theme.include?(theme_name)
           end

data/lib/canon/diff_formatter.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "paint"
+require "paint" unless RUBY_ENGINE == "opal"
 require "yaml"
 require_relative "comparison"
 require_relative "diff/diff_block"
@@ -326,7 +326,7 @@ module Canon
         return pretty_diff_formatter.format(d1, d2, format: format)
       end
 
-      no_diffs = if differences.respond_to?(:equivalent?)
+      no_diffs = if differences.is_a?(Canon::Comparison::ComparisonResult)
                    differences.equivalent?
                  else
                    differences.empty?

data/lib/canon/formatters/html_formatter.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "nokogiri"
+require "nokogiri" unless RUBY_ENGINE == "opal"
 require_relative "html_formatter_base"
 require_relative "../pretty_printer/html"
 require_relative "../validators/html_validator"

data/lib/canon/formatters/html_formatter_base.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "nokogiri"
+require "nokogiri" unless RUBY_ENGINE == "opal"
 
 module Canon
   module Formatters

data/lib/canon/formatters/xml_formatter.rb

@@ -1,39 +1,14 @@
 # frozen_string_literal: true
 
-require "nokogiri"
+require "nokogiri" unless RUBY_ENGINE == "opal"
+require_relative "../xml_backend"
 require_relative "../xml/c14n"
 require_relative "../pretty_printer/xml"
 require_relative "../validators/xml_validator"
 
 module Canon
   module Formatters
-    # XML formatter using Canonical XML 1.1 or pretty printing
-    #
-    # Use this class for formatting XML documents for display or storage.
-    # For semantic comparison of XML documents, use Canon::Comparison instead.
-    #
-    # == XML Declaration Handling
-    #
-    # - Pretty printing (default): Preserves XML declaration
-    # - Canonicalization: Removes XML declaration (per W3C C14N 1.1 spec)
-    #
-    # == Usage
-    #
-    #   # Pretty print (preserves declaration)
-    #   Canon.format_xml(xml)
-    #
-    #   # Canonicalize (removes declaration)
-    #   Canon.format(xml, :xml, pretty: false)
-    #
-    # For comparison, use:
-    #   Canon::Comparison.equivalent?(xml1, xml2, format: :xml)
-    #
     class XmlFormatter
-      # Format XML with pretty printing by default
-      # @param xml [String] XML document to format
-      # @param pretty [Boolean] Whether to pretty print (default: true)
-      # @param indent [Integer] Number of spaces for indentation (default: 2)
-      # @return [String] Formatted XML
       def self.format(xml, pretty: true, indent: 2)
         if pretty
           Canon::PrettyPrinter::Xml.new(indent: indent).format(xml)
@@ -42,13 +17,13 @@ module Canon
         end
       end
 
-      # Parse XML into a Nokogiri document
-      # @param xml [String] XML document to parse
-      # @return [Nokogiri::XML::Document] Parsed XML document
       def self.parse(xml)
-        # Validate before parsing
         Canon::Validators::XmlValidator.validate!(xml)
-        Nokogiri::XML(xml)
+        if XmlBackend.nokogiri?
+          Nokogiri::XML(xml)
+        else
+          XmlParsing.parse(xml)
+        end
       end
     end
   end

data/lib/canon/html/data_model.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "nokogiri"
+require "nokogiri" unless RUBY_ENGINE == "opal"
 require_relative "../data_model"
 require_relative "../xml/nodes/root_node"
 require_relative "../xml/nodes/element_node"

data/lib/canon/pretty_printer/html.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "nokogiri"
+require "nokogiri" unless RUBY_ENGINE == "opal"
 require "stringio"
 require_relative "html_void_elements"
 

data/lib/canon/pretty_printer/xml.rb

@@ -1,29 +1,38 @@
 # frozen_string_literal: true
 
-require "nokogiri"
+require "nokogiri" unless RUBY_ENGINE == "opal"
 
 module Canon
   module PrettyPrinter
-    # Pretty printer for XML with consistent indentation
     class Xml
       def initialize(indent: 2, indent_type: "space")
         @indent = indent.to_i
         @indent_type = indent_type
       end
 
-      # Pretty print XML with consistent indentation
       def format(xml_string)
-        doc = Nokogiri::XML(xml_string, &:noblanks)
+        if Canon::XmlBackend.nokogiri?
+          nokogiri_format(xml_string)
+        else
+          moxml_format(xml_string)
+        end
+      end
 
-        # Use Nokogiri's built-in pretty printing
+      private
+
+      def nokogiri_format(xml_string)
+        doc = Nokogiri::XML(xml_string, &:noblanks)
         if @indent_type == "tab"
-          # For tabs, use indent_text parameter
           doc.to_xml(indent: 1, indent_text: "\t", encoding: "UTF-8")
         else
-          # For spaces, use indent parameter
           doc.to_xml(indent: @indent, encoding: "UTF-8")
         end
       end
+
+      def moxml_format(xml_string)
+        doc = Canon::XmlParsing.parse(xml_string)
+        doc.to_xml
+      end
     end
   end
 end

data/lib/canon/pretty_printer/xml_normalized.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "nokogiri"
+require "nokogiri" unless RUBY_ENGINE == "opal"
 require_relative "html_void_elements"
 
 module Canon
@@ -154,7 +154,13 @@ module Canon
       # @return [String] Serialized XML, one node per line, with content
       #   whitespace visualized at line boundaries
       def format(xml_string)
-        doc = @html_mode ? Nokogiri::HTML5(xml_string) : Nokogiri::XML(xml_string)
+        doc = if Canon::XmlBackend.moxml?
+                Canon::XmlParsing.parse(xml_string)
+              elsif @html_mode
+                Nokogiri::HTML5(xml_string)
+              else
+                Nokogiri::XML(xml_string)
+              end
         lines = []
 
         if !@html_mode && doc.version
@@ -183,7 +189,7 @@ module Canon
       # @return [Symbol] :strict, :normalize, or :drop
       def classify_whitespace(element)
         current = element
-        while current && !current.is_a?(Nokogiri::XML::Document)
+        while current && !Canon::XmlParsing.document?(current)
           name = current.name.to_s
           return :drop      if @insens_ws.include?(name)
           return :strict    if @strict_ws.include?(name)

data/lib/canon/rspec_matchers.rb

@@ -177,7 +177,7 @@ module Canon
           config_format = normalize_format_for_config(@format)
 
           # Only access config if format is supported
-          if Canon::Config.instance.respond_to?(config_format)
+          if %i[xml html json yaml string].include?(config_format)
             format_config = Canon::Config.instance.public_send(config_format)
             if format_config.match.profile
               opts[:global_profile] =
@@ -375,7 +375,7 @@ module Canon
                                diff_algorithm: diff_algorithm)
     end
 
-    if defined?(::RSpec) && ::RSpec.respond_to?(:configure)
+    if defined?(::RSpec.configure)
       RSpec.configure do |config|
         config.include(Canon::RSpecMatchers)
       end

data/lib/canon/tree_diff/adapters/html_adapter.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "nokogiri"
+require "nokogiri" unless RUBY_ENGINE == "opal"
 
 module Canon
   module TreeDiff

data/lib/canon/tree_diff/adapters/xml_adapter.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "nokogiri"
+require "nokogiri" unless RUBY_ENGINE == "opal"
 
 module Canon
   module TreeDiff

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

@@ -437,15 +437,13 @@ module Canon
 
         alias to_s inspect
 
-        private
-
         # Invalidate cached computations
         def invalidate_cache
           @signature = nil
           @weight = nil
 
           # Propagate upward
-          parent&.send(:invalidate_cache)
+          parent&.invalidate_cache
         end
       end
     end

data/lib/canon/validators/html_validator.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "nokogiri"
+require "nokogiri" unless RUBY_ENGINE == "opal"
 require_relative "base_validator"
 
 module Canon

data/lib/canon/validators/xml_validator.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "nokogiri"
+require "nokogiri" unless RUBY_ENGINE == "opal"
 require_relative "base_validator"
 
 module Canon

data/lib/canon/version.rb

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