equivalent-xml 0.2.2 → 0.2.4

data/lib/equivalent-xml.rb

@@ -13,7 +13,9 @@ require 'nokogiri'
   
     def compare_nodes(node_1, node_2, opts, &block)
       result = nil
-      if (node_1.class != node_2.class) or self.same_namespace?(node_1,node_2) == false
+      if [node_1, node_2].any? { |node| not node.respond_to?(:node_type) }
+        result = node_1.to_s == node_2.to_s
+      elsif (node_1.class != node_2.class) or self.same_namespace?(node_1,node_2) == false
         result = false
       else
         case node_1.node_type
@@ -108,14 +110,17 @@ require 'nokogiri'
     end
 
     def same_namespace?(node_1, node_2)
-      unless node_1.respond_to?(:namespace) and node_2.respond_to?(:namespace)
-        return true
+      args = [node_1,node_2]
+
+      # CharacterData nodes shouldn't have namespaces. But in Nokogiri,
+      # they do. And they're invisible. And they get corrupted easily.
+      # So let's wilfully ignore them. And while we're at it, let's
+      # ignore any class that doesn't know it has a namespace.
+      if args.all? { |node| not node.respond_to?(:namespace) } or 
+         args.any? { |node| node.is_a?(Nokogiri::XML::CharacterData) }
+           return true
       end
       
-      if node_1.namespace.nil? and node_2.namespace.nil?
-        return true
-      end
-    
       href1 = node_1.namespace.nil? ? '' : node_1.namespace.href
       href2 = node_2.namespace.nil? ? '' : node_2.namespace.href
       return href1 == href2
@@ -125,7 +130,12 @@ require 'nokogiri'
       if data.respond_to?(:node_type)
         return data
       else
-        return Nokogiri::XML(data)
+        result = Nokogiri::XML(data)
+        if result.root.nil?
+          return data
+        else
+          return result
+        end
       end
     end
     

data/lib/equivalent-xml/rspec_matchers.rb

@@ -16,11 +16,7 @@ rspec_namespace.define :be_equivalent_to do |expected, opts|
   match do |actual|
     @expected = expected
     @actual = actual
-    EquivalentXml.equivalent?(@actual,@expected,@opts) { |n1,n2,result|
-      if result == false and @failure_nodes.nil?
-        @failure_nodes = { :expected => n2, :actual => n1 }
-      end
-    }
+    EquivalentXml.equivalent?(@actual,@expected,@opts)
   end
   
   chain :respecting_element_order do 
@@ -34,18 +30,18 @@ rspec_namespace.define :be_equivalent_to do |expected, opts|
   failure_message_for_should do
     <<-MESSAGE
 expected:
-#{@failure_nodes[:expected].to_xml}
+#{@expected.to_s}
 got:
-#{@failure_nodes[:actual].to_xml}
+#{@actual.to_s}
 MESSAGE
   end
       
   failure_message_for_should_not do
     <<-MESSAGE
 expected:
-#{@actual.to_xml}
+#{@actual.to_s}
 not to be equivalent to:
-#{@expected.to_xml}
+#{@expected.to_s}
 MESSAGE
   end
 

data/spec/equivalent-xml_spec.rb

@@ -10,6 +10,16 @@ describe EquivalentXml do
     doc1.should be_equivalent_to(doc1)
   end
   
+  it "should compare non-XML content based on its string representation" do
+    nil.should be_equivalent_to(nil)
+    ''.should be_equivalent_to('')
+    ''.should be_equivalent_to(nil)
+    'foo'.should be_equivalent_to('foo')
+    'foo'.should_not be_equivalent_to('bar')
+    doc1 = Nokogiri::XML("<doc xmlns='foo:bar'><first order='1'>foo  bar baz</first><second>things</second></doc>")
+    doc1.should_not be_equivalent_to(nil)
+  end
+
   it "should ensure that attributes match" do
     doc1 = Nokogiri::XML("<doc xmlns='foo:bar'><first order='1'>foo  bar baz</first><second>things</second></doc>")
     doc2 = Nokogiri::XML("<doc xmlns='foo:bar'><first order='2'>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: 19
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Michael B. Klein