diff-lcs 1.3 → 1.5.0

data/spec/traverse_balanced_spec.rb

@@ -1,310 +1,310 @@
-# -*- ruby encoding: utf-8 -*-
+# frozen_string_literal: true
 
 require 'spec_helper'
 
-describe "Diff::LCS.traverse_balanced" do
+describe 'Diff::LCS.traverse_balanced' do
   include Diff::LCS::SpecHelper::Matchers
 
-  shared_examples "with a #change callback" do |s1, s2, result|
-    it "traverses s1 -> s2 correctly" do
+  shared_examples 'with a #change callback' do |s1, s2, result|
+    it 'traverses s1 -> s2 correctly' do
       traversal = balanced_traversal(s1, s2, :balanced_callback)
       expect(traversal.result).to eq(result)
     end
 
-    it "traverses s2 -> s1 correctly" do
+    it 'traverses s2 -> s1 correctly' do
       traversal = balanced_traversal(s2, s1, :balanced_callback)
       expect(traversal.result).to eq(balanced_reverse(result))
     end
   end
 
-  shared_examples "without a #change callback" do |s1, s2, result|
-    it "traverses s1 -> s2 correctly" do
+  shared_examples 'without a #change callback' do |s1, s2, result|
+    it 'traverses s1 -> s2 correctly' do
       traversal = balanced_traversal(s1, s2, :balanced_callback_no_change)
       expect(traversal.result).to eq(map_to_no_change(result))
     end
 
-    it "traverses s2 -> s1 correctly" do
+    it 'traverses s2 -> s1 correctly' do
       traversal = balanced_traversal(s2, s1, :balanced_callback_no_change)
       expect(traversal.result).to eq(map_to_no_change(balanced_reverse(result)))
     end
   end
 
   describe "identical string sequences ('abc')" do
-    s1 = s2 = "abc"
+    s1 = s2 = 'abc'
 
     result = [
-      [ '=', 0, 0 ],
-      [ '=', 1, 1 ],
-      [ '=', 2, 2 ]
+      ['=', 0, 0],
+      ['=', 1, 1],
+      ['=', 2, 2]
     ]
 
-    it_has_behavior "with a #change callback", s1, s2, result
-    it_has_behavior "without a #change callback", s1, s2, result
+    it_has_behavior 'with a #change callback', s1, s2, result
+    it_has_behavior 'without a #change callback', s1, s2, result
   end
 
-  describe "identical array sequences %w(a b c)" do
+  describe 'identical array sequences %w(a b c)' do
     s1 = s2 = %w(a b c)
 
     result = [
-      [ '=', 0, 0 ],
-      [ '=', 1, 1 ],
-      [ '=', 2, 2 ]
+      ['=', 0, 0],
+      ['=', 1, 1],
+      ['=', 2, 2]
     ]
 
-    it_has_behavior "with a #change callback", s1, s2, result
-    it_has_behavior "without a #change callback", s1, s2, result
+    it_has_behavior 'with a #change callback', s1, s2, result
+    it_has_behavior 'without a #change callback', s1, s2, result
   end
 
-  describe "sequences %w(a b c) & %w(a x c)" do
+  describe 'sequences %w(a b c) & %w(a x c)' do
     s1 = %w(a b c)
     s2 = %w(a x c)
 
     result = [
-      [ '=', 0, 0 ],
-      [ '!', 1, 1 ],
-      [ '=', 2, 2 ]
+      ['=', 0, 0],
+      ['!', 1, 1],
+      ['=', 2, 2]
     ]
 
-    it_has_behavior "with a #change callback", s1, s2, result
-    it_has_behavior "without a #change callback", s1, s2, result
+    it_has_behavior 'with a #change callback', s1, s2, result
+    it_has_behavior 'without a #change callback', s1, s2, result
   end
 
-  describe "sequences %w(a x y c) & %w(a v w c)" do
+  describe 'sequences %w(a x y c) & %w(a v w c)' do
     s1 = %w(a x y c)
     s2 = %w(a v w c)
 
     result = [
-      [ '=', 0, 0 ],
-      [ '!', 1, 1 ],
-      [ '!', 2, 2 ],
-      [ '=', 3, 3 ]
+      ['=', 0, 0],
+      ['!', 1, 1],
+      ['!', 2, 2],
+      ['=', 3, 3]
     ]
 
