diff-lcs 1.2.2 → 1.2.3

data/History.rdoc

@@ -1,3 +1,21 @@
+== 1.2.3 / 2013-04-11
+
+* Bugs Fixed:
+  * The new encoding detection for diff output generation (added in 1.2.2)
+    introduced a bug if the left side of the comparison was the empty set.
+    Originally found in rspec/rspec-expectations#238 and
+    rspec/rspec-expectations#239. Jon Rowe developed a reasonable heuristic
+    (left side, right side, empty string literal) to avoid this bug.
+    https://github.com/rspec/rspec-expectations/pull/238
+    https://github.com/rspec/rspec-expectations/pull/239
+* There is a known issue with Rubinius in 1.9 mode reported in
+  rubinius/rubinius#2268 and demonstrated in the Travis CI builds. For all
+  other tested platforms, diff-lcs is considered stable. As soon as a suitably
+  small test-case can be created for the Rubinius team to examine, this will be
+  added to the Rubinius issue around this.
+  https://github.com/rubinius/rubinius/issues/2268
+  https://travis-ci.org/halostatue/diff-lcs/jobs/6241195
+
 == 1.2.2 / 2013-03-30
 
 * Bugs Fixed:

data/README.rdoc

@@ -11,9 +11,16 @@ Diff::LCS computes the difference between two Enumerable sequences using the
 McIlroy-Hunt longest common subsequence (LCS) algorithm. It includes utilities
 to create a simple HTML diff output format and a standard diff-like tool.
 
-This is release 1.2.2, fixing a bug that prevented comparison of values that
-are not US-ASCII-compatible. Thanks to Jon Rowe for finding and providing most
-of the work behind this issue. This is a recommended release.
+This is release 1.2.3, fixing a bug in value comparison where the left side of
+the comparison was the empty set, preventing the detection of encoding. Thanks
+to Jon Rowe for fixing this issue. This is a strongly recommended release.
+
+*Note*: There is a known issue with Rubinius in 1.9 mode reported in
+{rubinius/rubinius#2268}[https://github.com/rubinius/rubinius/issues/2268] and
+demonstrated in the Travis CI builds. For all other tested platforms, diff-lcs
+is considered stable. As soon as a suitably small test-case can be created for
+the Rubinius team to examine, this will be added to the Rubinius issue around
+this.
 
 == Synopsis
 

data/lib/diff/lcs.rb

@@ -1,7 +1,7 @@
 # -*- ruby encoding: utf-8 -*-
 
 module Diff; end unless defined? Diff
-# = Diff::LCS 1.2.2
+# = Diff::LCS 1.2.3
 #
 # Computes "intelligent" differences between two sequenced Enumerables. This
 # is an implementation of the McIlroy-Hunt "diff" algorithm for Enumerable
@@ -129,7 +129,7 @@ module Diff; end unless defined? Diff
 # Common Subsequences</em>, CACM, vol.20, no.5, pp.350-353, May
 # 1977, with a few minor improvements to improve the speed."
 module Diff::LCS
-  VERSION = '1.2.2'
+  VERSION = '1.2.3'
 end
 
 require 'diff/lcs/callbacks'

data/lib/diff/lcs/hunk.rb

@@ -12,7 +12,7 @@ class Diff::LCS::Hunk
     # At first, a hunk will have just one Block in it
     @blocks = [ Diff::LCS::Block.new(piece) ]
     if String.method_defined?(:encoding)
-      @preferred_data_encoding = data_old[0].encoding
+      @preferred_data_encoding = data_old.fetch(0, data_new.fetch(0,'') ).encoding
     end
     @data_old = data_old
     @data_new = data_new

data/spec/hunk_spec.rb

@@ -15,49 +15,58 @@ describe "Diff::LCS::Hunk" do
     let(:hunk)     { Diff::LCS::Hunk.new(old_data, new_data, pieces[0], 3, 0) }
 
     it 'should be able to produce a unified diff from the two pieces' do
-      expected =
-(<<-EOD.encode('UTF-16LE').chomp)
-@@ -1,2 +1,2 @@
--Tu avec carté {count} itém has
-+Tu avec carte {count} item has
-EOD
+      expected = (<<-EOD.gsub(/^\s+/,'').encode('UTF-16LE').chomp)
+        @@ -1,2 +1,2 @@
+        -Tu avec carté {count} itém has
+        +Tu avec carte {count} item has
+      EOD
       expect(hunk.diff(:unified).to_s == expected).to eql true
     end
 
     it 'should be able to produce a context diff from the two pieces' do
-      expected =
-(<<-EOD.encode('UTF-16LE').chomp)
-***************
-*** 1,2 ****
-!Tu avec carté {count} itém has
---- 1,2 ----
-!Tu avec carte {count} item has
-EOD
+      expected = (<<-EOD.gsub(/^\s+/,'').encode('UTF-16LE').chomp)
+        ***************
+        *** 1,2 ****
+        !Tu avec carté {count} itém has
+        --- 1,2 ----
+        !Tu avec carte {count} item has
+      EOD
 
       expect(hunk.diff(:context).to_s == expected).to eql true
     end
 
     it 'should be able to produce an old diff from the two pieces' do
-      expected =
-(<<-EOD.encode('UTF-16LE').chomp)
-1,2c1,2
-< Tu avec carté {count} itém has
----
-> Tu avec carte {count} item has
-
-EOD
+      expected = (<<-EOD.gsub(/^ +/,'').encode('UTF-16LE').chomp)
+        1,2c1,2
+        < Tu avec carté {count} itém has
+        ---
+        > Tu avec carte {count} item has
+
+      EOD
       expect(hunk.diff(:old).to_s == expected).to eql true
     end
 
     it 'should be able to produce a reverse ed diff from the two pieces' do
-      expected =
-(<<-EOD.encode('UTF-16LE').chomp)
-c1,2
-Tu avec carte {count} item has
-.
+      expected = (<<-EOD.gsub(/^ +/,'').encode('UTF-16LE').chomp)
+        c1,2
+        Tu avec carte {count} item has
+        .
 
-EOD
+      EOD
       expect(hunk.diff(:reverse_ed).to_s == expected).to eql true
     end
+
+    context 'with empty first data set' do
+      let(:old_data) { [] }
+
+      it 'should be able to produce a unified diff' do
+        expected = (<<-EOD.gsub(/^\s+/,'').encode('UTF-16LE').chomp)
+          @@ -1 +1,2 @@
+          +Tu avec carte {count} item has
+        EOD
+        expect(hunk.diff(:unified).to_s == expected).to eql true
+      end
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diff-lcs
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -50,7 +50,7 @@ cert_chain:
   -----END CERTIFICATE-----
 
 '
-date: 2013-03-30 00:00:00.000000000 Z
+date: 2013-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyforge
@@ -236,11 +236,24 @@ description: ! 'Diff::LCS computes the difference between two Enumerable sequenc
   to create a simple HTML diff output format and a standard diff-like tool.
 
 
-  This is release 1.2.2, fixing a bug that prevented comparison of values that
+  This is release 1.2.3, fixing a bug in value comparison where the left side of
 
-  are not US-ASCII-compatible. Thanks to Jon Rowe for finding and providing most
+  the comparison was the empty set, preventing the detection of encoding. Thanks
 
-  of the work behind this issue. This is a recommended release.'
+  to Jon Rowe for fixing this issue. This is a strongly recommended release.
+
+
+  *Note*: There is a known issue with Rubinius in 1.9 mode reported in
+
+  {rubinius/rubinius#2268}[https://github.com/rubinius/rubinius/issues/2268] and
+
+  demonstrated in the Travis CI builds. For all other tested platforms, diff-lcs
+
+  is considered stable. As soon as a suitably small test-case can be created for
+
+  the Rubinius team to examine, this will be added to the Rubinius issue around
+
+  this.'
 email:
 - austin@rubyforge.org
 executables: