equivalent-xml 0.4.3 → 0.4.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2UyN2Q1OTkwM2EwOGVmYjc3OTk1ZDI3NDVjMGIwNzAzMDY4MTViNg==
+    MjZkNWNmMGY5ZGUzOTNkYzMwYWUxOGVmODljYzgyMTgzZjc4YzEyMw==
   data.tar.gz: !binary |-
-    ODlkOGEwZTZjNjg1NzE5ODI2YmFmMjUyMDM0YzFjMzAyYWUxZGEwMA==
+    Mjk5ZjM4ZTA0N2UwNWJjNjI3ZGRlNTk2OTk0M2UyZGUxYzE5NTNiYw==
 SHA512:
   metadata.gz: !binary |-
-    NzUyYmEzNjVjYzhjZGE0YTFmMDg4YTlhMGRkNGEzYThhYmYzZTA5MTNlOGRi
-    ODk3ZGQ4ZmJlOTljMDlhY2Y2ZWE4NWUwMDJhNzk4NWEyOWE4ZDI0NjY4MzQy
-    NGY2YjllNmMxOWNkMWE5NmJlNjAwMTIxNzY0ZDkwMjdkOTA2NmE=
+    YTYxODA2Y2ZjNDFjZWM3OGY0MTA3MmJiNzgxMTBlZWRhMTg4NzY4M2Q3YTc0
+    NTJmMjM0YWFjNGFlOGZmZmRiNTI5NzQ3ZWMyNDM5ZjJiZjZkYjJiMjBhMTEz
+    NmFhNGU0ZGQ1MjhlZWJjOWY4N2Q1NzhhNTIwNTAyNWFlODFjNjg=
   data.tar.gz: !binary |-
-    OGIyMWRlZTVhYmFmZGE5MTE4MzQ5MjkxNmJjNjNkZDVlNTljM2MxNmZhNmQ4
-    MjYyZDQ4Y2ZiMzA3ODg0Zjg4ODA0NTY0M2MyMmNjZTgzNWQ1Nzk2ZDIyMmNl
-    NzYxNGNjMzBhNzc4MDk0MmY0NTIxYTY0NmQ0YzBmM2U1ZmViOGE=
+    Y2EyYjA5MDQ3N2UzOTQ3MGFiMDU3ODdjNTdmYWY2ZGU3OTc4ZDNhYWEyMjYy
+    MmQzNGU3ZDIzYzI0MTJkNGQzZjI1NGY5YzJmZjc2MjQ1YmY2YjgxYzc1OGU0
+    MDY1YzVlMzcxYmQzMjNiM2E0MGQxOTA4ODg5NDYxYzY4MjY5MTU=

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Michael B. Klein
+Copyright (c) 2011-14 Michael B. Klein
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -81,17 +81,24 @@ nodes) should be ignored when comparing for equivalence.  Defaults to `nil`.  (U
 EquivalentXml includes a custom matcher for RSpec (version >=1.2.4) that makes including XML
 equivalencies in your spec tests a cinch!
 
+Add below two line to `spec_helper.rb`:
+
+```ruby
+require 'rspec/matchers' # req by equivalent-xml custom matcher `be_equivalent_to`
+require 'equivalent-xml'
+```
+
 Equivalency:
 
-    node_1.should be_equivalent_to(node_2)
-    node_1.should_not be_equivalent_to(node_2)
+    expect(node_1).to be_equivalent_to(node_2)
+    expect(node_1).not_to be_equivalent_to(node_2)
 
 Chained modifiers:
 
-    node_1.should be_equivalent_to(node_2).respecting_element_order
-    node_1.should be_equivalent_to(node_2).with_whitespace_intact
-    node_1.should be_equivalent_to(node_2).respecting_element_order.with_whitespace_intact
-    node_1.should be_equivalent_to(node_2).ignoring_content_of("SerialNumber")
+    expect(node_1).to be_equivalent_to(node_2).respecting_element_order
+    expect(node_1).to be_equivalent_to(node_2).with_whitespace_intact
+    expect(node_1).to be_equivalent_to(node_2).respecting_element_order.with_whitespace_intact
+    expect(node_1).to be_equivalent_to(node_2).ignoring_content_of("SerialNumber")
 
 ## Contributing to equivalent-xml
  
@@ -106,6 +113,7 @@ Chained modifiers:
 
 ## History
 
+- <b>0.4.4</b> - Fix rspec 3 deprecation warnings while maintaining compatibility with rspec 1 & 2 (w/assist from barelyknown & DanielHeath)
 - <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)
@@ -131,5 +139,4 @@ Chained modifiers:
 
 ## Copyright
 
-Copyright (c) 2011 Michael B. Klein. See LICENSE.txt for further details.
-
+Copyright (c) 2011-14 Michael B. Klein. See LICENSE.txt for further details.

data/lib/equivalent-xml/rspec_matchers.rb

@@ -50,13 +50,21 @@ module EquivalentXml::RSpecMatchers
       opts[:ignore_attr_values] = true
     end
 
-    failure_message_for_should do |actual|
+    should_message = lambda do |actual|
       [ 'expected:', expected.to_s, 'got:', actual.to_s ].join("\n")
     end
 
-    failure_message_for_should_not do |actual|
+    should_not_message = lambda do |actual|
       [ 'expected:', actual.to_s, 'not to be equivalent to:', expected.to_s ].join("\n")
     end
+    
+    if respond_to?(:failure_message_when_negated)
+      failure_message &should_message
+      failure_message_when_negated &should_not_message
+    else
+      failure_message_for_should &should_message
+      failure_message_for_should_not &should_not_message
+    end
   end
 
 end

metadata

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