-    it_has_behavior "with a #change callback", s1, s2, result
-    it_has_behavior "without a #change callback", s1, s2, result
+    it_has_behavior 'with a #change callback', s1, s2, result
+    it_has_behavior 'without a #change callback', s1, s2, result
   end
 
-  describe "sequences %w(x y c) & %w(v w c)" do
+  describe 'sequences %w(x y c) & %w(v w c)' do
     s1 = %w(x y c)
     s2 = %w(v w c)
     result = [
-      [ '!', 0, 0 ],
-      [ '!', 1, 1 ],
-      [ '=', 2, 2 ]
+      ['!', 0, 0],
+      ['!', 1, 1],
+      ['=', 2, 2]
     ]
 
-    it_has_behavior "with a #change callback", s1, s2, result
-    it_has_behavior "without a #change callback", s1, s2, result
+    it_has_behavior 'with a #change callback', s1, s2, result
+    it_has_behavior 'without a #change callback', s1, s2, result
   end
 
-  describe "sequences %w(a x y z) & %w(b v w)" do
+  describe 'sequences %w(a x y z) & %w(b v w)' do
     s1 = %w(a x y z)
     s2 = %w(b v w)
     result = [
-      [ '!', 0, 0 ],
-      [ '!', 1, 1 ],
-      [ '!', 2, 2 ],
-      [ '<', 3, 3 ]
+      ['!', 0, 0],
+      ['!', 1, 1],
+      ['!', 2, 2],
+      ['<', 3, 3]
     ]
 
-    it_has_behavior "with a #change callback", s1, s2, result
-    it_has_behavior "without a #change callback", s1, s2, result
+    it_has_behavior 'with a #change callback', s1, s2, result
+    it_has_behavior 'without a #change callback', s1, s2, result
   end
 
-  describe "sequences %w(a z) & %w(a)" do
+  describe 'sequences %w(a z) & %w(a)' do
     s1 = %w(a z)
     s2 = %w(a)
     result = [
-      [ '=', 0, 0 ],
-      [ '<', 1, 1 ]
+      ['=', 0, 0],
+      ['<', 1, 1]
     ]
 
-    it_has_behavior "with a #change callback", s1, s2, result
-    it_has_behavior "without a #change callback", s1, s2, result
+    it_has_behavior 'with a #change callback', s1, s2, result
+    it_has_behavior 'without a #change callback', s1, s2, result
   end
 
-  describe "sequences %w(z a) & %w(a)" do
+  describe 'sequences %w(z a) & %w(a)' do
     s1 = %w(z a)
     s2 = %w(a)
     result = [
-      [ '<', 0, 0 ],
-      [ '=', 1, 0 ]
+      ['<', 0, 0],
+      ['=', 1, 0]
     ]
 
-    it_has_behavior "with a #change callback", s1, s2, result
-    it_has_behavior "without a #change callback", s1, s2, result
+    it_has_behavior 'with a #change callback', s1, s2, result
+    it_has_behavior 'without a #change callback', s1, s2, result
   end
 
-  describe "sequences %w(a b c) & %w(x y z)" do
+  describe 'sequences %w(a b c) & %w(x y z)' do
     s1 = %w(a b c)
     s2 = %w(x y z)
     result = [
-      [ '!', 0, 0 ],
-      [ '!', 1, 1 ],
-      [ '!', 2, 2 ]
+      ['!', 0, 0],
+      ['!', 1, 1],
+      ['!', 2, 2]
     ]
 
-    it_has_behavior "with a #change callback", s1, s2, result
-    it_has_behavior "without a #change callback", s1, s2, result
+    it_has_behavior 'with a #change callback', s1, s2, result
+    it_has_behavior 'without a #change callback', s1, s2, result
   end
 
-  describe "sequences %w(abcd efgh ijkl mnoopqrstuvwxyz) & []" do
+  describe 'sequences %w(abcd efgh ijkl mnoopqrstuvwxyz) & []' do
     s1 = %w(abcd efgh ijkl mnopqrstuvwxyz)
     s2 = []
     result = [
-      [ '<', 0, 0 ],
-      [ '<', 1, 0 ],
-      [ '<', 2, 0 ],
-      [ '<', 3, 0 ]
+      ['<', 0, 0],
+      ['<', 1, 0],
+      ['<', 2, 0],
+      ['<', 3, 0]
     ]
 
