summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAustin Ziegler <austin@zieglers.ca>2019-01-27 00:03:42 -0500
committerAustin Ziegler <austin@zieglers.ca>2019-01-27 00:03:42 -0500
commit07ed577eba341f0ff0d7eebf4c1c2cc23083cba7 (patch)
tree25bb9d2a67dc451fb1d5256f64262d83ab0bb505
parent808f83a11a9e6ec45b7ef2b9c336f4b75b9d8368 (diff)
downloaddiff-lcs-07ed577eba341f0ff0d7eebf4c1c2cc23083cba7.tar.gz
Revert PR#47 "Add #to_ary to Diff::LCS::Changeā€¦"
This reverts commits 01e0cae and 3b4d2be because they introduce fatally breaking changes in the tests that were hidden by broken CI. * 01e0cae: Add #to_ary to Diff::LCS::Change and Diff::LCS::ContextChange [Akinori MUSHA] * 3b4d2be: Mention in rdoc that Diff::LCS::ContextChange can be converted to an array [Akinori MUSHA]
-rw-r--r--lib/diff/lcs.rb14
-rw-r--r--lib/diff/lcs/change.rb4
-rw-r--r--spec/change_spec.rb24
3 files changed, 0 insertions, 42 deletions
diff --git a/lib/diff/lcs.rb b/lib/diff/lcs.rb
index 8fb4314..34ddf0f 100644
--- a/lib/diff/lcs.rb
+++ b/lib/diff/lcs.rb
@@ -181,20 +181,6 @@ class << Diff::LCS
# Class argument is provided for +callbacks+, #diff will attempt to
# initialise it. If the +callbacks+ object (possibly initialised) responds
# to #finish, it will be called.
- #
- # Each element of a returned array is a Diff::LCS::ContextChange object,
- # which can be implicitly converted to an array.
- #
- # Diff::LCS.sdiff(a, b).each do |action, (old_pos, old_element), (new_pos, new_element)|
- # case action
- # when '!'
- # # replace
- # when '-'
- # # delete
- # when '+'
- # # insert
- # end
- # end
def sdiff(seq1, seq2, callbacks = nil, &block) #:yields diff changes:
diff_traversal(:sdiff, seq1, seq2, callbacks || Diff::LCS::SDiffCallbacks,
&block)
diff --git a/lib/diff/lcs/change.rb b/lib/diff/lcs/change.rb
index 8dae83b..9229069 100644
--- a/lib/diff/lcs/change.rb
+++ b/lib/diff/lcs/change.rb
@@ -41,8 +41,6 @@ class Diff::LCS::Change
[ @action, @position, @element ]
end
- alias to_ary to_a
-
def self.from_a(arr)
arr = arr.flatten(1)
case arr.size
@@ -134,8 +132,6 @@ class Diff::LCS::ContextChange < Diff::LCS::Change
]
end
- alias to_ary to_a
-
def inspect(*args)
to_a.inspect
end
diff --git a/spec/change_spec.rb b/spec/change_spec.rb
index 5128dc1..dfe385f 100644
--- a/spec/change_spec.rb
+++ b/spec/change_spec.rb
@@ -62,28 +62,4 @@ describe Diff::LCS::Change do
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