diff-lcs 1.3 → 1.5.1

data/spec/traverse_balanced_spec.rb

@@ -1,6 +1,6 @@
-# -*- ruby encoding: utf-8 -*-
+# frozen_string_literal: true
 
-require 'spec_helper'
+require "spec_helper"
 
 describe "Diff::LCS.traverse_balanced" do
   include Diff::LCS::SpecHelper::Matchers
@@ -33,9 +33,9 @@ describe "Diff::LCS.traverse_balanced" do
     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
@@ -43,12 +43,12 @@ describe "Diff::LCS.traverse_balanced" do
   end
 
   describe "identical array sequences %w(a b c)" do
-    s1 = s2 = %w(a b c)
+    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
@@ -56,13 +56,13 @@ describe "Diff::LCS.traverse_balanced" do
   end
 
   describe "sequences %w(a b c) & %w(a x c)" do
-    s1 = %w(a b c)
-    s2 = %w(a x c)
+    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
@@ -70,14 +70,14 @@ describe "Diff::LCS.traverse_balanced" do
   end
 
   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)
+    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
@@ -85,12 +85,12 @@ describe "Diff::LCS.traverse_balanced" do
   end
 
   describe "sequences %w(x y c) & %w(v w c)" do
-    s1 = %w(x y c)
-    s2 = %w(v w c)
+    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
@@ -98,13 +98,13 @@ describe "Diff::LCS.traverse_balanced" do
   end
 
   describe "sequences %w(a x y z) & %w(b v w)" do
-    s1 = %w(a x y z)
-    s2 = %w(b v w)
+    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
@@ -112,11 +112,11 @@ describe "Diff::LCS.traverse_balanced" do
   end
 
   describe "sequences %w(a z) & %w(a)" do
-    s1 = %w(a z)
-    s2 = %w(a)
+    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
@@ -124,11 +124,11 @@ describe "Diff::LCS.traverse_balanced" do
   end
 
   describe "sequences %w(z a) & %w(a)" do
-    s1 = %w(z a)
-    s2 = %w(a)
+    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
@@ -136,12 +136,12 @@ describe "Diff::LCS.traverse_balanced" do
   end
 
   describe "sequences %w(a b c) & %w(x y z)" do
-    s1 = %w(a b c)
-    s2 = %w(x y z)
+    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
@@ -149,160 +149,162 @@ describe "Diff::LCS.traverse_balanced" do
   end
 
   describe "sequences %w(abcd efgh ijkl mnoopqrstuvwxyz) & []" do
-    s1 = %w(abcd efgh ijkl mnopqrstuvwxyz)
+    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
   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
   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
   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
   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
   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
   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
   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
   end
 
-  describe "strings %Q(abcd efgh ijkl mnopqrstuvwxyz) & %Q()" do
-    s1 = %Q(abcd efgh ijkl mnopqrstuvwxyz)
+  describe "strings %q(abcd efgh ijkl mnopqrstuvwxyz) & %q()" do
+    s1 = "abcd efgh ijkl mnopqrstuvwxyz"
     s2 = ""
+    # standard:disable Layout/ExtraSpacing
     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]
     ]
+    # standard:enable Layout/ExtraSpacing
 
     it_has_behavior "with a #change callback", s1, s2, result
     it_has_behavior "without a #change callback", s1, s2, result

data/spec/traverse_sequences_spec.rb

@@ -1,6 +1,6 @@
-# -*- ruby encoding: utf-8 -*-
+# frozen_string_literal: true
 
-require 'spec_helper'
+require "spec_helper"
 
 describe "Diff::LCS.traverse_sequences" do
   describe "callback with no finishers" do
@@ -48,14 +48,14 @@ describe "Diff::LCS.traverse_sequences" do
       end
 
       it "has the correct LCS result on left-matches" do
-        expect(@callback.matched_a).to eq(hello.split(//))
+        expect(@callback.matched_a).to eq(hello.chars)
       end
 
       it "has the correct LCS result on right-matches" do
-        expect(@callback.matched_b).to eq(hello.split(//))
+        expect(@callback.matched_b).to eq(hello.chars)
       end
 
-      it "has the correct skipped sequences with the left sequence", :only => true do
+      it "has the correct skipped sequences with the left sequence" do
         expect(@callback.discards_a).to be_empty
       end
 
@@ -127,13 +127,11 @@ describe "Diff::LCS.traverse_sequences" do
     end
 
     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_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