-    it_has_behavior "with a #change callback", s1, s2, result
-    it_has_behavior "without a #change callback", s1, s2, result
+    it_has_behavior 'with a #change callback', s1, s2, result
+    it_has_behavior 'without a #change callback', s1, s2, result
   end
 
-  describe "strings %Q(a b c) & %Q(a x c)" do
-    s1 = %Q(a b c)
-    s2 = %Q(a x c)
+  describe 'strings %q(a b c) & %q(a x c)' do
+    s1 = 'a b c'
+    s2 = 'a x c'
 
     result = [
-      [ '=', 0, 0 ],
-      [ '=', 1, 1 ],
-      [ '!', 2, 2 ],
-      [ '=', 3, 3 ],
-      [ '=', 4, 4 ]
+      ['=', 0, 0],
+      ['=', 1, 1],
+      ['!', 2, 2],
+      ['=', 3, 3],
+      ['=', 4, 4]
     ]
 
-    it_has_behavior "with a #change callback", s1, s2, result
-    it_has_behavior "without a #change callback", s1, s2, result
+    it_has_behavior 'with a #change callback', s1, s2, result
+    it_has_behavior 'without a #change callback', s1, s2, result
   end
 
-  describe "strings %Q(a x y c) & %Q(a v w c)" do
-    s1 = %Q(a x y c)
-    s2 = %Q(a v w c)
+  describe 'strings %q(a x y c) & %q(a v w c)' do
+    s1 = 'a x y c'
+    s2 = 'a v w c'
 
     result = [
-      [ '=', 0, 0 ],
-      [ '=', 1, 1 ],
-      [ '!', 2, 2 ],
-      [ '=', 3, 3 ],
-      [ '!', 4, 4 ],
-      [ '=', 5, 5 ],
-      [ '=', 6, 6 ]
+      ['=', 0, 0],
+      ['=', 1, 1],
+      ['!', 2, 2],
+      ['=', 3, 3],
+      ['!', 4, 4],
+      ['=', 5, 5],
+      ['=', 6, 6]
     ]
 
-    it_has_behavior "with a #change callback", s1, s2, result
-    it_has_behavior "without a #change callback", s1, s2, result
+    it_has_behavior 'with a #change callback', s1, s2, result
+    it_has_behavior 'without a #change callback', s1, s2, result
   end
 
-  describe "strings %Q(x y c) & %Q(v w c)" do
-    s1 = %Q(x y c)
-    s2 = %Q(v w c)
+  describe 'strings %q(x y c) & %q(v w c)' do
+    s1 = 'x y c'
+    s2 = 'v w c'
     result = [
-      [ '!', 0, 0 ],
-      [ '=', 1, 1 ],
-      [ '!', 2, 2 ],
-      [ '=', 3, 3 ],
-      [ '=', 4, 4 ]
+      ['!', 0, 0],
+      ['=', 1, 1],
+      ['!', 2, 2],
+      ['=', 3, 3],
+      ['=', 4, 4]
     ]
 
-    it_has_behavior "with a #change callback", s1, s2, result
-    it_has_behavior "without a #change callback", s1, s2, result
+    it_has_behavior 'with a #change callback', s1, s2, result
+    it_has_behavior 'without a #change callback', s1, s2, result
   end
 
-  describe "strings %Q(a x y z) & %Q(b v w)" do
-    s1 = %Q(a x y z)
-    s2 = %Q(b v w)
+  describe 'strings %q(a x y z) & %q(b v w)' do
+    s1 = 'a x y z'
+    s2 = 'b v w'
     result = [
-      [ '!', 0, 0 ],
-      [ '=', 1, 1 ],
-      [ '!', 2, 2 ],
-      [ '=', 3, 3 ],
-      [ '!', 4, 4 ],
-      [ '<', 5, 5 ],
-      [ '<', 6, 5 ]
+      ['!', 0, 0],
+      ['=', 1, 1],
+      ['!', 2, 2],
+      ['=', 3, 3],
+      ['!', 4, 4],
+      ['<', 5, 5],
+      ['<', 6, 5]
     ]
 
-    it_has_behavior "with a #change callback", s1, s2, result
-    it_has_behavior "without a #change callback", s1, s2, result
+    it_has_behavior 'with a #change callback', s1, s2, result
+    it_has_behavior 'without a #change callback', s1, s2, result
   end
 
