diff-lcs 1.1.3 → 1.5.0

data/lib/diff-lcs.rb

@@ -1,5 +1,3 @@
-# -*- ruby encoding: utf-8 -*-
+# frozen_string_literal: true
 
 require 'diff/lcs'
-
-# vim: ft=ruby

data/spec/change_spec.rb

@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Diff::LCS::Change do
+  describe 'an add' do
+    subject { described_class.new('+', 0, 'element') }
+    it { should_not be_deleting   }
+    it { should     be_adding     }
+    it { should_not be_unchanged  }
+    it { should_not be_changed    }
+    it { should_not be_finished_a }
+    it { should_not be_finished_b }
+  end
+
+  describe 'a delete' do
+    subject { described_class.new('-', 0, 'element') }
+    it { should     be_deleting   }
+    it { should_not be_adding     }
+    it { should_not be_unchanged  }
+    it { should_not be_changed    }
+    it { should_not be_finished_a }
+    it { should_not be_finished_b }
+  end
+
+  describe 'an unchanged' do
+    subject { described_class.new('=', 0, 'element') }
+    it { should_not be_deleting   }
+    it { should_not be_adding     }
+    it { should     be_unchanged  }
+    it { should_not be_changed    }
+    it { should_not be_finished_a }
+    it { should_not be_finished_b }
+  end
+
+  describe 'a changed' do
+    subject { described_class.new('!', 0, 'element') }
+    it { should_not be_deleting   }
+    it { should_not be_adding     }
+    it { should_not be_unchanged  }
+    it { should     be_changed    }
+    it { should_not be_finished_a }
+    it { should_not be_finished_b }
+  end
+
+  describe 'a finished_a' do
+    subject { described_class.new('>', 0, 'element') }
+    it { should_not be_deleting   }
+    it { should_not be_adding     }
+    it { should_not be_unchanged  }
+    it { should_not be_changed    }
+    it { should     be_finished_a }
+    it { should_not be_finished_b }
+  end
+
+  describe 'a finished_b' do
+    subject { described_class.new('<', 0, 'element') }
+    it { should_not be_deleting   }
+    it { should_not be_adding     }
+    it { should_not be_unchanged  }
+    it { should_not be_changed    }
+    it { should_not be_finished_a }
+    it { should     be_finished_b }
+  end
+
+  describe 'as array' do
+    it 'should be converted' do
+      action, position, element = described_class.new('!', 0, 'element')
+      expect(action).to eq '!'
+      expect(position).to eq 0
+      expect(element).to eq 'element'
+    end
+  end
+end
+
+describe Diff::LCS::ContextChange do
+  describe 'as array' do
+    it 'should be converted' do
+      action, (old_position, old_element), (new_position, new_element) =
+        described_class.new('!', 1, 'old_element', 2, 'new_element')
+
+      expect(action).to eq '!'
+      expect(old_position).to eq 1
+      expect(old_element).to eq 'old_element'
+      expect(new_position).to eq 2
+      expect(new_element).to eq 'new_element'
+    end
+  end
+end

data/spec/diff_spec.rb

@@ -1,35 +1,51 @@
-# -*- ruby encoding: utf-8 -*-
+# frozen_string_literal: true
 
 require 'spec_helper'
 
-describe "Diff::LCS.diff" do
+describe Diff::LCS, '.diff' do
   include Diff::LCS::SpecHelper::Matchers
 
-  it "should correctly diff seq1 to seq2" do
+  it 'correctly diffs seq1 to seq2' do
     diff_s1_s2 = Diff::LCS.diff(seq1, seq2)
-    change_diff(correct_forward_diff).should == diff_s1_s2
+    expect(change_diff(correct_forward_diff)).to eq(diff_s1_s2)
   end
 
-  it "should correctly diff seq2 to seq1" do
+  it 'correctly diffs seq2 to seq1' do
     diff_s2_s1 = Diff::LCS.diff(seq2, seq1)
-    change_diff(correct_backward_diff).should == diff_s2_s1
+    expect(change_diff(correct_backward_diff)).to eq(diff_s2_s1)
   end
 
