diff 0.3.4.4 → 0.3.5

data.tar.gz.sig

@@ -1 +1,5 @@
-4$��I�i��YB+G� w�<b;~L�<�a_�N	�Y7�zu:iL�wT�(s��&`y�{�^E�շj7��F)�~��q�Q7���W�o��y�zd~1�Fd׌�p"JSxh�~�h�o�[���dY��co����%�fd�t����.nQA��l�I�?�n��^{�W���.��'a
;�5T�Wʍ�����HO�5[�-o������{�:��5_9�)Ӳ��N�a�l�2|�c��F�@�?���I
+Ay��:��F��Ԗ=��V��
+S Ɏ��Ŏ�?�g�6٦[�؆Hلk�K�YvZ�9Ij}���͙ �P�Kp�� x�vk�zJU�7��;��!��������#Pp�<E������ybw�����Y���in����	��L�Ga�wI���{IϽ_n�s
�Y�/��	�.G��
+
+��}�m��M:�� D����&�)��h��G�����H��
+O'���Lw�{C�T�z���WE

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('diff','0.3.4.4') do |s|
+Echoe.new('diff','0.3.5') 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,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{diff}
-  s.version = "0.3.4.4"
+  s.version = "0.3.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne Walter"]
   s.cert_chain = ["/root/.ssh/gem-public_cert.pem"]
-  s.date = %q{2010-06-27}
+  s.date = %q{2010-06-28}
   s.description = %q{Diff Algorithm Implementation}
   s.email = %q{diffgem@tickzoom.com}
   s.extra_rdoc_files = ["README", "TODO", "lib/diff.rb", "lib/emaildiff.rb", "lib/unixdiff.rb"]

data/lib/emaildiff.rb

@@ -28,12 +28,12 @@ class EmailDiff < Diff
     newary.each_with_index { |item,index| 
       if item.class == String
         item = item.dup
-        item.strip
-        while item[0] == GREATER
+        item = item.strip
+        while item[0,1] == ">"
           item.slice!(0)
-          item.strip
-          newary[index] = item
+          item = item.strip
         end
+        newary[index] = item
       end
     } 
     return newary
@@ -45,7 +45,7 @@ module HTMLCollapsable
     Diff.new(self, b)
   end
 
-  def patch_email(diff,starttoken,endtoken)
+  def patch_email(diff,starttoken = nil,endtoken = nil)
     newary = nil
     if diff.difftype == String
       newary = diff.difftype.new('')
@@ -62,25 +62,25 @@ module HTMLCollapsable
 	  if ai < mod[1] 
             quoted = 1
           end
-          newary << starttoken if quoted == 1
+          newary << starttoken if quoted == 1 && !starttoken.nil?
 	  while ai < mod[1]
-	    newary << diff.orig_b[bi]
+	    newary << diff.orig_b[bi] if !starttoken.nil?
 	    ai += 1
 	    bi += 1
 	  end
-	  newary << endtoken if quoted == 1
+	  newary << endtoken if quoted == 1 && !starttoken.nil?
 	  ai += 1
 	when '+'
 	  if bi < mod[1] 
             quoted = 1
           end
-          newary << starttoken if quoted == 1
+          newary << starttoken if quoted == 1 && !starttoken.nil?
 	  while bi < mod[1]
-	    newary << diff.orig_b[bi]
+	    newary << diff.orig_b[bi] if !starttoken.nil?
 	    ai += 1
 	    bi += 1
 	  end
-	  newary << endtoken if quoted == 1
+	  newary << endtoken if quoted == 1 && !starttoken.nil?
 	  newary << diff.orig_b[mod[1]]
 	  bi += 1
 	else
@@ -92,13 +92,13 @@ module HTMLCollapsable
     if ai < self.length
       quoted = 1
     end
-    newary << starttoken if quoted == 1
+    newary << starttoken if quoted == 1 && !starttoken.nil?
     while ai < self.length
-      newary << diff.orig_b[bi]
+      newary << diff.orig_b[bi] if !starttoken.nil?
       ai += 1
       bi += 1
     end
-    newary << endtoken if quoted == 1
+    newary << endtoken if quoted == 1 && !starttoken.nil?
     return newary
   end
 end

data/test/test_emailcases.rb

@@ -1,69 +1,92 @@
 module EmailDiffArrayTests
 
-  def test_array_quoted
+  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"]
+    emailtest ["1"," > 2"," > 3"], [">1","> > 2","> > 3","4","5"], [888,">1","> > 2","> > 3",999,"4","5"]
+    emailtest ["1","2","3"], [">1",">2",">3","4"], ["4"], :remove
+    emailtest ["1"," > 2"," > 3"], [">1","> > 2","> > 3","4","5"], ["4","5"], :remove
   end
 
-  def test_array_double_quoted
+  def test_array_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"]
+    emailtest ["1","2","3"], [">1",">2",">3","4","5"], [888,">1",">2",">3",999,"4","5"]
+    emailtest ["1","2","3"], [">1",">2",">3","4"], ["4"], :remove
+    emailtest ["1","2","3"], [">1",">2",">3","4","5"], ["4","5"], :remove
   end
 
   def test_array_append
     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]
+    emailtest [1,2,3], [1,2,3,4], [4], :remove
+    emailtest [1,2,3], [1,2,3,4,5], [4,5], :remove
   end
 
   def test_array_prepend
     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]
+    emailtest [1,2,3], [0,1,2,3], [0,], :remove
+    emailtest [1,2,3], [-1,0,1,2,3], [-1,0,], :remove
   end
 
   def test_array_insert
     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]
+    emailtest [1,2,3], [1,2,4,3], [4,], :remove
+    emailtest [1,2,3], [1,2,4,5,3], [4,5], :remove
   end
 
   def test_array_remove
     emailtest [1,2,3], [1,3], [888,1,999,888,3,999]
+    emailtest [1,2,3], [1,3], [], :remove
 
   end
 
   def test_array_cutfront
     emailtest [1,2,3], [2,3], [888,2,3,999]
     emailtest [1,2,3], [3], [888,3,999]
+    emailtest [1,2,3], [2,3], [], :remove
+    emailtest [1,2,3], [3], [], :remove
   end
 
   def test_array_cutback
     emailtest [1,2,3], [1,2], [888,1,2,999]
     emailtest [1,2,3], [1], [888,1,999]
+    emailtest [1,2,3], [1,2], [], :remove
+    emailtest [1,2,3], [1], [], :remove
   end
 
   def test_array_empty
     emailtest [1,2,3], [], []
+    emailtest [1,2,3], [], [], :remove
   end
 
   def test_array_fill
     emailtest [], [1,2,3], [1,2,3]
+    emailtest [], [1,2,3], [1,2,3], :remove
   end
 
   def test_array_change
     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]
+    emailtest [1,2,3], [1,4,3], [4], :remove
+    emailtest [1,2,3], [1,4,5], [4,5], :remove
+    emailtest [1,2,3,4], [1,5,4], [5], :remove
   end
 
   def test_array_noop
     emailtest [1,2,3], [1,2,3], [888,1,2,3,999]
+    emailtest [1,2,3], [1,2,3], [], :remove
   end
 
   def test_array_grow
     emailtest [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,5,6,7], :remove
   end
 
   def test_array_shrink
     emailtest [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], [], :remove
   end
 
 end

data/test/test_emaildiff.rb

@@ -8,16 +8,24 @@ require 'test_emailcases'
 class EmailDiffTest < RUNIT::TestCase
 
   include EmailDiffArrayTests
-  def emailtest(a, b, c)
+  def emailtest(a, b, c, d = :tokens)
     #puts "old string:"
     #puts a
     #puts "new string:"
     #puts b
     diff = EmailDiff.new(a, b)
-    d = a.patch_email(diff,888,999)
+    #puts "old stripped:"
+    #puts diff.strip_a
+    #puts "new stripped:"
+    #puts diff.strip_b
+    if d == :tokens 
+      result = a.patch_email(diff,888,999)
+    else
+      result = a.patch_email(diff)
+    end
     #puts "result:"
     #puts d
-    assert_equal(c,d)
+    assert_equal(c,result)
   end
 end
 

metadata

@@ -5,9 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 4
-  - 4
-  version: 0.3.4.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Wayne Walter
@@ -36,7 +35,7 @@ cert_chain:
   nbAv9FEyqLVW8Q==
   -----END CERTIFICATE-----
 
-date: 2010-06-27 00:00:00 +00:00
+date: 2010-06-28 00:00:00 +00:00
 default_executable: 
 dependencies: []