equivalent-xml 0.1.5 → 0.1.6

data/README.rdoc

@@ -15,7 +15,7 @@ Testing XML output is difficult:
 EquivalentXml for Nokogiri
 
 === Use
-  EquivalentXml.equivalent?(node_1, node_2, opts = { :element_order => false, :normalize_whitespace => true })
+  EquivalentXml.equivalent?(node_1, node_2, opts = { :element_order => false, :normalize_whitespace => true }) { |n1, n2, result| ... }
 
 node_1 and node_2 can be any Nokogiri::XML::Node descendants (or any string 
 containing an XML document or document fragment). The most common use case is 
@@ -30,6 +30,11 @@ node_1 is equivalent to node_2 if and only if:
 * If called with :element_order => true, equivalent child elements must be
   in the same relative position in order to be considered equal
 
+If a block is given, the block will be called every time two nodes are compared. The parameters will be 
+the two nodes being compared as well as the result of the comparison. If the block explicitly returns 
+`true` or `false` (a real `TrueClass` or `FalseClass`, not just an expression that can be coerced to
+true or false), the return value will override the result of the comparison.
+
 +Element+ nodes are equivalent if they have the same name, and their 
 child nodesets are equal (as defined above)
 

data/lib/equivalent-xml.rb

@@ -12,26 +12,32 @@ require 'nokogiri'
     end
   
     def compare_nodes(node_1, node_2, opts, &block)
-      yield(node_1, node_2) if block_given?
-      
+      result = nil
       if (node_1.class != node_2.class) or self.same_namespace?(node_1,node_2) == false
-        false
+        result = false
       else
         case node_1.node_type
         when Nokogiri::XML::Node::DOCUMENT_NODE
-          self.compare_documents(node_1,node_2,opts,&block)
+          result = self.compare_documents(node_1,node_2,opts,&block)
         when Nokogiri::XML::Node::ELEMENT_NODE
-          self.compare_elements(node_1,node_2,opts,&block)
+          result = self.compare_elements(node_1,node_2,opts,&block)
         when Nokogiri::XML::Node::ATTRIBUTE_NODE
-          self.compare_attributes(node_1,node_2,opts,&block)
+          result = self.compare_attributes(node_1,node_2,opts,&block)
         when Nokogiri::XML::Node::CDATA_SECTION_NODE
-          self.compare_cdata(node_1,node_2,opts,&block)
+          result = self.compare_cdata(node_1,node_2,opts,&block)
         when Nokogiri::XML::Node::TEXT_NODE
-          self.compare_text(node_1,node_2,opts,&block)
+          result = self.compare_text(node_1,node_2,opts,&block)
         else
-          self.compare_children(node_1,node_2,opts,&block)
+          result = self.compare_children(node_1,node_2,opts,&block)
+        end
+      end
+      if block_given?
+        block_result = yield(node_1, node_2, result)
+        if block_result.is_a?(TrueClass) or block_result.is_a?(FalseClass)
+          result = block_result
         end
       end
+      return result
     end
 
     def compare_documents(node_1, node_2, opts, &block)

data/spec/equvalent-xml_spec.rb

@@ -49,6 +49,18 @@ describe EquivalentXml do
     EquivalentXml.equivalent?(doc1,doc2).should == false
   end
 
+  it "should compare namespaces based on URI, not on prefix" do
+    doc1 = Nokogiri::XML("<doc xmlns:foo='foo:bar'><foo:first>foo  bar baz</foo:first><foo:second>things</foo:second></doc>")
+    doc2 = Nokogiri::XML("<doc xmlns:baz='foo:bar'><baz:first>foo  bar baz</baz:first><baz:second>things</baz:second></doc>")
+    EquivalentXml.equivalent?(doc1,doc2).should == true
+  end
+
+  it "should ignore declared but unused namespaces" do
+    doc1 = Nokogiri::XML("<doc xmlns:foo='foo:bar'><first>foo  bar baz</first><second>things</second></doc>")
+    doc2 = Nokogiri::XML("<doc><first>foo  bar baz</first><second>things</second></doc>")
+    EquivalentXml.equivalent?(doc1,doc2).should == true
+  end
+
   it "should normalize simple whitespace by default" do
     doc1 = Nokogiri::XML("<doc xmlns='foo:bar'><first>foo  bar baz</first><second>things</second></doc>")
     doc2 = Nokogiri::XML("<doc xmlns='foo:bar'><first>foo bar  baz</first><second>things</second></doc>")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: equivalent-xml
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Michael B. Klein