-  it "should correctly diff against an empty sequence" do
+  it 'correctly diffs against an empty sequence' do
     diff = Diff::LCS.diff(word_sequence, [])
     correct_diff = [
-      [ [ '-', 0, 'abcd'           ],
-        [ '-', 1, 'efgh'           ],
-        [ '-', 2, 'ijkl'           ],
-        [ '-', 3, 'mnopqrstuvwxyz' ] ]
+      [
+        ['-', 0, 'abcd'],
+        ['-', 1, 'efgh'],
+        ['-', 2, 'ijkl'],
+        ['-', 3, 'mnopqrstuvwxyz']
+      ]
     ]
 
-    change_diff(correct_diff).should == diff
+    expect(change_diff(correct_diff)).to eq(diff)
 
     diff = Diff::LCS.diff([], word_sequence)
-    correct_diff.each { |hunk| hunk.each { |change| change[0] = '+' } }
-    change_diff(correct_diff).should == diff
+    correct_diff.each do |hunk|
+      hunk.each do |change| change[0] = '+' end
+    end
+    expect(change_diff(correct_diff)).to eq(diff)
+  end
+
+  it "correctly diffs 'xx' and 'xaxb'" do
+    left = 'xx'
+    right = 'xaxb'
+    expect(Diff::LCS.patch(left, Diff::LCS.diff(left, right))).to eq(right)
   end
-end
 
-# vim: ft=ruby
+  it 'returns an empty diff with (hello, hello)' do
+    expect(Diff::LCS.diff(hello, hello)).to be_empty
+  end
+
+  it 'returns an empty diff with (hello_ary, hello_ary)' do
+    expect(Diff::LCS.diff(hello_ary, hello_ary)).to be_empty
+  end
+end

data/spec/fixtures/aX

@@ -0,0 +1 @@
+aX

data/spec/fixtures/bXaX

@@ -0,0 +1 @@
+bXaX

data/spec/fixtures/ds1.csv

@@ -0,0 +1,50 @@
+1,3
+2,7
+3,13
+4,21
+5,31
+6,43
+7,57
+8,73
+9,91
+10,111
+11,133
+12,157
+13,183
+14,211
+15,241
+16,273
+17,307
+18,343
+19,381
+20,421
+21,463
+22,507
+23,553
+24,601
+25,651
+26,703
+27,757
+28,813
+29,871
+30,931
+31,993
+32,1057
+33,1123
+34,1191
+35,1261
+36,1333
+37,1407
+38,1483
+39,1561
+40,1641
+41,1723
+42,1807
+43,1893
+44,1981
+45,2071
+46,2163
+47,2257
+48,2353
+49,2451
+50,2500

data/spec/fixtures/ds2.csv

@@ -0,0 +1,51 @@
+  1,3
+2,7
+3,13
+4,21
+5,31
+6,42
+7,57
+8,73
+9,91
+10,111
+11,133
+12,157
+13,183
+14,211
+15,241
+16,273
+17,307
+18,343
+19,200
+20,421
+21,463
+22,507
+23,553
+24,601
+25,651
+26,703
+27,757
+28,813
+29,871
+30,931
+31,123
+32,1057
+33,1123
+34,1000
+35,1261
+36,1333
+37,1407
+38,1483
+39,1561
+40,1641
+41,1723
+42,1807
+43,1893
+44,1981
+45,2071
+46,2163
+47,1524
+48,2353
+49,2451
+50,2500
+51,2520

data/spec/fixtures/ldiff/output.diff

@@ -0,0 +1,4 @@
+1c1
+< aX
+---
+> bXaX

data/spec/fixtures/ldiff/output.diff-c

@@ -0,0 +1,7 @@
+*** spec/fixtures/aX	2020-06-23 11:15:32.000000000 -0400
+--- spec/fixtures/bXaX	2020-06-23 11:15:32.000000000 -0400
+***************
+*** 1 ****
+! aX
+--- 1 ----
+! bXaX

data/spec/fixtures/ldiff/output.diff-e

@@ -0,0 +1,3 @@
+1c
+bXaX
+.

data/spec/fixtures/ldiff/output.diff-f

@@ -0,0 +1,3 @@
+c1
+bXaX
+.

data/spec/fixtures/ldiff/output.diff-u