-  describe "strings %Q(a z) & %Q(a)" do
-    s1 = %Q(a z)
-    s2 = %Q(a)
+  describe 'strings %q(a z) & %q(a)' do
+    s1 = 'a z'
+    s2 = 'a'
     result = [
-      [ '=', 0, 0 ],
-      [ '<', 1, 1 ],
-      [ '<', 2, 1 ]
+      ['=', 0, 0],
+      ['<', 1, 1],
+      ['<', 2, 1]
     ]
 
-    it_has_behavior "with a #change callback", s1, s2, result
-    it_has_behavior "without a #change callback", s1, s2, result
+    it_has_behavior 'with a #change callback', s1, s2, result
+    it_has_behavior 'without a #change callback', s1, s2, result
   end
 
-  describe "strings %Q(z a) & %Q(a)" do
-    s1 = %Q(z a)
-    s2 = %Q(a)
+  describe 'strings %q(z a) & %q(a)' do
+    s1 = 'z a'
+    s2 = 'a'
     result = [
-      [ '<', 0, 0 ],
-      [ '<', 1, 0 ],
-      [ '=', 2, 0 ]
+      ['<', 0, 0],
+      ['<', 1, 0],
+      ['=', 2, 0]
     ]
 
-    it_has_behavior "with a #change callback", s1, s2, result
-    it_has_behavior "without a #change callback", s1, s2, result
+    it_has_behavior 'with a #change callback', s1, s2, result
+    it_has_behavior 'without a #change callback', s1, s2, result
   end
 
-  describe "strings %Q(a b c) & %Q(x y z)" do
-    s1 = %Q(a b c)
-    s2 = %Q(x y z)
+  describe 'strings %q(a b c) & %q(x y z)' do
+    s1 = 'a b c'
+    s2 = 'x y z'
     result = [
-      [ '!', 0, 0 ],
-      [ '=', 1, 1 ],
-      [ '!', 2, 2 ],
-      [ '=', 3, 3 ],
-      [ '!', 4, 4 ]
+      ['!', 0, 0],
+      ['=', 1, 1],
+      ['!', 2, 2],
+      ['=', 3, 3],
+      ['!', 4, 4]
     ]
 
-    it_has_behavior "with a #change callback", s1, s2, result
-    it_has_behavior "without a #change callback", s1, s2, result
+    it_has_behavior 'with a #change callback', s1, s2, result
+    it_has_behavior 'without a #change callback', s1, s2, result
   end
 
-  describe "strings %Q(abcd efgh ijkl mnopqrstuvwxyz) & %Q()" do
-    s1 = %Q(abcd efgh ijkl mnopqrstuvwxyz)
-    s2 = ""
+  describe 'strings %q(abcd efgh ijkl mnopqrstuvwxyz) & %q()' do
+    s1 = 'abcd efgh ijkl mnopqrstuvwxyz'
+    s2 = ''
     result = [
-      [ '<',  0, 0 ],
-      [ '<',  1, 0 ],
-      [ '<',  2, 0 ],
-      [ '<',  3, 0 ],
-      [ '<',  4, 0 ],
-      [ '<',  5, 0 ],
-      [ '<',  6, 0 ],
-      [ '<',  7, 0 ],
-      [ '<',  8, 0 ],
-      [ '<',  9, 0 ],
-      [ '<', 10, 0 ],
-      [ '<', 11, 0 ],
-      [ '<', 12, 0 ],
-      [ '<', 13, 0 ],
-      [ '<', 14, 0 ],
-      [ '<', 15, 0 ],
-      [ '<', 16, 0 ],
-      [ '<', 17, 0 ],
-      [ '<', 18, 0 ],
-      [ '<', 19, 0 ],
-      [ '<', 20, 0 ],
-      [ '<', 21, 0 ],
-      [ '<', 22, 0 ],
-      [ '<', 23, 0 ],
-      [ '<', 24, 0 ],
-      [ '<', 25, 0 ],
-      [ '<', 26, 0 ],
-      [ '<', 27, 0 ],
-      [ '<', 28, 0 ],
+      ['<',  0, 0],
+      ['<',  1, 0],
+      ['<',  2, 0],
+      ['<',  3, 0],
+      ['<',  4, 0],
+      ['<',  5, 0],
+      ['<',  6, 0],
+      ['<',  7, 0],
+      ['<',  8, 0],
+      ['<',  9, 0],
+      ['<', 10, 0],
+      ['<', 11, 0],
+      ['<', 12, 0],
+      ['<', 13, 0],
+      ['<', 14, 0],
+      ['<', 15, 0],
+      ['<', 16, 0],
+      ['<', 17, 0],
+      ['<', 18, 0],
+      ['<', 19, 0],
+      ['<', 20, 0],
+      ['<', 21, 0],
+      ['<', 22, 0],
+      ['<', 23, 0],
+      ['<', 24, 0],
+      ['<', 25, 0],
+      ['<', 26, 0],
+      ['<', 27, 0],
+      ['<', 28, 0]
     ]
 
-    it_has_behavior "with a #change callback", s1, s2, result
-    it_has_behavior "without a #change callback", s1, s2, result
+    it_has_behavior 'with a #change callback', s1, s2, result
+    it_has_behavior 'without a #change callback', s1, s2, result
   end
 end

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,27 +13,27 @@ describe "Diff::LCS.traverse_sequences" do
         Diff::LCS.traverse_sequences(seq2, seq1, @callback_s2_s1)
       end
 
-      it "has the correct LCS result on left-matches" do
+      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 "has the correct LCS result on right-matches" do
+      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 "has the correct skipped sequences with the left sequence" do
+      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 "has the correct skipped sequences with the right sequence" do
+      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 "does not have anything done markers from the left or right sequences" do
+      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
@@ -41,64 +41,64 @@ describe "Diff::LCS.traverse_sequences" do
       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 "has the correct LCS result on left-matches" do
+      it 'has the correct LCS result on left-matches' do
         expect(@callback.matched_a).to eq(hello.split(//))
       end
 
-      it "has the correct LCS result on right-matches" do
+      it 'has the correct LCS result on right-matches' do
         expect(@callback.matched_b).to eq(hello.split(//))
       end
 
-      it "has the correct skipped sequences with the left sequence", :only => true do
+      it 'has the correct skipped sequences with the left sequence', :only => true do
         expect(@callback.discards_a).to be_empty
       end
 
-      it "has the correct skipped sequences with the right sequence" do
+      it 'has the correct skipped sequences with the right sequence' do
         expect(@callback.discards_b).to be_empty
       end
 
-      it "does not have anything done markers from the left or right sequences" do
+      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 "has the correct LCS result on left-matches" do
+      it 'has the correct LCS result on left-matches' do
         expect(@callback.matched_a).to eq(hello_ary)
       end
 
-      it "has the correct LCS result on right-matches" do
+      it 'has the correct LCS result on right-matches' do
         expect(@callback.matched_b).to eq(hello_ary)
       end
 
-      it "has the correct skipped sequences with the left sequence" do
+      it 'has the correct skipped sequences with the left sequence' do
         expect(@callback.discards_a).to be_empty
       end
 
-      it "has the correct skipped sequences with the right sequence" do
+      it 'has the correct skipped sequences with the right sequence' do
         expect(@callback.discards_b).to be_empty
       end
 
-      it "does not have anything done markers from the left or right sequences" do
+      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,32 @@ describe "Diff::LCS.traverse_sequences" do
       Diff::LCS.traverse_sequences(seq2, seq1, @callback_s2_s1)
     end
 
-    it "has the correct LCS result on left-matches" do
+    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 "has the correct LCS result on right-matches" do
+    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 "has the correct skipped sequences for the left sequence" do
+    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 "has the correct skipped sequences for the right sequence" do
+    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 "has done markers differently-sized sequences" do
-      expect(@callback_s1_s2.done_a).to eq([[ "p", 9, "s", 10 ]])
+    it 'has done markers differently-sized sequences' do
+      expect(@callback_s1_s2.done_a).to eq([['p', 9, 't', 11]])
       expect(@callback_s1_s2.done_b).to be_empty
 
-      # 20110731 I don't yet understand why this particular behaviour
-      # isn't transitive.
       expect(@callback_s2_s1.done_a).to be_empty
-      expect(@callback_s2_s1.done_b).to be_empty
+      expect(@callback_s2_s1.done_b).to eq([['t', 11, 'p', 9]])
     end
   end
 end