kronk 1.2.4 → 1.2.5

data/History.rdoc

@@ -1,3 +1,10 @@
+=== 1.2.5 / 2011-03-09
+
+* Bugfixes:
+
+  * Small fix to the diff functionality.
+    Swapping left and right would not always yeild the same behavior.
+
 === 1.2.4 / 2011-03-04
 
 * Enhancements:

data/lib/kronk.rb

@@ -11,7 +11,7 @@ require 'yaml'
 class Kronk
 
   # This gem's version.
-  VERSION = '1.2.4'
+  VERSION = '1.2.5'
 
 
   ##

data/lib/kronk/diff.rb

@@ -205,7 +205,8 @@ class Kronk
         match1 = arr1.index item2
         match2 = arr2.index item1
 
-        if match1
+
+        if use_left?(match1, match2)
           diff_ary.concat diff_match(item1, match1, arr1, 0, sub_diff)
           sub_diff = nil
 
@@ -226,6 +227,14 @@ class Kronk
     end
 
 
+    ##
+    # Check if the index on the left should be used.
+
+    def use_left? index1, index2
+      index1 && (index2.nil? || index1 < index2)
+    end
+
+
     ##
     # Create a diff from a match.
 

data/test/test_diff.rb

@@ -291,6 +291,24 @@ STR
   end
 
 
+  def test_create_diff_smallest_match
+    str1 = "line1\nline right\nline4\nline4\nline5\nline6\nline2\nline7"
+    str2 = "line1\nline left\nline2\nline3\nline4\nline5"
+
+    expected = [
+      "line1",
+      [["line right"], ["line left", "line2", "line3"]],
+      "line4",
+      [["line4"], []],
+      "line5",
+      [["line6", "line2", "line7"], []]
+    ]
+
+    diff = Kronk::Diff.new str1, str2
+    assert_equal expected, diff.create_diff
+  end
+
+
   def test_count
     assert_equal 4, @diff.count
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kronk
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 2
-  - 4
-  version: 1.2.4
+  - 5
+  version: 1.2.5
 platform: ruby
 authors: 
 - Jeremie Castagna
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-04 00:00:00 -08:00
+date: 2011-03-09 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency