kronk 1.7.5 → 1.7.6

data/History.rdoc

@@ -1,3 +1,9 @@
+=== 1.7.6 / 2011-10-28
+
+* Bugfixes:
+
+  * Fix for diffs with duplicate lines before large common section.
+
 === 1.7.5 / 2011-10-27
 
 * Bugfixes:

data/README.rdoc

@@ -75,6 +75,9 @@ Parse the data and run an IRB console with the response:
 
 == CONFIGURATION:
 
+Although Kronk supports Ruby-1.8.7, it's been fine-tuned for Ruby-1.9.2 and
+runs about 5x faster when benchmarking between 1.8.7p249 and 1.9.2p180.
+
 Kronk pulls it's config from $HOME/.kronk/rc and supports the following:
 
 Set the file to save the last http response retrieved in:

data/Rakefile

@@ -80,10 +80,10 @@ namespace :bm do
 
   desc "Run performance benchmarks on diffs"
   task :diff do
-    left = Kronk::Request.retrieve("prod.txt").parsed_body
-    right = Kronk::Request.retrieve("beta.txt").parsed_body
+    left = Kronk.retrieve("prod.txt").body
+    right = Kronk.retrieve("beta.txt").body
 
-    diff = Kronk::Diff.new_from_data left, right
+    diff = Kronk::Diff.new left, right
 
     arr1 = diff.str1.split "\n"
     arr2 = diff.str2.split "\n"

data/lib/kronk.rb

@@ -14,7 +14,7 @@ require 'yaml'
 class Kronk
 
   # This gem's version.
-  VERSION = '1.7.5'
+  VERSION = '1.7.6'
 
   require 'kronk/constants'
   require 'kronk/queue_runner'

data/lib/kronk/diff.rb

@@ -126,12 +126,16 @@ class Kronk
       common_sequences(arr1, arr2) do |seq|
         next if used1[seq[1]] || used2[seq[2]]
 
-        next if used1[seq[1], seq[0]].to_a.index(true) ||
-                used2[seq[2], seq[0]].to_a.index(true)
-
-        next if used1[seq[1]+seq[0]..-1].to_a.nitems !=
-                  used2[seq[2]+seq[0]..-1].to_a.nitems
-
+        next if Array(used1[seq[1], seq[0]]).index(true) ||
+                Array(used2[seq[2], seq[0]]).index(true)
+
+        if seq[1] > (used1.length / 2)
+          next if Array(used1[seq[1]+seq[0]..-1]).nitems !=
+                  Array(used2[seq[2]+seq[0]..-1]).nitems
+        else
+          next if Array(used1[0..seq[1]]).nitems !=
+                  Array(used2[0..seq[2]]).nitems
+        end
 
         used1.fill(true, seq[1], seq[0])
         used2.fill(true, seq[2], seq[0])
@@ -183,6 +187,11 @@ class Kronk
 
           sequences[len] ||= []
           sequences[len] << [len, i, start_j]
+
+          if len > 1
+            sequences[len-1] ||= []
+            sequences[len-1] << [(len-1), i, start_j]
+          end
         end
       end
 

data/test/test_diff.rb

@@ -204,6 +204,27 @@ class TestDiff < Test::Unit::TestCase
   end
 
 
+  def test_create_diff_duplicate_match
+    str1 = "line2\nline3a\nline4\nline5\nline6\nline4\nline6\nline7\nline8\nline9"
+    str2 = "line2\nline4\nline5\nline6\nline7\nline8\nline9"
+
+    expected = [
+      "line2",
+      [["line3a"], []],
+      "line4",
+      "line5",
+      [["line6", "line4"], []],
+      "line6",
+      "line7",
+      "line8",
+      "line9"
+    ]
+
+    diff = Kronk::Diff.new str1, str2
+    assert_equal expected, diff.create_diff
+  end
+
+
   def test_count
     assert_equal 4, @diff.count
   end

metadata

@@ -1,109 +1,107 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: kronk
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.7.6
   prerelease: 
-  version: 1.7.5
 platform: ruby
-authors: 
+authors:
 - Jeremie Castagna
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-27 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-29 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2168882440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.5"
+      - !ruby/object:Gem::Version
+        version: '1.5'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: cookiejar
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2168882440
+- !ruby/object:Gem::Dependency
+  name: cookiejar
+  requirement: &2168881680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: plist
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2168881680
+- !ruby/object:Gem::Dependency
+  name: plist
+  requirement: &2168880700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 3.1.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2168880700
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &2168879840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.4"
+      - !ruby/object:Gem::Version
+        version: '1.4'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2168879840
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &2168878580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.9.12
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: em-http-request
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2168878580
+- !ruby/object:Gem::Dependency
+  name: em-http-request
+  requirement: &2168877780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2168877780
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: &2168876780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.12"
+      - !ruby/object:Gem::Version
+        version: '2.11'
   type: :development
-  version_requirements: *id007
-description: |-
-  Kronk runs diffs against data from live and cached http responses.
-  Kronk was made possible by the sponsoring of AT&T Interactive.
-email: 
+  prerelease: false
+  version_requirements: *2168876780
+description: ! 'Kronk runs diffs against data from live and cached http responses.
+
+  Kronk was made possible by the sponsoring of AT&T Interactive.'
+email:
 - yaksnrainbows@gmail.com
-executables: 
+executables:
 - kronk
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - Manifest.txt
 - History.rdoc
 - README.rdoc
 - TODO.rdoc
-files: 
+files:
 - .autotest
 - History.rdoc
 - Manifest.txt
@@ -173,33 +171,34 @@ files:
 - .gemtest
 homepage: https://github.com/yaksnrainbows/kronk
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: -2280556396485806807
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: kronk
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Kronk runs diffs against data from live and cached http responses
-test_files: 
+test_files:
 - test/test_assertions.rb
 - test/test_cmd.rb
 - test/test_core_ext.rb