diff 0.3.5 → 0.3.6

data.tar.gz.sig

@@ -1,5 +1,3 @@
-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
+k��a���ۍ\t����} �P��
��ڥP'��R��zI�/a����^���&J����%O�=�Ϊ�����ѢRM�x�F�}�N9W*�Q��.q�~��cf^ޛ���}�[N�J�20W�3�J�>�M���+�^=�A.F�7ԓ7HoSD���(�#�4ۈ�lB��9�G����٣
+W
+/Iɋ�ޮl*}A+3I��"���ş�Ğ�aU�`���� �}q�p�ma-�N�R�}wY�ԑ2���

data/Rakefile

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

data/lib/emaildiff.rb

@@ -46,12 +46,8 @@ module HTMLCollapsable
   end
 
   def patch_email(diff,starttoken = nil,endtoken = nil)
-    newary = nil
-    if diff.difftype == String
-      newary = diff.difftype.new('')
-    else
-      newary = diff.difftype.new
-    end
+    found_diff = 0
+    newary = diff.difftype.new
     ai = 0
     bi = 0
     diff.diffs.each { |d|
@@ -59,29 +55,30 @@ module HTMLCollapsable
         quoted = 0
 	case mod[0]
 	when '-'
-	  if ai < mod[1] 
+	  if ai < mod[1] && !starttoken.nil? && found_diff == 1
             quoted = 1
           end
-          newary << starttoken if quoted == 1 && !starttoken.nil?
+          newary << starttoken if quoted == 1
 	  while ai < mod[1]
-	    newary << diff.orig_b[bi] if !starttoken.nil?
+	    newary << diff.orig_b[bi] if quoted == 1 || found_diff == 0
 	    ai += 1
 	    bi += 1
 	  end
-	  newary << endtoken if quoted == 1 && !starttoken.nil?
+	  newary << endtoken if quoted == 1
 	  ai += 1
 	when '+'
-	  if bi < mod[1] 
+	  if bi < mod[1] && !starttoken.nil? && found_diff == 1
             quoted = 1
           end
-          newary << starttoken if quoted == 1 && !starttoken.nil?
+          newary << starttoken if quoted == 1
 	  while bi < mod[1]
-	    newary << diff.orig_b[bi] if !starttoken.nil?
+	    newary << diff.orig_b[bi] if quoted == 1 || found_diff == 0
 	    ai += 1
 	    bi += 1
 	  end
-	  newary << endtoken if quoted == 1 && !starttoken.nil?
+	  newary << endtoken if quoted == 1
 	  newary << diff.orig_b[mod[1]]
+          found_diff = 1
 	  bi += 1
 	else
 	  raise "Unknown diff action"
@@ -89,16 +86,26 @@ module HTMLCollapsable
       }
     }
     quoted = 0
-    if ai < self.length
+    if ai < self.length && !starttoken.nil? && found_diff == 1
       quoted = 1
     end
-    newary << starttoken if quoted == 1 && !starttoken.nil?
+    newary << starttoken if quoted == 1
     while ai < self.length
-      newary << diff.orig_b[bi] if !starttoken.nil?
+      newary << diff.orig_b[bi] if quoted == 1 or found_diff == 0
       ai += 1
       bi += 1
     end
-    newary << endtoken if quoted == 1 && !starttoken.nil?
+    newary << endtoken if quoted == 1
+    if found_diff == 0
+      if !starttoken.nil?
+        if newary.length > 0 
+          newary.unshift starttoken
+          newary << endtoken
+        end
+      else
+        return diff.difftype.new
+      end
+    end
     return newary
   end
 end

data/test/test_emailcases.rb

@@ -1,49 +1,62 @@
 module EmailDiffArrayTests
 
   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"], ["4"], :remove
