tdiff 0.2.0 → 0.3.0

data/ChangeLog.md

@@ -1,3 +1,7 @@
+### 0.3.0 / 2010-11-15
+
+* Changed {TDiff#tdiff_equal} to compare `self` with another node.
+
 ### 0.2.0 / 2010-11-14
 
 * Added {TDiff::Unordered}.

data/README.md

@@ -29,22 +29,22 @@ Diff two HTML documents:
 
       include TDiff
 
-      def tdiff_each_child(node,&block)
-        node.children.each(&block)
-      end
-
-      def tdiff_equal(node1,node2)
-        if (node1.text? && node2.text?)
-          node1.text == node2.text
-        elsif (node1.respond_to?(:root) && node2.respond_to?(:root))
-          tdiff_equal(node1.root,node2.root)
-        elsif (node1.respond_to?(:name) && node2.respond_to?(:name))
-          node1.name == node2.name
+      def tdiff_equal(node)
+        if (self.text? && node.text?)
+          self.text == node.text
+        elsif (self.respond_to?(:root) && node.respond_to?(:root))
+          self.root.tdiff_equal(node.root)
+        elsif (self.respond_to?(:name) && node.respond_to?(:name))
+          self.name == node.name
         else
           false
         end
       end
 
+      def tdiff_each_child(node,&block)
+        node.children.each(&block)
+      end
+
     end
 
     doc1 = Nokogiri::HTML('<div><p>one</p> <p>three</p></div>')

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 
 begin
-  gem 'ore-tasks', '~> 0.2.0'
+  gem 'ore-tasks', '~> 0.3.0'
   require 'ore/tasks'
 
   Ore::Tasks.new

data/gemspec.yml

@@ -1,5 +1,5 @@
 name: tdiff
-version: 0.2.0
+version: 0.3.0
 summary: Calculates the differences between two tree-like structures.
 description:
   Calculates the differences between two tree-like structures. Similar to
@@ -12,6 +12,6 @@ homepage: http://github.com/postmodern/tdiff
 has_yard: true
 
 development_dependencies:
-  ore-tasks: ~> 0.2.0
+  ore-tasks: ~> 0.3.0
   rspec: ~> 2.1.0
   yard: ~> 0.6.0

data/lib/tdiff/tdiff.rb

@@ -18,19 +18,16 @@ module TDiff
   end
 
   #
-  # Default method which compares two nodes.
+  # Default method which compares nodes.
   #
-  # @param [Object] original_node
-  #   A node from the original tree.
-  #
-  # @param [Object] new_node
+  # @param [Object] node
   #   A node from the new tree.
   #
   # @return [Boolean]
-  #   Specifies whether the two nodes are equal.
+  #   Specifies whether the nodes are equal.
   #
-  def tdiff_equal(original_node,new_node)
-    original_node == new_node
+  def tdiff_equal(node)
+    self == node
   end
 
   #
@@ -55,7 +52,7 @@ module TDiff
     return enum_for(:tdiff,tree) unless block
 
     # check if the nodes differ
-    unless tdiff_equal(self,tree)
+    unless tdiff_equal(tree)
       yield '-', self
       yield '+', tree
       return self
@@ -67,7 +64,7 @@ module TDiff
 
     x.each_with_index do |xi,i|
       y.each_with_index do |yj,j|
-        c[i][j] = if tdiff_equal(xi,yj)
+        c[i][j] = if xi.tdiff_equal(yj)
                     c[i-1][j-1] + 1
                   else
                     if c[i][j-1] > c[i-1][j]
@@ -98,7 +95,7 @@ module TDiff
     yj, j = next_child[y_backtrack]
 
     until (i == -1 && j == -1)
-      if (i != -1 && j != -1 && tdiff_equal(xi,yj))
+      if (i != -1 && j != -1 && xi.tdiff_equal(yj))
         changes.unshift [' ', xi]
         unchanged.unshift [xi, yj]
 

data/lib/tdiff/unordered.rb

@@ -38,7 +38,7 @@ module TDiff
       return enum_for(:tdiff_unordered,tree) unless block
 
       # check if the nodes differ
-      unless tdiff_equal(self,tree)
+      unless tdiff_equal(tree)
         yield '-', self
         yield '+', tree
         return self
@@ -52,7 +52,7 @@ module TDiff
 
       x.each_with_index do |xi,i|
         y.each_with_index do |yj,j|
-          if (!unchanged.has_value?(yj) && tdiff_equal(xi,yj))
+          if (!unchanged.has_value?(yj) && xi.tdiff_equal(yj))
             unchanged[xi] = yj
             changes << [i, ' ', xi]
             break

data/spec/classes/node.rb

@@ -9,8 +9,8 @@ class Node < Struct.new(:name, :children)
     node.children.each(&block)
   end
 
-  def tdiff_equal(node1,node2)
-    node1.name == node2.name
+  def tdiff_equal(node)
+    self.name == node.name
   end
 
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Postmodern
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-14 00:00:00 -08:00
+date: 2010-11-15 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,9 +27,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 2
+        - 3
         - 0
-        version: 0.2.0
+        version: 0.3.0
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency