diff 0.3.2 → 0.3.3

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('diff','0.3.2') do |s|
+Echoe.new('diff','0.3.3') 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.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne Walter"]

data/lib/emaildiff.rb

@@ -1,11 +1,50 @@
 require 'diff'
 
+class EmailDiff < Diff
+  GREATER = 62
+
+  attr_reader :orig_a, :orig_b
+
+  def initialize(diffs_or_a, b = nil, isstring = nil)
+    if b.nil?
+      @diffs = diffs_or_a
+      @isstring = isstring
+      super
+    else
+      @diffs = []
+      @curdiffs = []
+      strip_a = striplines(diffs_or_a)
+      strip_b = striplines(b)
+      makediff(strip_a, strip_b)
+      @orig_a = diffs_or_a
+      @orig_b = b
+      @difftype = diffs_or_a.class
+    end
+  end
+
+  def striplines(ary) 
+    newary= ary.dup
+    newary.each_with_index { |item,index| 
+      if item.class == String
+        item = item.dup
+        item.strip
+        while item[0] == GREATER
+          item.slice!(0)
+          item.strip
+          newary[index] = item
+        end
+      end
+    } 
+    return newary
+  end
+end  
+
 module HTMLCollapsable
   def diff(b)
     Diff.new(self, b)
   end
 
-  def collapse(diff,starttoken,endtoken)
+  def patch(diff,starttoken,endtoken)
     newary = nil
     if diff.difftype == String
       newary = diff.difftype.new('')
@@ -24,7 +63,7 @@ module HTMLCollapsable
           end
           newary << starttoken if quoted == 1
 	  while ai < mod[1]
-	    newary << self[ai]
+	    newary << diff.orig_a[ai]
 	    ai += 1
 	    bi += 1
 	  end
@@ -36,12 +75,12 @@ module HTMLCollapsable
           end
           newary << starttoken if quoted == 1
 	  while bi < mod[1]
-	    newary << self[ai]
+	    newary << diff.orig_a[ai]
 	    ai += 1
 	    bi += 1
 	  end
 	  newary << endtoken if quoted == 1
-	  newary << mod[2]
+	  newary << diff.orig_b[mod[1]]
 	  bi += 1
 	else
 	  raise "Unknown diff action"
@@ -54,7 +93,7 @@ module HTMLCollapsable
     end
     newary << starttoken if quoted == 1
     while ai < self.length
-      newary << self[ai]
+      newary << diff.orig_a[ai]
       ai += 1
       bi += 1
     end

data/test/test_emailcases.rb

@@ -1,4 +1,13 @@
 module DiffArrayTests
+  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"]
+  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"]
+  end
 
   def test_array_append
     difftest [1,2,3], [1,2,3,4], [888,1,2,3,999,4]

data/test/test_emaildiff.rb

@@ -8,19 +8,17 @@ require 'test_emailcases'
 class EmailDiffTest < RUNIT::TestCase
 
   include DiffArrayTests
-
   def difftest(a, b, c)
     #puts "old string:"
     #puts a
     #puts "new string:"
     #puts b
-    diff = Diff.new(a, b)
-    d = a.collapse(diff,888,999)
+    diff = EmailDiff.new(a, b)
+    d = a.patch(diff,888,999)
     #puts "result:"
-    #puts c
+    #puts d
     assert_equal(c,d)
   end
 end
 
-
 RUNIT::CUI::TestRunner.run(EmailDiffTest.suite)

metadata

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