compare-xml 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7e6709bb5f5150832a22634027282fb7a2e80571f0a5c8210f7f8982f59bb67
-  data.tar.gz: ba0a234e1c095d4d0a97b72c22a8e6831d53b2203acf860965602dc81bdfbb85
+  metadata.gz: ed20155c59d477002fe69c2883e0a8d3b3b9507aa042f95d41cb3693b044e56d
+  data.tar.gz: 99c9374d3ac9bd98fe3e4b1fbad74b7bb4e1bea0f55ee475b41f401d8a60123e
 SHA512:
-  metadata.gz: c2e9309f2980da1b6faa1e1ecea38293654492e04f216b1aa45e53c93817f2b394811511b4b233a8e74e3d498f6f71df0020b4d55635b5c95b6314aea7701f5b
-  data.tar.gz: ac6934cf5624163ea039cdd3985f07b28bd7f60e7f77e9329b70343d87b48e237b790e380316294293073a8d40de8f111d6f44addfb39a477d6b3f5389332f61
+  metadata.gz: ba79f1cd40d906b02752a50cdc37f7c82200077a7f1e7c9e5f530e046c67ad445a4830d87082715c9f96405363c116deb5cbc9d1df276906dc52dcd1098565d9
+  data.tar.gz: 9b25dfa936e79f2e15137ceece697f7f909344b628b79e51450598660989ca0b7604b6e44272fcbb4a19676ebd6eb719939e8b1c4b4a6d424edf57aac2786067

data/README.md

@@ -10,8 +10,6 @@ CompareXML is a fast, lightweight and feature-rich tool that will solve your XML
 
 Supports **Ruby 2.4 → latest**, with the full Ruby matrix tested daily in CI.
 
