equivalent-xml 0.5.1 → 0.6.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MDRhZTQ4ZjZiYmU5ZmIzZTU1M2U5MzU1ZjE1MzY2MjFmN2VlZjUzYg==
-  data.tar.gz: !binary |-
-    NTY1MTViYWYzYjY5NWFmNTU3YjdlYTg4MjRhNjQ2MGFhNjJjNTk5Zg==
+SHA1:
+  metadata.gz: 3051b830ff4fe1eb413f68dca2c295f14822ab3b
+  data.tar.gz: 94e34667fb9b78fde7ae85927a88c66779135627
 SHA512:
-  metadata.gz: !binary |-
-    ZjkwYjhmMjA5Yjg3ZTQyNTI1MjgwZWQ3MjNmMzE3MTM5MTIwOTc0MTlmMDMx
-    NmI4OTljYzA4Njk0ZTdkMDlhMDhmNjQxNTZhMTYxYzFkNWM2MGQ0NDAwNzMw
-    NmM2ZWY1MGUxZTQ1MjcxM2JkNjVlOWQ1MjI2ZWYwNGJjODQ5ZDc=
-  data.tar.gz: !binary |-
-    M2VkNjVlNGQ2YThmYTc4OTQzMTQwYjg2OTJmYjUzODg1YjQwNGY5YmU2YzNj
-    OGM0NTNiYjNhNDk1Y2QxODUyODE4Y2VlYzlmZmMxNzY2Y2I0MTczYmY4Njc3
-    ZTZhODA3OTk3YzdiMDhlOGZjNTZiMjljZTUzM2FmMjg3YzU4Y2U=
+  metadata.gz: 4bfb2eb644e98bdab94a12000885267c85e71d3803fc87f0a33701bd9b4870bd3d59a9288024790298dfbb1c2b4a4c177642a8fe685a46f4b1e31077cd46375d
+  data.tar.gz: b58b66a52065a725671c2b61876708996f55f9871b69cfb3299700a7695ee59827ec33321bad1da0064cfb399edd7cceebfedc6d67aa6e2aecb7e06425c8e27b

data/README.md

@@ -113,6 +113,7 @@ Chained modifiers:
 
 ## History
 
+- <b>0.6.0</b> - Add ability to ignore specific attributes (from paclough); remove circular dependencies (nbibler); Simplify compatibility workaround for message methods (jirutka)
 - <b>0.5.1</b> - Fix false negative when comparing a Nokogiri::XML::Node to a string (introduced in 0.5.0)
 - <b>0.5.0</b> - Allow to compare XML-Fragments in Strings (contrib. by webmasters)
 - <b>0.4.4</b> - Fix rspec 3 deprecation warnings while maintaining compatibility with rspec 1 & 2 (w/assist from barelyknown & DanielHeath)

data/Rakefile

@@ -14,10 +14,7 @@ end
 require 'rake'
 
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new do |t|
-  t.pattern = FileList['./spec/**/*_spec.rb']
-end
-  
+RSpec::Core::RakeTask.new
 task :default => :spec
 
 Rake::RDocTask.new do |rdoc|

data/lib/equivalent-xml.rb

@@ -71,7 +71,9 @@ module EquivalentXml
 
       attr_names_match = node_1.name == node_2.name
 
-      if opts[:ignore_attr_values]
+      ignore_attrs = opts[ :ignore_attr_values ]
+
+      if ignore_attrs && (ignore_attrs.empty? || ignore_attrs.include?( node_1.name ))
         attr_names_match
       else
         attr_names_match && (node_1.value == node_2.value)

data/lib/equivalent-xml/rspec_matchers.rb

@@ -1,4 +1,4 @@
-require 'equivalent-xml'
+require 'equivalent-xml' unless defined?(::EquivalentXml)
 
 begin
   require 'rspec/expectations'
@@ -46,8 +46,8 @@ module EquivalentXml::RSpecMatchers
       opts[:ignore_content] = paths
     end
 
-    chain :ignoring_attr_values do
-      opts[:ignore_attr_values] = true
+    chain :ignoring_attr_values do |*attrs|
+      opts[:ignore_attr_values] = attrs
     end
 
     should_message = lambda do |actual|
@@ -59,12 +59,14 @@ module EquivalentXml::RSpecMatchers
     end
     
     if respond_to?(:failure_message_when_negated)
-      failure_message &should_message
-      failure_message_when_negated &should_not_message
+      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
+      failure_message_for_should(&should_message)
+      failure_message_for_should_not(&should_not_message)
     end
+
+    diffable
   end
 
 end

data/spec/equivalent-xml_spec.rb

@@ -224,6 +224,26 @@ describe EquivalentXml do
     end
   end
 
+  context 'with :ignore_attr_values receiving specific attribute names' do
+    it 'ignores the value of one specified attribute, but fails if other attributes are different, when comparing for equivalence' do
+      doc1 = Nokogiri::XML("<doc xmlns='foo:bar'><first order='1' status='on'>foo  bar baz</first><second>things</second></doc>")
+      doc2 = Nokogiri::XML("<doc xmlns='foo:bar'><first order='2' status='off'>foo  bar baz</first><second>things</second></doc>")
+      expect(doc1).not_to be_equivalent_to(doc2).ignoring_attr_values( 'order' )
+    end
+
+    it 'ignores the value of one specified attribute, but succeeds if other attributes match, when comparing for equivalence' do
+      doc1 = Nokogiri::XML("<doc xmlns='foo:bar'><first order='1' status='on'>foo  bar baz</first><second>things</second></doc>")
+      doc2 = Nokogiri::XML("<doc xmlns='foo:bar'><first order='2' status='on'>foo  bar baz</first><second>things</second></doc>")
+      expect(doc1).to be_equivalent_to(doc2).ignoring_attr_values( 'order' )
+    end
+
+    it 'ignores the values of multiple specified attributes when comparing for equivalence' do
+      doc1 = Nokogiri::XML("<doc xmlns='foo:bar'><first order='1' status='on' changed='no'>foo  bar baz</first><second>things</second></doc>")
+      doc2 = Nokogiri::XML("<doc xmlns='foo:bar'><first order='2' status='off' changed='no'>foo  bar baz</first><second>things</second></doc>")
+      expect(doc1).to be_equivalent_to(doc2).ignoring_attr_values( 'order', 'status' )
+    end
+  end
+
   context "(on fragments consisting of multiple nodes)" do
     it "should compare all nodes" do
       doc1 = "<h1>Headline</h1><h1>Headline</h1>"

metadata

@@ -1,100 +1,100 @@
 --- !ruby/object:Gem::Specification
 name: equivalent-xml
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Michael B. Klein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-16 00:00:00.000000000 Z
+date: 2015-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.12'
-description: ! "Compares two XML Nodes (Documents, etc.) for certain semantic equivalencies.
+description: "Compares two XML Nodes (Documents, etc.) for certain semantic equivalencies.
   \n    Currently written for Nokogiri, but with an eye toward supporting multiple
   XML libraries"
 email: mbklein@gmail.com
@@ -121,12 +121,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []