equivalent-xml 0.4.2 → 0.4.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWQxNTcyMmQxZDQ3ZTNmNTg4ZmVhMmYyMzhlYzc0MzI0ZjgxNTkyYw==
+    N2UyN2Q1OTkwM2EwOGVmYjc3OTk1ZDI3NDVjMGIwNzAzMDY4MTViNg==
   data.tar.gz: !binary |-
-    NGViYmU3NTJhNmExMTMxODlkMjQwNTQzZDVhZjE5ZTQ1MTVhMjk0OA==
+    ODlkOGEwZTZjNjg1NzE5ODI2YmFmMjUyMDM0YzFjMzAyYWUxZGEwMA==
 SHA512:
   metadata.gz: !binary |-
-    N2YyYWNkZDkxNDI1NWJhNjM0MDYwYmI3MjFhMTE0M2JiNjhjODIxOGMwNGRm
-    ZDkzMDRjZTI5YTAxY2ZhY2RiODgyYTEyMjY4Nzk5MzgyNWUxMGYzYTFlNWE0
-    YzJmMTY5ZTE2ZDM2NTIxNWYwYmNhMzY0MTFiZDNmNTUxZTNmYzU=
+    NzUyYmEzNjVjYzhjZGE0YTFmMDg4YTlhMGRkNGEzYThhYmYzZTA5MTNlOGRi
+    ODk3ZGQ4ZmJlOTljMDlhY2Y2ZWE4NWUwMDJhNzk4NWEyOWE4ZDI0NjY4MzQy
+    NGY2YjllNmMxOWNkMWE5NmJlNjAwMTIxNzY0ZDkwMjdkOTA2NmE=
   data.tar.gz: !binary |-
-    ZTIxMzkwMWIzZWQ2MGQxYTI3YmM2OTY0M2FkNDcxNjMyNDEzNmJkYTBkNTk4
-    NWNlOGM2ZGVhNjU0YmRiMGUyZjdlOTY4N2Y5M2IyZWI0ZWM3N2I5OWQ1MmVk
-    YzNiYjE1Y2YwMzJlMGJiNDBhYjg2ZGMxMzI0YTkxZmRkZjViMTk=
+    OGIyMWRlZTVhYmFmZGE5MTE4MzQ5MjkxNmJjNjNkZDVlNTljM2MxNmZhNmQ4
+    MjYyZDQ4Y2ZiMzA3ODg0Zjg4ODA0NTY0M2MyMmNjZTgzNWQ1Nzk2ZDIyMmNl
+    NzYxNGNjMzBhNzc4MDk0MmY0NTIxYTY0NmQ0YzBmM2U1ZmViOGE=

data/README.md

@@ -106,6 +106,7 @@ Chained modifiers:
 
 ## History
 
+- <b>0.4.3</b> - Updates for rspec 3
 - <b>0.4.2</b> - Move version back into gemspec for now
 - <b>0.4.1</b> - Improved RSpec version checking (contrib. by elandesign)
 - <b>0.4.0</b> - Added :ignore_attr_values option (contrib. by ivannovosad)

data/lib/equivalent-xml/rspec_matchers.rb

@@ -1,7 +1,7 @@
 require 'equivalent-xml'
 
 begin
-  require 'rspec-expectations'
+  require 'rspec/expectations'
 rescue LoadError
 end
 
@@ -16,7 +16,7 @@ module EquivalentXml::RSpecMatchers
   end
 
   # Determine if the receiver is equivalent to the argument as defined
-  # in {file:README.rdoc README.rdoc} and {EquivalentXml.equivalent? EquivalentXml.equivalent?}. 
+  # in {file:README.rdoc README.rdoc} and {EquivalentXml.equivalent? EquivalentXml.equivalent?}.
   #   node.should be_equivalent_to(other_node)
   #   node.should_not be_equivalent_to(other_node)
   #   node.should be_equivalent_to(other_node).respecting_element_order
@@ -29,31 +29,31 @@ module EquivalentXml::RSpecMatchers
   end
 
   rspec_namespace.define :be_equivalent_to do |expected|
-    @opts = {}
+    opts = {}
     match do |actual|
-      EquivalentXml.equivalent?(actual,expected,@opts)
+      EquivalentXml.equivalent?(actual,expected,opts)
     end
-  
+
     chain :respecting_element_order do
-      @opts[:element_order] = true
+      opts[:element_order] = true
     end
-  
+
     chain :with_whitespace_intact do
-      @opts[:normalize_whitespace] = false
+      opts[:normalize_whitespace] = false
     end
 
     chain :ignoring_content_of do |paths|
-      @opts[:ignore_content] = paths
+      opts[:ignore_content] = paths
     end
 
     chain :ignoring_attr_values do
-      @opts[:ignore_attr_values] = true
+      opts[:ignore_attr_values] = true
     end
-  
+
     failure_message_for_should do |actual|
       [ 'expected:', expected.to_s, 'got:', actual.to_s ].join("\n")
     end
-      
+
     failure_message_for_should_not do |actual|
       [ 'expected:', actual.to_s, 'not to be equivalent to:', expected.to_s ].join("\n")
     end

data/spec/equivalent-xml_spec.rb

@@ -11,81 +11,81 @@ describe EquivalentXml do
 
   it "should consider a document equivalent to itself" do
     doc1 = Nokogiri::XML("<doc xmlns='foo:bar'><first>foo  bar baz</first><second>things</second></doc>")
-    doc1.should be_equivalent_to(doc1)
+    expect(doc1).to 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')
+    expect(nil).to be_equivalent_to(nil)
+    expect('').to be_equivalent_to('')
+    expect('').to be_equivalent_to(nil)
+    expect('foo').to be_equivalent_to('foo')
+    expect('foo').not_to 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)
+    expect(doc1).not_to 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>")
-    doc1.should_not be_equivalent_to(doc2)
+    expect(doc1).not_to be_equivalent_to(doc2)
 
     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='1'>foo  bar baz</first><second>things</second></doc>")
-    doc1.should be_equivalent_to(doc2)
+    expect(doc1).to be_equivalent_to(doc2)
   end
-  
+
   it "shouldn't care about attribute order" do
     doc1 = Nokogiri::XML("<doc xmlns='foo:bar'><first order='1' value='quux'>foo  bar baz</first><second>things</second></doc>")
     doc2 = Nokogiri::XML("<doc xmlns='foo:bar'><first value='quux' order='1'>foo  bar baz</first><second>things</second></doc>")
-    doc1.should be_equivalent_to(doc2)
+    expect(doc1).to be_equivalent_to(doc2)
   end
-  
+
   it "shouldn't care about element order 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'><second>things</second><first>foo  bar baz</first></doc>")
-    doc1.should be_equivalent_to(doc2)
+    expect(doc1).to be_equivalent_to(doc2)
   end
-  
+
   it "should care about element order if :element_order => true is specified" do
     doc1 = Nokogiri::XML("<doc xmlns='foo:bar'><first>foo  bar baz</first><second>things</second></doc>")
     doc2 = Nokogiri::XML("<doc xmlns='foo:bar'><second>things</second><first>foo  bar baz</first></doc>")
-    doc1.should_not be_equivalent_to(doc2).respecting_element_order
+    expect(doc1).not_to be_equivalent_to(doc2).respecting_element_order
   end
-  
+
   it "should ensure nodesets have the same number of elements" do
     doc1 = Nokogiri::XML("<doc xmlns='foo:bar'><first>foo  bar baz</first><second>things</second></doc>")
     doc2 = Nokogiri::XML("<doc xmlns='foo:bar'><second>things</second><first>foo  bar baz</first><third/></doc>")
-    doc1.should_not be_equivalent_to(doc2)
+    expect(doc1).not_to be_equivalent_to(doc2)
   end
 
   it "should ensure namespaces match" do
     doc1 = Nokogiri::XML("<doc xmlns='foo:bar'><first>foo  bar baz</first><second>things</second></doc>")
     doc2 = Nokogiri::XML("<doc xmlns='foo:baz'><first>foo  bar baz</first><second>things</second></doc>")
-    doc1.should_not be_equivalent_to(doc2)
+    expect(doc1).not_to be_equivalent_to(doc2)
   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>")
-    doc1.should be_equivalent_to(doc2)
+    expect(doc1).to be_equivalent_to(doc2)
   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>")
-    doc1.should be_equivalent_to(doc2)
+    expect(doc1).to be_equivalent_to(doc2)
   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>")
-    doc1.should be_equivalent_to(doc2)
+    expect(doc1).to be_equivalent_to(doc2)
   end
 
   it "shouldn't normalize simple whitespace if :normalize_whitespace => false is specified" 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>")
-    doc1.should_not be_equivalent_to(doc2).with_whitespace_intact
+    expect(doc1).not_to be_equivalent_to(doc2).with_whitespace_intact
   end
 
   it "should normalize complex whitespace by default" do
@@ -97,9 +97,9 @@ describe EquivalentXml do
         bar baz
       </first>
     </doc>})
