Skip to content

Commit

Permalink
Revert PR#47 "Add #to_ary to Diff::LCS::Change…"
Browse files Browse the repository at this point in the history
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]
  • Loading branch information
halostatue committed Jan 27, 2019
1 parent 808f83a commit 07ed577
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 42 deletions.
14 changes: 0 additions & 14 deletions lib/diff/lcs.rb
Expand Up @@ -181,20 +181,6 @@ def diff(seq1, seq2, callbacks = nil, &block) # :yields diff changes:
# 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)
Expand Down
4 changes: 0 additions & 4 deletions lib/diff/lcs/change.rb
Expand Up @@ -41,8 +41,6 @@ def to_a
[ @action, @position, @element ]
end

alias to_ary to_a

def self.from_a(arr)
arr = arr.flatten(1)
case arr.size
Expand Down Expand Up @@ -134,8 +132,6 @@ def to_a
]
end

alias to_ary to_a

def inspect(*args)
to_a.inspect
end
Expand Down
24 changes: 0 additions & 24 deletions spec/change_spec.rb
Expand Up @@ -62,28 +62,4 @@
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

0 comments on commit 07ed577

Please sign in to comment.