nokogiri-diff 0.1.2 → 0.2.0

data/ChangeLog.md

@@ -1,6 +1,14 @@
+### 0.2.0 / 2013-04-22
+
+* {Nokogiri::XML::Node#tdiff_each_child} now sorts attributes by name, so that
+  changes in attribute order is ignored. (thanks @bhollis)
+* {Nokogiri::XML::Node#tdiff_equal} now supports `Nokogiri::XML::Comment`
+  and `Nokogiri::XML::ProcessingInstruction` objects. (thanks @bhollis)
+
 ### 0.1.2 / 2012-05-28
 
 * Require tdiff ~> 0.3, >= 0.3.2.
+* Added {Nokogiri::Diff::VERSION}.
 * Replaced ore-tasks with
   [rubygems-tasks](https://github.com/postmodern/rubygems-tasks#readme).
 

data/lib/nokogiri/diff/version.rb

@@ -1,6 +1,6 @@
 module Nokogiri
   module Diff
     # nokogiri-diff version
-    VERSION = '0.1.2'
+    VERSION = '0.2.0'
   end
 end

data/lib/nokogiri/diff/xml/document.rb

@@ -6,7 +6,7 @@ class Nokogiri::XML::Document < Nokogiri::XML::Node
   # Overrides `tdiff` to only compare the child nodes of the document.
   #
   def tdiff(tree,&block)
-    return enum_for(:tdiff,tree) unless block
+    return enum_for(__method__,tree) unless block
 
     tdiff_recursive(tree,&block)
     return self
@@ -16,7 +16,7 @@ class Nokogiri::XML::Document < Nokogiri::XML::Node
   # Overrides `tdiff_unordered` to only compare the child nodes of the document.
   #
   def tdiff_unordered(tree,&block)
-    return enum_for(:tdiff_unordered,tree) unless block
+    return enum_for(__method__,tree) unless block
 
     tdiff_recursive_unordered(tree,&block)
     return self

data/lib/nokogiri/diff/xml/node.rb

@@ -22,8 +22,10 @@ class Nokogiri::XML::Node
         (self.name == node.name && self.value == node.value)
       when Nokogiri::XML::Element, Nokogiri::XML::DTD
         self.name == node.name
-      when Nokogiri::XML::Text
+      when Nokogiri::XML::Text, Nokogiri::XML::Comment
         self.text == node.text
+      when Nokogiri::XML::ProcessingInstruction
+        (self.name == node.name && self.content = self.content)
       else
         false
       end
@@ -46,7 +48,7 @@ class Nokogiri::XML::Node
   #
   def tdiff_each_child(node,&block)
     if node.kind_of?(Nokogiri::XML::Element)
-      node.attribute_nodes.each(&block)
+      node.attribute_nodes.sort_by(&:name).each(&block)
     end
 
     node.children.each(&block)
@@ -80,14 +82,12 @@ class Nokogiri::XML::Node
   #   If no block was given, an Enumerator object will be returned.
   #
   def diff(other,options={},&block)
-    return enum_for(:diff,other,options) unless block
+    return enum_for(__method__,other,options) unless block
 
     if (options[:added] || options[:removed])
       tdiff_unordered(other) do |change,node|
-        if (change == '+' && options[:added])
-          yield change, node
-        elsif (change == '-' && options[:removed])
-          yield change, node
+        if    (change == '+' && options[:added])   then yield change, node
+        elsif (change == '-' && options[:removed]) then yield change, node
         end
       end
     else

data/spec/diff_spec.rb

@@ -3,20 +3,22 @@ require 'nokogiri/diff'
 
 describe "nokogiri/diff" do
   let(:contents) { '<div><p>one</p></div>' }
-  let(:doc) { Nokogiri::XML(contents) }
+  let(:doc)      { Nokogiri::XML(contents) }
 
-  let(:added_text) { Nokogiri::XML('<div><p>one</p>two</div>') }
+  let(:added_text)    { Nokogiri::XML('<div><p>one</p>two</div>') }
   let(:added_element) { Nokogiri::XML('<div><p>one</p><p>two</p></div>') }
-  let(:added_attr) { Nokogiri::XML('<div><p id="1">one</p></div>') }
+  let(:added_attr)    { Nokogiri::XML('<div><p id="1">one</p></div>') }
+  let(:added_attrs)   { Nokogiri::XML('<div><p id="1" class="2">one</p></div>') }
 
-  let(:changed_text) { Nokogiri::XML('<div><p>two</p></div>') }
-  let(:changed_element) { Nokogiri::XML('<div><span>one</span></div>') }
-  let(:changed_attr_name) { Nokogiri::XML('<div><p i="1">one</p></div>') }
+  let(:changed_text)       { Nokogiri::XML('<div><p>two</p></div>') }
+  let(:changed_element)    { Nokogiri::XML('<div><span>one</span></div>') }
+  let(:changed_attr_name)  { Nokogiri::XML('<div><p i="1">one</p></div>') }
   let(:changed_attr_value) { Nokogiri::XML('<div><p id="2">one</p></div>') }
+  let(:changed_attr_order) { Nokogiri::XML('<div><p class="2" id="1">one</p></div>') }
 
-  let(:removed_text) { Nokogiri::XML('<div><p></p>two</div>') }
+  let(:removed_text)    { Nokogiri::XML('<div><p></p>two</div>') }
   let(:removed_element) { Nokogiri::XML('<div></div>') }
-  let(:removed_attr) { Nokogiri::XML('<div><p>one</p></div>') }
+  let(:removed_attr)    { Nokogiri::XML('<div><p>one</p></div>') }
 
   it "should add #diff to Nokogiri::XML::Docuemnt" do
     doc.should respond_to(:diff)
@@ -92,6 +94,12 @@ describe "nokogiri/diff" do
     changes[4][1].should == added_element.at('//p[2]/text()')
   end
 
+  it "should ignore when attribute order changes" do
+    changes = added_attrs.at('p').diff(changed_attr_order.at('p')).to_a
+
+    changes.all? { |change| change[0] == ' ' }.should be_true
+  end
+
   it "should determine when attributes are added" do
     changes = doc.at('p').diff(added_attr.at('p')).to_a
 
@@ -206,6 +214,9 @@ describe "nokogiri/diff" do
     changes[2][1].should == added_element.at('//p[2]')
   end
 
+  it "should ignore when attributes change order" do
+  end
+
   it "should determine when attributes are removed" do
     changes = added_attr.at('div').diff(removed_attr.at('div')).to_a
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri-diff
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-28 00:00:00.000000000 Z
+date: 2013-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tdiff
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Calculate the differences between two XML/HTML documents.