-    doc1.should be_equivalent_to(doc2)
+    expect(doc1).to be_equivalent_to(doc2)
   end
-  
+
   it "shouldn't normalize complex whitespace if :normalize_whitespace => false is specified" do
     doc1 = Nokogiri::XML("<doc xmlns='foo:bar'><first>foo  bar baz</first><second>things</second></doc>")
     doc2 = Nokogiri::XML(%{<doc xmlns='foo:bar'>
@@ -109,7 +109,7 @@ describe EquivalentXml do
         bar baz
       </first>
     </doc>})
-    doc1.should_not be_equivalent_to(doc2).with_whitespace_intact
+    expect(doc1).not_to be_equivalent_to(doc2).with_whitespace_intact
   end
 
   it "should ignore comment nodes" do
@@ -122,33 +122,33 @@ describe EquivalentXml do
         bar baz
       </first>
     </doc>})
-    doc1.should be_equivalent_to(doc2)
+    expect(doc1).to be_equivalent_to(doc2)
   end
-  
+
   it "should properly handle a mixture of text and element nodes" do
     doc1 = Nokogiri::XML("<doc xmlns='foo:bar'><phrase>This phrase <b>has bold text</b> in it.</phrase></doc>")
     doc2 = Nokogiri::XML("<doc xmlns='foo:bar'><phrase>This phrase in <b>has bold text</b> it.</phrase></doc>")
-    doc1.should_not be_equivalent_to(doc2)
+    expect(doc1).not_to be_equivalent_to(doc2)
   end
 
   it "should properly handle documents passed in as strings" do
     doc1 = "<doc xmlns='foo:bar'><first order='1'>foo  bar baz</first><second>things</second></doc>"
     doc2 = "<doc xmlns='foo:bar'><first order='1'>foo  bar baz</first><second>things</second></doc>"
-    doc1.should be_equivalent_to(doc2)
+    expect(doc1).to be_equivalent_to(doc2)
 
     doc1 = "<doc xmlns='foo:bar'><first order='1'>foo  bar baz</first><second>things</second></doc>"
     doc2 = "<doc xmlns='foo:bar'><first order='1'>foo  bar baz quux</first><second>things</second></doc>"
-    doc1.should_not be_equivalent_to(doc2)
+    expect(doc1).not_to be_equivalent_to(doc2)
   end
 
   it "should compare nodesets" do
     doc1 = Nokogiri::XML("<doc xmlns='foo:bar'><first>foo  bar baz</first><second>things</second></doc>")
-    doc1.root.children.should be_equivalent_to(doc1.root.children)
+    expect(doc1.root.children).to be_equivalent_to(doc1.root.children)
   end
-  
+
   it "should compare nodeset with string" do
     doc1 = Nokogiri::XML("<doc xmlns='foo:bar'><first>foo  bar baz</first><second>things</second></doc>")
-    doc1.root.children.should be_equivalent_to("<first xmlns='foo:bar'>foo  bar baz</first><second xmlns='foo:bar'>things</second>")
+    expect(doc1.root.children).to be_equivalent_to("<first xmlns='foo:bar'>foo  bar baz</first><second xmlns='foo:bar'>things</second>")
   end
 
   context "with the :ignore_content_paths option set to a CSS selector" do
@@ -156,47 +156,47 @@ describe EquivalentXml do
       doc1 = Nokogiri::XML("<Devices><Device><Name>iPhone</Name><SerialNumber>1234</SerialNumber></Device></Devices>")
       doc2 = Nokogiri::XML("<Devices><Device><Name>iPhone</Name><SerialNumber>5678</SerialNumber></Device></Devices>")
 
-      EquivalentXml.equivalent?(doc1, doc2, :ignore_content => "SerialNumber").should be_true
-      EquivalentXml.equivalent?(doc1, doc2, :ignore_content => "Devices>Device>SerialNumber").should be_true
+      expect(EquivalentXml.equivalent?(doc1, doc2, :ignore_content => "SerialNumber")).to eq(true)
+      expect(EquivalentXml.equivalent?(doc1, doc2, :ignore_content => "Devices>Device>SerialNumber")).to eq(true)
 
