diff options
author | Austin Ziegler <austin@zieglers.ca> | 2013-03-30 17:12:43 -0400 |
---|---|---|
committer | Austin Ziegler <austin@zieglers.ca> | 2013-03-30 17:14:19 -0400 |
commit | 4122e0b9e52fd6fc659dd5f1fc9f844a43ff02cf (patch) | |
tree | c97177a9dd6f3c3f84a09dcf87947908480177e4 /lib/diff/lcs.rb | |
parent | a72fbdc67d2be6937fd94baf9372bbb994b01be1 (diff) | |
download | diff-lcs-4122e0b9e52fd6fc659dd5f1fc9f844a43ff02cf.tar.gz |
Finalizing encoding-aware diff fixes.
* Diff::LCS::Hunk could not properly generate a difference for
comparison sets that are not US-ASCII-compatible because of the use of
literal regular expressions and strings. Jon Rowe (JonRowe) found this
in rspec/rspec-expectations#219 and provided a first pass
implementation in diff-lcs#15. I've reworked it because of test
failures in Rubinius when running in Ruby 1.9 mode. This coerces the
added values to the encoding of the old dataset (as determined by the
first piece of the old dataset).
https://github.com/rspec/rspec-expectations/issues/219
https://github.com/halostatue/diff-lcs/pull/15
* Adding Travis CI testing for Ruby 2.0.
Diffstat (limited to 'lib/diff/lcs.rb')
-rw-r--r-- | lib/diff/lcs.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/diff/lcs.rb b/lib/diff/lcs.rb index 7a8b982..620e200 100644 --- a/lib/diff/lcs.rb +++ b/lib/diff/lcs.rb @@ -1,7 +1,7 @@ # -*- ruby encoding: utf-8 -*- module Diff; end unless defined? Diff -# = Diff::LCS 1.2.1 +# = Diff::LCS 1.2.2 # # 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.1' + VERSION = '1.2.2' end require 'diff/lcs/callbacks' |