diff 0.3.3 → 0.3.4

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('diff','0.3.3') do |s|
+Echoe.new('diff','0.3.4') do |s|
   s.description = "Diff Algorithm Implementation"
   s.url = "http://users.cybercity.dk/~dsl8950/ruby/diff.html"
   s.author = "Wayne Walter"

data/diff.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{diff}
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne Walter"]

data/lib/emaildiff.rb

@@ -44,7 +44,7 @@ module HTMLCollapsable
     Diff.new(self, b)
   end
 
-  def patch(diff,starttoken,endtoken)
+  def patch_email(diff,starttoken,endtoken)
     newary = nil
     if diff.difftype == String
       newary = diff.difftype.new('')
@@ -63,7 +63,7 @@ module HTMLCollapsable
           end
           newary << starttoken if quoted == 1
 	  while ai < mod[1]
-	    newary << diff.orig_a[ai]
+	    newary << diff.orig_b[bi]
 	    ai += 1
 	    bi += 1
 	  end
@@ -75,7 +75,7 @@ module HTMLCollapsable
           end
           newary << starttoken if quoted == 1
 	  while bi < mod[1]
-	    newary << diff.orig_a[ai]
+	    newary << diff.orig_b[bi]
 	    ai += 1
 	    bi += 1
 	  end
@@ -93,7 +93,7 @@ module HTMLCollapsable
     end
     newary << starttoken if quoted == 1
     while ai < self.length
-      newary << diff.orig_a[ai]
+      newary << diff.orig_b[bi]
       ai += 1
       bi += 1
     end

data/test/test_emailcases.rb

@@ -1,68 +1,69 @@
-module DiffArrayTests
+module EmailDiffArrayTests
+
   def test_array_quoted
-    difftest ["1","2","3"], [">1",">2",">3","4"], [888,">1",">2",">3",999,"4"]
-    difftest ["1","2","3"], [">1",">2",">3","4","5"], [888,">1",">2",">3",999,"4","5"]
+    emailtest ["1","2","3"], [">1",">2",">3","4"], [888,">1",">2",">3",999,"4"]
+    emailtest ["1","2","3"], [">1",">2",">3","4","5"], [888,">1",">2",">3",999,"4","5"]
   end
 
-  def test_array_quoted
-    difftest ["1","2","3"], [">1",">2",">3","4"], [888,">1",">2",">3",999,"4"]
-    difftest ["1"," > 2"," > 3"], [">1","> > 2","> > 3","4","5"], [888,">1","> > 2","> > 3",999,"4","5"]
+  def test_array_double_quoted
+    emailtest ["1","2","3"], [">1",">2",">3","4"], [888,">1",">2",">3",999,"4"]
+    emailtest ["1"," > 2"," > 3"], [">1","> > 2","> > 3","4","5"], [888,">1","> > 2","> > 3",999,"4","5"]
   end
 
   def test_array_append
-    difftest [1,2,3], [1,2,3,4], [888,1,2,3,999,4]
-    difftest [1,2,3], [1,2,3,4,5], [888,1,2,3,999,4,5]
+    emailtest [1,2,3], [1,2,3,4], [888,1,2,3,999,4]
+    emailtest [1,2,3], [1,2,3,4,5], [888,1,2,3,999,4,5]
   end
 
   def test_array_prepend
-    difftest [1,2,3], [0,1,2,3], [0,888,1,2,3,999]
-    difftest [1,2,3], [-1,0,1,2,3], [-1,0,888,1,2,3,999]
+    emailtest [1,2,3], [0,1,2,3], [0,888,1,2,3,999]
+    emailtest [1,2,3], [-1,0,1,2,3], [-1,0,888,1,2,3,999]
   end
 
   def test_array_insert
-    difftest [1,2,3], [1,2,4,3], [888,1,2,999,4,888,3,999]
-    difftest [1,2,3], [1,2,4,5,3], [888,1,2,999,4,5,888,3,999]
+    emailtest [1,2,3], [1,2,4,3], [888,1,2,999,4,888,3,999]
+    emailtest [1,2,3], [1,2,4,5,3], [888,1,2,999,4,5,888,3,999]
   end
 
   def test_array_remove
-    difftest [1,2,3], [1,3], [888,1,999,888,3,999]
+    emailtest [1,2,3], [1,3], [888,1,999,888,3,999]
 
   end
 
   def test_array_cutfront
-    difftest [1,2,3], [2,3], [888,2,3,999]
-    difftest [1,2,3], [3], [888,3,999]
+    emailtest [1,2,3], [2,3], [888,2,3,999]
+    emailtest [1,2,3], [3], [888,3,999]
   end
 
   def test_array_cutback
-    difftest [1,2,3], [1,2], [888,1,2,999]
-    difftest [1,2,3], [1], [888,1,999]
+    emailtest [1,2,3], [1,2], [888,1,2,999]
+    emailtest [1,2,3], [1], [888,1,999]
   end
 
   def test_array_empty
-    difftest [1,2,3], [], []
+    emailtest [1,2,3], [], []
   end
 
   def test_array_fill
-    difftest [], [1,2,3], [1,2,3]
+    emailtest [], [1,2,3], [1,2,3]
   end
 
   def test_array_change
-    difftest [1,2,3], [1,4,3], [888,1,999,4,888,3,999]
-    difftest [1,2,3], [1,4,5], [888,1,999,4,5]
-    difftest [1,2,3,4], [1,5,4], [888,1,999,5,888,4,999]
+    emailtest [1,2,3], [1,4,3], [888,1,999,4,888,3,999]
+    emailtest [1,2,3], [1,4,5], [888,1,999,4,5]
+    emailtest [1,2,3,4], [1,5,4], [888,1,999,5,888,4,999]
   end
 
   def test_array_noop
-    difftest [1,2,3], [1,2,3], [888,1,2,3,999]
+    emailtest [1,2,3], [1,2,3], [888,1,2,3,999]
   end
 
   def test_array_grow
-    difftest [1,2,3], [4,1,5,2,6,3,7], [4,888,1,999,5,888,2,999,6,888,3,999,7]
+    emailtest [1,2,3], [4,1,5,2,6,3,7], [4,888,1,999,5,888,2,999,6,888,3,999,7]
   end
 
   def test_array_shrink
-    difftest [1,2,3,4,5,6,7], [2,4,6], [888,2,999,888,4,999,888,6,999]
+    emailtest [1,2,3,4,5,6,7], [2,4,6], [888,2,999,888,4,999,888,6,999]
   end
 
 end

data/test/test_emaildiff.rb

@@ -7,14 +7,14 @@ require 'test_emailcases'
 
 class EmailDiffTest < RUNIT::TestCase
 
-  include DiffArrayTests
-  def difftest(a, b, c)
+  include EmailDiffArrayTests
+  def emailtest(a, b, c)
     #puts "old string:"
     #puts a
     #puts "new string:"
     #puts b
     diff = EmailDiff.new(a, b)
-    d = a.patch(diff,888,999)
+    d = a.patch_email(diff,888,999)
     #puts "result:"
     #puts d
     assert_equal(c,d)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - Wayne Walter