-    emailtest ["1"," > 2"," > 3"], [">1","> > 2","> > 3","4","5"], ["4","5"], :remove
+    emailtest ["1","2","3"], [">1",">2",">3","4"], [">1",">2",">3","4"]
+    emailtest ["1"," > 2"," > 3"], [">1","> > 2","> > 3","4","5"], [">1","> > 2","> > 3","4","5"]
+  end
+  def test_array_double_quoted_remove
+    emailtest ["1","2","3"], [">1",">2",">3","4"], [">1",">2",">3","4"], :remove
+    emailtest ["1"," > 2"," > 3"], [">1","> > 2","> > 3","4","5"], [">1","> > 2","> > 3","4","5"], :remove
   end
 
   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"], ["4"], :remove
-    emailtest ["1","2","3"], [">1",">2",">3","4","5"], ["4","5"], :remove
+    emailtest ["1","2","3"], [">1",">2",">3","4"], [">1",">2",">3","4"]
+    emailtest ["1","2","3"], [">1",">2",">3","4","5"], [">1",">2",">3","4","5"]
+  end
+  def test_array_quoted_remove
+    emailtest ["1","2","3"], [">1",">2",">3","4"], [">1",">2",">3","4"], :remove
+    emailtest ["1","2","3"], [">1",">2",">3","4","5"], [">1",">2",">3","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
+    emailtest [1,2,3], [1,2,3,4], [1,2,3,4]
+    emailtest [1,2,3], [1,2,3,4,5], [1,2,3,4,5]
+  end
+  def test_array_append_remove
+    emailtest [1,2,3], [1,2,3,4], [1,2,3,4], :remove
+    emailtest [1,2,3], [1,2,3,4,5], [1,2,3,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]
+  end
+  def test_array_prepend_remove
     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
+    emailtest [1,2,3], [1,2,4,3], [1,2,4,888,3,999]
+    emailtest [1,2,3], [1,2,4,5,3], [1,2,4,5,888,3,999]
+  end
+  def test_array_insert_remove
+    emailtest [1,2,3], [1,2,4,3], [1,2,4], :remove
+    emailtest [1,2,3], [1,2,4,5,3], [1,2,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], [888,1,3,999]
+  end
+  def test_array_remove_remove
     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]
+  end
+  def test_array_cutfront_remove
     emailtest [1,2,3], [2,3], [], :remove
     emailtest [1,2,3], [3], [], :remove
   end
@@ -51,41 +64,55 @@ module EmailDiffArrayTests
   def test_array_cutback
     emailtest [1,2,3], [1,2], [888,1,2,999]
     emailtest [1,2,3], [1], [888,1,999]
+  end
+  def test_array_cutback_remove
     emailtest [1,2,3], [1,2], [], :remove
     emailtest [1,2,3], [1], [], :remove
   end
 
   def test_array_empty
     emailtest [1,2,3], [], []
+  end
+  def test_array_empty_remove
     emailtest [1,2,3], [], [], :remove
   end
 
   def test_array_fill
     emailtest [], [1,2,3], [1,2,3]
+  end
+  def test_array_fill_remove
     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
+    emailtest [1,2,3], [1,4,3], [1,4,888,3,999]
+    emailtest [1,2,3], [1,4,5], [1,4,5]
+    emailtest [1,2,3,4], [1,5,4], [1,5,888,4,999]
+  end
+  def test_array_change_remove
+    emailtest [1,2,3], [1,4,3], [1,4], :remove
+    emailtest [1,2,3], [1,4,5], [1,4,5], :remove
+    emailtest [1,2,3,4], [1,5,4], [1,5], :remove
   end
 
   def test_array_noop
     emailtest [1,2,3], [1,2,3], [888,1,2,3,999]
+  end
+  def test_array_noop_remove
     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]
+  end
+  def test_array_grow_remove
     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], [888,2,4,6,999]
+  end
+  def test_array_shrink_remove
     emailtest [1,2,3,4,5,6,7], [2,4,6], [], :remove
   end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 5
-  version: 0.3.5
+  - 6
+  version: 0.3.6
 platform: ruby
 authors: 
 - Wayne Walter