-      doc1.should be_equivalent_to(doc2).ignoring_content_of("SerialNumber")
-      doc1.should be_equivalent_to(doc2).ignoring_content_of("Devices>Device>SerialNumber")
+      expect(doc1).to be_equivalent_to(doc2).ignoring_content_of("SerialNumber")
+      expect(doc1).to be_equivalent_to(doc2).ignoring_content_of("Devices>Device>SerialNumber")
     end
 
     it "ignores the text content of a node that matches the given CSS selector when comparing with a matcher" do
       doc1 = Nokogiri::XML("<Devices><Device><Name>iPhone</Name><SerialNumber>1234</SerialNumber></Device></Devices>")
       doc2 = Nokogiri::XML("<Devices><Device><Name>iPhone</Name><SerialNumber>5678</SerialNumber></Device></Devices>")
 
-      doc1.should be_equivalent_to(doc2).ignoring_content_of("SerialNumber")
-      doc1.should be_equivalent_to(doc2).ignoring_content_of("Devices>Device>SerialNumber")
+      expect(doc1).to be_equivalent_to(doc2).ignoring_content_of("SerialNumber")
+      expect(doc1).to be_equivalent_to(doc2).ignoring_content_of("Devices>Device>SerialNumber")
     end
 
     it "ignores all children of a node that matches the given selector when comparing for equivalence" do
       doc1 = Nokogiri::XML("<Devices><Device><Name>iPhone</Name><SerialNumber>1234</SerialNumber></Device></Devices>")
       doc2 = Nokogiri::XML("<Devices><Device><Name>iPad</Name><SerialNumber>5678</SerialNumber></Device></Devices>")
 
-      doc1.should be_equivalent_to(doc2).ignoring_content_of("Device")
+      expect(doc1).to be_equivalent_to(doc2).ignoring_content_of("Device")
     end
 
     it "still considers the number of elements even if they match the given CSS selector" do
       doc1 = Nokogiri::XML("<Devices><Device><Name>iPhone</Name><SerialNumber>1234</SerialNumber></Device></Devices>")
       doc2 = Nokogiri::XML("<Devices><Device><Name>iPhone</Name><SerialNumber>1234</SerialNumber></Device><Device><Name>iPad</Name><SerialNumber>5678</SerialNumber></Device></Devices>")
 
-      doc1.should_not be_equivalent_to(doc2).ignoring_content_of("Device")
+      expect(doc1).not_to be_equivalent_to(doc2).ignoring_content_of("Device")
     end
 
     it "still considers attributes on the matched path when comparing for equivalence" do
       doc1 = Nokogiri::XML("<Devices><Device status='owned'><Name>iPhone</Name><SerialNumber>1234</SerialNumber></Device></Devices>")
       doc2 = Nokogiri::XML("<Devices><Device status='rented'><Name>iPhone</Name><SerialNumber>1234</SerialNumber></Device></Devices>")
 
-      doc1.should_not be_equivalent_to(doc2).ignoring_content_of("Device")
+      expect(doc1).not_to be_equivalent_to(doc2).ignoring_content_of("Device")
     end
 
     it "ignores all matches of the CSS selector" do
       doc1 = Nokogiri::XML("<Devices><Device><Name>iPhone</Name><SerialNumber>1001</SerialNumber></Device><Device><Name>iPad</Name><SerialNumber>2001</SerialNumber></Device></Devices>")
       doc2 = Nokogiri::XML("<Devices><Device><Name>iPhone</Name><SerialNumber>1002</SerialNumber></Device><Device><Name>iPad</Name><SerialNumber>2002</SerialNumber></Device></Devices>")
 
-      doc1.should be_equivalent_to(doc2).ignoring_content_of("SerialNumber")
+      expect(doc1).to be_equivalent_to(doc2).ignoring_content_of("SerialNumber")
     end
   end
 
@@ -205,7 +205,7 @@ describe EquivalentXml do
       doc1 = Nokogiri::XML("<Devices><Device><Name>iPhone</Name><SerialNumber>1234</SerialNumber><ICCID>AAAA</ICCID></Device></Devices>")
       doc2 = Nokogiri::XML("<Devices><Device><Name>iPhone</Name><SerialNumber>5678</SerialNumber><ICCID>BBBB</ICCID></Device></Devices>")
 
-      doc1.should be_equivalent_to(doc2).ignoring_content_of(["SerialNumber", "ICCID"])
+      expect(doc1).to be_equivalent_to(doc2).ignoring_content_of(["SerialNumber", "ICCID"])
     end
   end
 
@@ -213,7 +213,7 @@ describe EquivalentXml do
     it "ignores the values of attributes when comparing for equivalence" 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>")
-      doc1.should be_equivalent_to(doc2).ignoring_attr_values
+      expect(doc1).to be_equivalent_to(doc2).ignoring_attr_values
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: equivalent-xml
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Michael B. Klein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-17 00:00:00.000000000 Z
+date: 2014-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri