diff-lcs 1.2.4 → 1.4.2

data/spec/traverse_sequences_spec.rb

@@ -1,10 +1,10 @@
-# -*- ruby encoding: utf-8 -*-
+# frozen_string_literal: true
 
 require 'spec_helper'
 
-describe "Diff::LCS.traverse_sequences" do
-  describe "callback with no finishers" do
-    describe "over (seq1, seq2)" do
+describe 'Diff::LCS.traverse_sequences' do
+  describe 'callback with no finishers' do
+    describe 'over (seq1, seq2)' do
       before(:each) do
         @callback_s1_s2 = simple_callback_no_finishers
         Diff::LCS.traverse_sequences(seq1, seq2, @callback_s1_s2)
@@ -13,92 +13,92 @@ describe "Diff::LCS.traverse_sequences" do
         Diff::LCS.traverse_sequences(seq2, seq1, @callback_s2_s1)
       end
 
-      it "should have the correct LCS result on left-matches" do
-        @callback_s1_s2.matched_a.should == correct_lcs
-        @callback_s2_s1.matched_a.should == correct_lcs
+      it 'has the correct LCS result on left-matches' do
+        expect(@callback_s1_s2.matched_a).to eq(correct_lcs)
+        expect(@callback_s2_s1.matched_a).to eq(correct_lcs)
       end
 
-      it "should have the correct LCS result on right-matches" do
-        @callback_s1_s2.matched_b.should == correct_lcs
-        @callback_s2_s1.matched_b.should == correct_lcs
+      it 'has the correct LCS result on right-matches' do
+        expect(@callback_s1_s2.matched_b).to eq(correct_lcs)
+        expect(@callback_s2_s1.matched_b).to eq(correct_lcs)
       end
 
-      it "should have the correct skipped sequences with the left sequence" do
-        @callback_s1_s2.discards_a.should == skipped_seq1
-        @callback_s2_s1.discards_a.should == skipped_seq2
+      it 'has the correct skipped sequences with the left sequence' do
+        expect(@callback_s1_s2.discards_a).to eq(skipped_seq1)
+        expect(@callback_s2_s1.discards_a).to eq(skipped_seq2)
       end
 
-      it "should have the correct skipped sequences with the right sequence" do
-        @callback_s1_s2.discards_b.should == skipped_seq2
-        @callback_s2_s1.discards_b.should == skipped_seq1
+      it 'has the correct skipped sequences with the right sequence' do
+        expect(@callback_s1_s2.discards_b).to eq(skipped_seq2)
+        expect(@callback_s2_s1.discards_b).to eq(skipped_seq1)
       end
 
-      it "should not have anything done markers from the left or right sequences" do
-        @callback_s1_s2.done_a.should be_empty
-        @callback_s1_s2.done_b.should be_empty
-        @callback_s2_s1.done_a.should be_empty
-        @callback_s2_s1.done_b.should be_empty
+      it 'does not have anything done markers from the left or right sequences' do
+        expect(@callback_s1_s2.done_a).to be_empty
+        expect(@callback_s1_s2.done_b).to be_empty
+        expect(@callback_s2_s1.done_a).to be_empty
+        expect(@callback_s2_s1.done_b).to be_empty
       end
     end
 
-    describe "over (hello, hello)" do
+    describe 'over (hello, hello)' do
       before(:each) do
         @callback = simple_callback_no_finishers
         Diff::LCS.traverse_sequences(hello, hello, @callback)
       end
 
-      it "should have the correct LCS result on left-matches" do
-        @callback.matched_a.should == hello.split(//)
+      it 'has the correct LCS result on left-matches' do
+        expect(@callback.matched_a).to eq(hello.split(//))
       end
 
-      it "should have the correct LCS result on right-matches" do
-        @callback.matched_b.should == hello.split(//)
+      it 'has the correct LCS result on right-matches' do
+        expect(@callback.matched_b).to eq(hello.split(//))
       end
 
-      it "should have the correct skipped sequences with the left sequence", :only => true do
-        @callback.discards_a.should be_empty
+      it 'has the correct skipped sequences with the left sequence', :only => true do
+        expect(@callback.discards_a).to be_empty
       end
 
-      it "should have the correct skipped sequences with the right sequence" do
-        @callback.discards_b.should be_empty
+      it 'has the correct skipped sequences with the right sequence' do
+        expect(@callback.discards_b).to be_empty
       end
 
-      it "should not have anything done markers from the left or right sequences" do
-        @callback.done_a.should be_empty
-        @callback.done_b.should be_empty
+      it 'does not have anything done markers from the left or right sequences' do
+        expect(@callback.done_a).to be_empty
+        expect(@callback.done_b).to be_empty
       end
     end
 
-    describe "over (hello_ary, hello_ary)" do
+    describe 'over (hello_ary, hello_ary)' do
       before(:each) do
         @callback = simple_callback_no_finishers
         Diff::LCS.traverse_sequences(hello_ary, hello_ary, @callback)
       end
 
-      it "should have the correct LCS result on left-matches" do
-        @callback.matched_a.should == hello_ary
+      it 'has the correct LCS result on left-matches' do
+        expect(@callback.matched_a).to eq(hello_ary)
       end
 
-      it "should have the correct LCS result on right-matches" do
-        @callback.matched_b.should == hello_ary
+      it 'has the correct LCS result on right-matches' do
+        expect(@callback.matched_b).to eq(hello_ary)
       end
 
-      it "should have the correct skipped sequences with the left sequence" do
-        @callback.discards_a.should be_empty
+      it 'has the correct skipped sequences with the left sequence' do
+        expect(@callback.discards_a).to be_empty
       end
 
-      it "should have the correct skipped sequences with the right sequence" do
-        @callback.discards_b.should be_empty
+      it 'has the correct skipped sequences with the right sequence' do
+        expect(@callback.discards_b).to be_empty
       end
 
-      it "should not have anything done markers from the left or right sequences" do
-        @callback.done_a.should be_empty
-        @callback.done_b.should be_empty
+      it 'does not have anything done markers from the left or right sequences' do
+        expect(@callback.done_a).to be_empty
+        expect(@callback.done_b).to be_empty
       end
     end
   end
 
-  describe "callback with finisher" do
+  describe 'callback with finisher' do
     before(:each) do
       @callback_s1_s2 = simple_callback
       Diff::LCS.traverse_sequences(seq1, seq2, @callback_s1_s2)
@@ -106,34 +106,34 @@ describe "Diff::LCS.traverse_sequences" do
       Diff::LCS.traverse_sequences(seq2, seq1, @callback_s2_s1)
     end
 
-    it "should have the correct LCS result on left-matches" do
-      @callback_s1_s2.matched_a.should == correct_lcs
-      @callback_s2_s1.matched_a.should == correct_lcs
+    it 'has the correct LCS result on left-matches' do
+      expect(@callback_s1_s2.matched_a).to eq(correct_lcs)
+      expect(@callback_s2_s1.matched_a).to eq(correct_lcs)
     end
 
-    it "should have the correct LCS result on right-matches" do
-      @callback_s1_s2.matched_b.should == correct_lcs
-      @callback_s2_s1.matched_b.should == correct_lcs
+    it 'has the correct LCS result on right-matches' do
+      expect(@callback_s1_s2.matched_b).to eq(correct_lcs)
+      expect(@callback_s2_s1.matched_b).to eq(correct_lcs)
     end
 
-    it "should have the correct skipped sequences for the left sequence" do
-      @callback_s1_s2.discards_a.should == skipped_seq1
-      @callback_s2_s1.discards_a.should == skipped_seq2
+    it 'has the correct skipped sequences for the left sequence' do
+      expect(@callback_s1_s2.discards_a).to eq(skipped_seq1)
+      expect(@callback_s2_s1.discards_a).to eq(skipped_seq2)
     end
 
-    it "should have the correct skipped sequences for the right sequence" do
-      @callback_s1_s2.discards_b.should == skipped_seq2
-      @callback_s2_s1.discards_b.should == skipped_seq1
+    it 'has the correct skipped sequences for the right sequence' do
+      expect(@callback_s1_s2.discards_b).to eq(skipped_seq2)
+      expect(@callback_s2_s1.discards_b).to eq(skipped_seq1)
     end
 
-    it "should have done markers differently-sized sequences" do
-      @callback_s1_s2.done_a.should == [[ "p", 9, "s", 10 ]]
-      @callback_s1_s2.done_b.should be_empty
+    it 'has done markers differently-sized sequences' do
+      expect(@callback_s1_s2.done_a).to eq([['p', 9, 's', 10]])
+      expect(@callback_s1_s2.done_b).to be_empty
 
       # 20110731 I don't yet understand why this particular behaviour
       # isn't transitive.
-      @callback_s2_s1.done_a.should be_empty
-      @callback_s2_s1.done_b.should be_empty
+      expect(@callback_s2_s1.done_a).to be_empty
+      expect(@callback_s2_s1.done_b).to be_empty
     end
   end
 end

metadata

@@ -1,279 +1,173 @@
 --- !ruby/object:Gem::Specification
 name: diff-lcs
 version: !ruby/object:Gem::Version
-  version: 1.2.4
-  prerelease: 
+  version: 1.4.2
 platform: ruby
 authors:
 - Austin Ziegler
-autorequire: 
+autorequire:
 bindir: bin
-cert_chain:
-- ! '-----BEGIN CERTIFICATE-----
-
-  MIIDNjCCAh6gAwIBAgIBADANBgkqhkiG9w0BAQUFADBBMQ8wDQYDVQQDDAZhdXN0
-
-  aW4xGTAXBgoJkiaJk/IsZAEZFglydWJ5Zm9yZ2UxEzARBgoJkiaJk/IsZAEZFgNv
-
-  cmcwHhcNMTMwMjA0MDMzMzI3WhcNMTQwMjA0MDMzMzI3WjBBMQ8wDQYDVQQDDAZh
-
-  dXN0aW4xGTAXBgoJkiaJk/IsZAEZFglydWJ5Zm9yZ2UxEzARBgoJkiaJk/IsZAEZ
-
-  FgNvcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2mPNf4L37GhKI
-
-  SPCYsvYWXA2/R9u5+pyUnbJ2R1o2CiRq2ZA/AIzY6N3hGnsgoWnh5RzvgTN1Lt08
-
-  DNIrsIG2VDYk/JVt6f9J6zZ8EQHbznWa3cWYoCFaaICdk7jV1n/42hg70jEDYXl9
-
-  gDOl0k6JmyF/rtfFu/OIkFGWeFYIuFHvRuLyUbw66+QDTOzKb3t8o55Ihgy1GVwT
-
-  i6pkDs8LhZWXdOD+921l2Z1NZGZa9KNbJIg6vtgYKU98jQ5qr9iY3ikBAspHrFas
-
-  K6USvGgAg8fCD5YiotBEvCBMYtfqmfrhpdU2p+gvTgeLW1Kaevwqd7ngQmFUrFG1
-
-  eUJSURv5AgMBAAGjOTA3MAkGA1UdEwQCMAAwHQYDVR0OBBYEFAtJKMp6YYNqlgR3
-
-  9TiZLWqvLagSMAsGA1UdDwQEAwIEsDANBgkqhkiG9w0BAQUFAAOCAQEApTPkvDm8
-
-  7gJlUT4FfumXPvtuqP67LxUtGE8syvR0A4As+0P/wylLJFUOsGTTdZYtThhxCSJG
-
-  +7KG2FfIcH4Zz2d97arZGAzBoi8iPht2/UtSl1fCcUI5vmJa1MiXZT2oqdW7Wydq
-
-  rAZcBPlrYYuiwtGI0yqIOgBfXSZCWWsJsuyTKELep6mCLgz0YZUfmvKr8W/Ab3ax
-
-  DuLzH92LSRjZJyjyAUpw/Vc2rM4giiP5jtByrb1Y1dGnQhHTMHf1GfucWm7Nw/V9
-
-  twEPVw8+0f88JQucxOTmTF1NbLFpiRwQUZ1zoZbNg2e7mShc/eexnVLWKFKxRoP6
-
-  KPj3WoD+spB8fA==
-
-  -----END CERTIFICATE-----
-
-'
-date: 2013-04-21 00:00:00.000000000 Z
+cert_chain: []
+date: 2020-06-24 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rubyforge
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.4
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: hoe-bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: hoe-doofus
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: hoe-gemspec2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: hoe-git
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: hoe-rubygems
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: hoe-travis
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '14'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.22'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
-description: ! 'Diff::LCS computes the difference between two Enumerable sequences
-  using the
-
+        version: '3.22'
+description: |-
+  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.4, providing a simple extension that allows for
+  Diff::LCS::Change objects to be treated implicitly as arrays. Ruby versions
+  below 2.5 are soft-deprecated.
 
-  This is release 1.2.4, fixing a bug introduced after diff-lcs 1.1.3 that did
-
-  not properly prune common sequences at the beginning of a comparison set.
-
-  Thanks to Paul Kunysch for fixing this issue.
-
-
-  Coincident with the release of diff-lcs 1.2.3, we reported an issue with
-
-  Rubinius in 1.9 mode
-
-  ({rubinius/rubinius#2268}[https://github.com/rubinius/rubinius/issues/2268]).
-
-  We are happy to report that this issue has been resolved.'
+  This means that older versions are no longer part of the CI test suite. If any
+  changes have been introduced that break those versions, bug reports and patches
+  will be accepted, but it will be up to the reporter to verify any fixes prior
+  to release. A future release will completely break compatibility.
 email:
-- austin@rubyforge.org
+- halostatue@gmail.com
 executables:
 - htmldiff
 - ldiff
 extensions: []
 extra_rdoc_files:
-- Contributing.rdoc
-- History.rdoc
-- License.rdoc
+- Code-of-Conduct.md
+- Contributing.md
+- History.md
+- License.md
 - Manifest.txt
 - README.rdoc
 - docs/COPYING.txt
 - docs/artistic.txt
 files:
-- .autotest
-- .gemtest
-- .hoerc
-- .rspec
-- .travis.yml
-- Contributing.rdoc
-- Gemfile
-- History.rdoc
-- License.rdoc
+- ".rspec"
+- Code-of-Conduct.md
+- Contributing.md
+- History.md
+- License.md
 - Manifest.txt
 - README.rdoc
 - Rakefile
@@ -285,6 +179,7 @@ files:
 - lib/diff-lcs.rb
 - lib/diff/lcs.rb
 - lib/diff/lcs/array.rb
+- lib/diff/lcs/backports.rb
 - lib/diff/lcs/block.rb
 - lib/diff/lcs/callbacks.rb
 - lib/diff/lcs/change.rb
@@ -295,39 +190,53 @@ files:
 - lib/diff/lcs/string.rb
 - spec/change_spec.rb
 - spec/diff_spec.rb
+- spec/fixtures/aX
+- spec/fixtures/bXaX
+- spec/fixtures/ds1.csv
+- spec/fixtures/ds2.csv
+- spec/fixtures/ldiff/output.diff
+- spec/fixtures/ldiff/output.diff-c
+- spec/fixtures/ldiff/output.diff-e
+- spec/fixtures/ldiff/output.diff-f
+- spec/fixtures/ldiff/output.diff-u
 - spec/hunk_spec.rb
 - spec/issues_spec.rb
 - spec/lcs_spec.rb
+- spec/ldiff_spec.rb
 - spec/patch_spec.rb
 - spec/sdiff_spec.rb
 - spec/spec_helper.rb
 - spec/traverse_balanced_spec.rb
 - spec/traverse_sequences_spec.rb
-homepage: http://diff-lcs.rubyforge.org/
-licenses: []
-post_install_message: 
+homepage: https://github.com/halostatue/diff-lcs
+licenses:
+- MIT
+- Artistic-2.0
+- GPL-2.0+
+metadata:
+  homepage_uri: https://github.com/halostatue/diff-lcs
+  source_code_uri: https://github.com/halostatue/diff-lcs
+  bug_tracker_uri: https://github.com/halostatue/diff-lcs/issues
+post_install_message:
 rdoc_options:
-- --main
+- "--main"
 - README.rdoc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '1.8'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: diff-lcs
-rubygems_version: 1.8.25
-signing_key: 
-specification_version: 3
+rubygems_version: 3.0.3
+signing_key:
+specification_version: 4
 summary: Diff::LCS computes the difference between two Enumerable sequences using
   the McIlroy-Hunt longest common subsequence (LCS) algorithm
 test_files: []