-[!["Buy Me A Coffee"](https://www.buymeacoffee.com/assets/img/custom_images/yellow_img.png)](https://www.buymeacoffee.com/vkononov)
-
 **Features**
 
  - Fast, light-weight and highly customizable
@@ -33,7 +31,9 @@ And then execute:
 
 Or install it yourself as:
 
-    gem install compare-xml
+```sh
+gem install compare-xml
+```
 
 
 

data/lib/compare-xml/version.rb

@@ -1,3 +1,3 @@
 module CompareXML
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.0.2'.freeze
 end

data/lib/compare-xml.rb

@@ -107,6 +107,8 @@ module CompareXML
     def compare_nodes(n1, n2, opts, differences, child_opts = {}, diff_children: false)
       if n1.instance_of?(n2.class)
         case n1
+        when Nokogiri::XML::ProcessingInstruction
+          status = compare_processing_instructions(n1, n2, opts, differences)
         when Nokogiri::XML::Comment
           status = compare_comment_nodes(n1, n2, opts, differences)
         when Nokogiri::HTML::Document
@@ -137,6 +139,13 @@ module CompareXML
       status
     end
 
+    def compare_processing_instructions(n1, n2, opts, differences)
+      return EQUIVALENT if n1.name == n2.name && n1.content == n2.content
+
+      add_difference(n1, n2, n1, n2, opts, differences)
+      UNEQUAL_ELEMENTS
+    end
+
     ##
     # Compares two nodes of type Nokogiri::HTML::Comment.
     #
@@ -275,7 +284,7 @@ module CompareXML
     end
 
     ##
-    # Builds a canonical, option-aware string for a node so that two nodes with equal
+    # Builds a structured, option-aware fingerprint for a node so that two nodes with equal
     # fingerprints are guaranteed to be equivalent under the current options. Used to
     # anchor identical subtrees during alignment. Results are memoized per comparison.
     #
@@ -285,19 +294,16 @@ module CompareXML
 
     def build_node_fingerprint(node, opts, cache)
       case node
-      when Nokogiri::XML::Comment
-        "C:#{opts[:collapse_whitespace] ? collapse(node.content) : node.content}"
-      when Nokogiri::XML::Text
-        "T:#{opts[:collapse_whitespace] ? collapse(node.content) : node.content}"
+      when Nokogiri::XML::Comment, Nokogiri::XML::Text
+        [node.class, opts[:collapse_whitespace] ? collapse(node.content) : node.content]
       when Nokogiri::XML::Element
-        attrs = node.attribute_nodes
-        attrs = attrs.sort_by(&:name) if opts[:ignore_attr_order]
-        attr_str = attrs.map { |a| "#{a.name}=#{a.value}" }.join(' ')
-        children = node.children.reject { |c| node_excluded?(c, opts) }
-        child_str = children.map { |c| node_fingerprint(c, opts, cache) }.join
-        "E:#{element_name(node)}[#{attr_str}](#{child_str})"
+        attrs = node.attribute_nodes.reject { |attr| attribute_excluded?(attr, opts) }
+        attrs = attrs.sort_by { |attr| attribute_name(attr) } if opts[:ignore_attr_order]
+        attributes = attrs.map { |attr| [attribute_name(attr), attr.value] }
+        children = opts[:ignore_children] ? [] : node.children.reject { |child| node_excluded?(child, opts) }
+        [node.class, element_name(node), attributes, children.map { |child| node_fingerprint(child, opts, cache) }]
       else
-        "O:#{node.class}:#{node}"
+        [node.class, node.to_s]
       end
     end
 
@@ -438,8 +444,8 @@ module CompareXML
     #   @return type of equivalence (from equivalence constants)
     #
     def compare_sorted_attribute_sets(n1, n2, a1_set, a2_set, opts, differences, status = EQUIVALENT)
-      a1_set = a1_set.sort_by(&:name)
-      a2_set = a2_set.sort_by(&:name)
+      a1_set = a1_set.sort_by { |attr| attribute_name(attr) }
+      a2_set = a2_set.sort_by { |attr| attribute_name(attr) }
       i = j = 0
 
       while i < a1_set.length || j < a2_set.length
@@ -450,10 +456,10 @@ module CompareXML
         elsif a2_set[j].nil?
           result = compare_attributes(n1, n2, a1_set[i], nil, opts, differences)
           i += 1
-        elsif a1_set[i].name < a2_set[j].name
+        elsif attribute_name(a1_set[i]) < attribute_name(a2_set[j])
           result = compare_attributes(n1, n2, a1_set[i], nil, opts, differences)
           i += 1
-        elsif a1_set[i].name > a2_set[j].name
+        elsif attribute_name(a1_set[i]) > attribute_name(a2_set[j])
           result = compare_attributes(n1, n2, nil, a2_set[j], opts, differences)
           j += 1
         else
@@ -493,6 +499,11 @@ module CompareXML
       status
     end
 
+    def attribute_name(attribute)
+      href = attribute.namespace&.href
+      href ? "{#{href}}#{attribute.name}" : attribute.name
+    end
+
     ##
     # Compares two attributes by name and value.
     #
@@ -509,18 +520,18 @@ module CompareXML
     def compare_attributes(n1, n2, a1, a2, opts, differences, status = EQUIVALENT)
       if a1.nil?
         status = MISSING_ATTRIBUTE
-        add_difference(n1, n2, nil, "#{a2.name}=\"#{a2.value}\"", opts, differences)
+        add_difference(n1, n2, nil, "#{attribute_name(a2)}=\"#{a2.value}\"", opts, differences)
       elsif a2.nil?
         status = MISSING_ATTRIBUTE
-        add_difference(n1, n2, "#{a1.name}=\"#{a1.value}\"", nil, opts, differences)
-      elsif a1.name == a2.name
+        add_difference(n1, n2, "#{attribute_name(a1)}=\"#{a1.value}\"", nil, opts, differences)
+      elsif attribute_name(a1) == attribute_name(a2)
         if a1.value != a2.value
           status = UNEQUAL_ATTRIBUTES
-          add_difference(n1, n2, "#{a1.name}=\"#{a1.value}\"", "#{a2.name}=\"#{a2.value}\"", opts, differences)
+          add_difference(n1, n2, "#{attribute_name(a1)}=\"#{a1.value}\"", "#{attribute_name(a2)}=\"#{a2.value}\"", opts, differences)
         end
       else
         status = UNEQUAL_ATTRIBUTES
-        add_difference(n1, n2, "#{a1.name}=\"#{a1.value}\"", "#{a2.name}=\"#{a2.value}\"", opts, differences)
+        add_difference(n1, n2, "#{attribute_name(a1)}=\"#{a1.value}\"", "#{attribute_name(a2)}=\"#{a2.value}\"", opts, differences)
       end
       status
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: compare-xml
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Vadim Kononov
@@ -57,7 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Compare XML and HTML documents or Nokogiri nodes for equality with a diff
 test_files: []