@@ -0,0 +1,5 @@
+--- spec/fixtures/aX	2020-06-23 11:15:32.000000000 -0400
++++ spec/fixtures/bXaX	2020-06-23 11:15:32.000000000 -0400
+@@ -1 +1 @@
+-aX
++bXaX

data/spec/fixtures/ldiff/output.diff.chef

@@ -0,0 +1,4 @@
+3c3
+<   "description": "hi"
+---
+>   "description": "lo"

data/spec/fixtures/ldiff/output.diff.chef-c

@@ -0,0 +1,15 @@
+*** spec/fixtures/old-chef	2020-06-23 23:18:20.000000000 -0400
+--- spec/fixtures/new-chef	2020-06-23 23:18:20.000000000 -0400
+***************
+*** 1,4 ****
+  {
+    "name": "x",
+!   "description": "hi"
+  }
+
+--- 1,4 ----
+  {
+    "name": "x",
+!   "description": "lo"
+  }
+

data/spec/fixtures/ldiff/output.diff.chef-e

@@ -0,0 +1,3 @@
+3c
+  "description": "lo"
+.

data/spec/fixtures/ldiff/output.diff.chef-f

@@ -0,0 +1,3 @@
+c3
+  "description": "lo"
+.

data/spec/fixtures/ldiff/output.diff.chef-u

@@ -0,0 +1,9 @@
+--- spec/fixtures/old-chef	2020-06-23 23:18:20.000000000 -0400
++++ spec/fixtures/new-chef	2020-06-23 23:18:20.000000000 -0400
+@@ -1,4 +1,4 @@
+ {
+   "name": "x",
+-  "description": "hi"
++  "description": "lo"
+ }
+

data/spec/fixtures/ldiff/output.diff.chef2

@@ -0,0 +1,7 @@
+2d1
+< recipe[b::default]
+14a14,17
+> recipe[o::new]
+> recipe[p::new]
+> recipe[q::new]
+> recipe[r::new]

data/spec/fixtures/ldiff/output.diff.chef2-c

@@ -0,0 +1,20 @@
+*** spec/fixtures/old-chef2	2020-06-30 09:43:35.000000000 -0400
+--- spec/fixtures/new-chef2	2020-06-30 09:44:32.000000000 -0400
+***************
+*** 1,5 ****
+  recipe[a::default]
+- recipe[b::default]
+  recipe[c::default]
+  recipe[d::default]
+  recipe[e::default]
+--- 1,4 ----
+***************
+*** 12,14 ****
+--- 11,17 ----
+  recipe[l::default]
+  recipe[m::default]
+  recipe[n::default]
++ recipe[o::new]
++ recipe[p::new]
++ recipe[q::new]
++ recipe[r::new]

data/spec/fixtures/ldiff/output.diff.chef2-d

@@ -0,0 +1,7 @@
+d2
+a14
+recipe[o::new]
+recipe[p::new]
+recipe[q::new]
+recipe[r::new]
+.

data/spec/fixtures/ldiff/output.diff.chef2-e

@@ -0,0 +1,7 @@
+14a
+recipe[o::new]
+recipe[p::new]
+recipe[q::new]
+recipe[r::new]
+.
+2d

data/spec/fixtures/ldiff/output.diff.chef2-f

@@ -0,0 +1,7 @@
+d2
+a14
+recipe[o::new]
+recipe[p::new]
+recipe[q::new]
+recipe[r::new]
+.

data/spec/fixtures/ldiff/output.diff.chef2-u

@@ -0,0 +1,16 @@
+--- spec/fixtures/old-chef2	2020-06-30 09:43:35.000000000 -0400
++++ spec/fixtures/new-chef2	2020-06-30 09:44:32.000000000 -0400
+@@ -1,5 +1,4 @@
+ recipe[a::default]
+-recipe[b::default]
+ recipe[c::default]
+ recipe[d::default]
+ recipe[e::default]
+@@ -12,3 +11,7 @@
+ recipe[l::default]
+ recipe[m::default]
+ recipe[n::default]
++recipe[o::new]
++recipe[p::new]
++recipe[q::new]
++recipe[r::new]

data/spec/fixtures/new-chef

@@ -0,0 +1,4 @@
+{
+  "name": "x",
+  "description": "lo"
+}

data/spec/fixtures/new-chef2

@@ -0,0 +1,17 @@
+recipe[a::default]
+recipe[c::default]
+recipe[d::default]
+recipe[e::default]
+recipe[f::default]
+recipe[g::default]
+recipe[h::default]
+recipe[i::default]
+recipe[j::default]
+recipe[k::default]
+recipe[l::default]
+recipe[m::default]
+recipe[n::default]
+recipe[o::new]
+recipe[p::new]
+recipe[q::new]
+recipe[r::new]

data/spec/fixtures/old-chef

@@ -0,0 +1,4 @@
+{
+  "name": "x",
+  "description": "hi"
+}

data/spec/fixtures/old-chef2

@@ -0,0 +1,14 @@
+recipe[a::default]
+recipe[b::default]
+recipe[c::default]
+recipe[d::default]
+recipe[e::default]
+recipe[f::default]
+recipe[g::default]
+recipe[h::default]
+recipe[i::default]
+recipe[j::default]
+recipe[k::default]
+recipe[l::default]
+recipe[m::default]
+recipe[n::default]

data/spec/hunk_spec.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+if String.method_defined?(:encoding)
+  require 'diff/lcs/hunk'
+
+  describe Diff::LCS::Hunk do
+    let(:old_data) { ['Tu a un carté avec {count} itéms'.encode('UTF-16LE')] }
+    let(:new_data) { ['Tu a un carte avec {count} items'.encode('UTF-16LE')] }
+    let(:pieces)   { Diff::LCS.diff old_data, new_data }
+    let(:hunk)     { Diff::LCS::Hunk.new(old_data, new_data, pieces[0], 3, 0) }
+
+    it 'produces a unified diff from the two pieces' do
+      expected = <<-EXPECTED.gsub(/^\s+/, '').encode('UTF-16LE').chomp
+        @@ -1 +1 @@
+        -Tu a un carté avec {count} itéms
+        +Tu a un carte avec {count} items
+      EXPECTED
+
+      expect(hunk.diff(:unified)).to eq(expected)
+    end
+
+    it 'produces a unified diff from the two pieces (last entry)' do
+      expected = <<-EXPECTED.gsub(/^\s+/, '').encode('UTF-16LE').chomp
+        @@ -1 +1 @@
+        -Tu a un carté avec {count} itéms
+        +Tu a un carte avec {count} items
+        \
+      EXPECTED
+
+      expect(hunk.diff(:unified, true)).to eq(expected)
+    end
+
+    it 'produces a context diff from the two pieces' do
+      expected = <<-EXPECTED.gsub(/^\s+/, '').encode('UTF-16LE').chomp
+        ***************
+        *** 1 ****
+        ! Tu a un carté avec {count} itéms
+        --- 1 ----
+        ! Tu a un carte avec {count} items
+      EXPECTED
+
+      expect(hunk.diff(:context)).to eq(expected)
+    end
+
+    it 'produces an old diff from the two pieces' do
+      expected = <<-EXPECTED.gsub(/^ +/, '').encode('UTF-16LE').chomp
+        1c1
+        < Tu a un carté avec {count} itéms
+        ---
+        > Tu a un carte avec {count} items
+
+      EXPECTED
+
+      expect(hunk.diff(:old)).to eq(expected)
+    end
+
+    it 'produces a reverse ed diff from the two pieces' do
+      expected = <<-EXPECTED.gsub(/^ +/, '').encode('UTF-16LE').chomp
+        c1
+        Tu a un carte avec {count} items
+        .
+
+      EXPECTED
+
+      expect(hunk.diff(:reverse_ed)).to eq(expected)
+    end
+
+    context 'with empty first data set' do
+      let(:old_data) { [] }
+
+      it 'produces a unified diff' do
+        expected = <<-EXPECTED.gsub(/^\s+/, '').encode('UTF-16LE').chomp
+          @@ -1 +1,2 @@
+          +Tu a un carte avec {count} items
+        EXPECTED
+
+        expect(hunk.diff(:unified)).to eq(expected)
+      end
+    end
+  end
+end