differ 0.1.1

data/spec/differ/diff_spec.rb

@@ -0,0 +1,298 @@
+require 'spec_helper'
+
+describe Differ::Diff do
+  before(:each) do
+    $; = nil
+    @diff = Differ::Diff.new
+  end
+
+  describe '#to_s' do
+    before(:each) do
+      @format = Differ.format
+    end
+
+    it 'should concatenate the result list' do
+      diff('a', 'b', 'c').to_s.should == 'abc'
+    end
+
+    it 'should concatenate without regard for the $;' do
+      $; = '*'
+      diff('a', 'b', 'c').to_s.should == 'abc'
+    end
+
+    it 'should delegate insertion changes to Differ#format' do
+      i = +'b'
+      @format.should_receive(:format).once.with(i).and_return('!')
+      diff('a', i, 'c').to_s.should == 'a!c'
+    end
+  end
+
+  describe '#format_as' do
+    before(:each) do
+      @change = +'b'
+      Differ.format = Module.new { def self.format(c); raise :error; end }
+      @format = Module.new { def self.format(c); end }
+    end
+
+    it 'should delegate change formatting to the given format' do
+      @format.should_receive(:format).once.with(@change).and_return('!')
+      diff('a', @change, 'c').format_as(@format).should == 'a!c'
+    end
+
+    it 'should use Differ#format_for to grab the correct format' do
+      Differ.should_receive(:format_for).once.with(@format)
+      diff().format_as(@format)
+    end
+  end
+
+  describe '#same' do
+    it 'should append to the result list' do
+      @diff.same('c')
+      @diff.should == diff('c')
+    end
+
+    it 'should concatenate its arguments' do
+      @diff.same('a', 'b', 'c', 'd')
+      @diff.should == diff('abcd')
+    end
+
+    it 'should join its arguments with $;' do
+      $; = '*'
+      @diff.same(*'a*b*c*d'.split)
+      @diff.should == diff('a*b*c*d')
+    end
+
+    describe 'when the last result was a String' do
+      before(:each) do
+        @diff = diff('a')
+      end
+
+      it 'should append to the last result' do
+        @diff.same('b')
+        @diff.should == diff('ab')
+      end
+
+      it 'should join to the last result with $;' do
+        $; = '*'
+        @diff.same('b')
+        @diff.should == diff('a*b')
+      end
+    end
+
+    describe 'when the last result was a change' do
+      before(:each) do
+        @diff = diff('z' >> 'd')
+      end
+
+      it 'should append to the result list' do
+        @diff.same('a')
+        @diff.should == diff(('z' >> 'd'), 'a')
+      end
+
+      it 'should prepend $; to the result' do
+        $; = '*'
+        @diff.same('a')
+        @diff.should == diff(('z' >> 'd'), '*a')
+      end
+
+      it "should do nothing to a leading $; on the insert" do
+        @diff = diff('a', ('*-' >> '*+'))
+        $; = '*'
+        @diff.same('c')
+        @diff.should == diff('a', ('*-' >> '*+'), '*c')
+      end
+    end
+
+    describe 'when the last result was just a delete' do
+      before(:each) do
+        @diff = diff(-'z')
+      end
+
+      it 'should append to the result list' do
+        @diff.same('a')
+        @diff.should == diff(-'z', 'a')
+      end
+
+      it 'should append $; to the previous result' do
+        $; = '*'
+        @diff.same('a')
+        @diff.should == diff(-'z*', 'a')
+      end
+
+      it "should relocate a leading $; on the delete to the previous item" do
+        @diff = diff('a', -'*b')
+        $; = '*'
+        @diff.same('c')
+        @diff.should == diff('a*', -'b*', 'c')
+      end
+    end
+
+    describe 'when the last result was just an insert' do
+      before(:each) do
+        @diff = diff(+'z')
+      end
+
+      it 'should append to the result list' do
+        @diff.same('a')
+        @diff.should == diff(+'z', 'a')
+      end
+
+      it 'should append $; to the previous result' do
+        $; = '*'
+        @diff.same('a')
+        @diff.should == diff(+'z*', 'a')
+      end
+
+      it "should relocate a leading $; on the insert to the previous item" do
+        @diff = diff('a', +'*b')
+        $; = '*'
+        @diff.same('c')
+        @diff.should == diff('a*', +'b*', 'c')
+      end
+    end
+  end
+
+  describe '#delete' do
+    it 'should append to the result list' do
+      @diff.delete('c')
+      @diff.should == diff(-'c')
+    end
+
+    it 'should concatenate its arguments' do
+      @diff.delete('a', 'b', 'c', 'd')
+      @diff.should == diff(-'abcd')
+    end
+
+    it 'should join its arguments with $;' do
+      $; = '*'
+      @diff.delete(*'a*b*c*d'.split)
+      @diff.should == diff(-'a*b*c*d')
+    end
+
+    describe 'when the last result was a Change' do
+      describe '(delete)' do
+        before(:each) do
+          @diff = diff(-'a')
+        end
+
+        it 'should append to the last result' do
+          @diff.delete('b')
+          @diff.should == diff(-'ab')
+        end
+
+        it 'should join to the last result with $;' do
+          $; = '*'
+          @diff.delete('b')
+          @diff.should == diff(-'a*b')
+        end
+      end
+
+      describe '(insert)' do
+        before(:each) do
+          @diff = diff(+'a')
+        end
+
+        it "should turn the insert into a change" do
+          @diff.delete('b')
+          @diff.should == diff('b' >> 'a')
+        end
+
+        it "should relocate a leading $; on the insert to the previous item" do
+          @diff = diff('a', +'*b')
+          $; = '*'
+          @diff.delete('z')
+          @diff.should == diff('a*', ('z' >> 'b'))
+        end
+      end
+    end
+
+    describe 'when the last result was not a Change' do
+      before(:each) do
+        @diff = diff('a')
+      end
+
+      it 'should append a Change to the result list' do
+        @diff.delete('b')
+        @diff.should == diff('a', -'b')
+      end
+
+      it 'should prepend $; to the result' do
+        $; = '*'
+        @diff.delete('b')
+        @diff.should == diff('a', -'*b')
+      end
+    end
+  end
+
+  describe '#insert' do
+    it 'should append to the result list' do
+      @diff.insert('c')
+      @diff.should == diff(+'c')
+    end
+
+    it 'should concatenate its arguments' do
+      @diff.insert('a', 'b', 'c', 'd')
+      @diff.should == diff(+'abcd')
+    end
+
+    it 'should join its arguments with $;' do
+      $; = '*'
+      @diff.insert(*'a*b*c*d'.split)
+      @diff.should == diff(+'a*b*c*d')
+    end
+
+    describe 'when the last result was a Change' do
+      describe '(delete)' do
+        before(:each) do
+          @diff = diff(-'b')
+        end
+
+        it "should not change the 'insert' portion of the last result" do
+          @diff.insert('a')
+          @diff.should == diff('b' >> 'a')
+        end
+
+        it "should relocate a leading $; on the delete to the previous item" do
+          @diff = diff('a', -'*b')
+          $; = '*'
+          @diff.insert('z')
+          @diff.should == diff('a*', ('b' >> 'z'))
+        end
+      end
+
+      describe '(insert)' do
+        before(:each) do
+          @diff = diff(+'a')
+        end
+
+        it 'should append to the last result' do
+          @diff.insert('b')
+          @diff.should == diff(+'ab')
+        end
+
+        it 'should join to the last result with $;' do
+          $; = '*'
+          @diff.insert('b')
+          @diff.should == diff(+'a*b')
+        end
+      end
+    end
+
+    describe 'when the last result was not a Change' do
+      before(:each) do
+        @diff = diff('a')
+      end
+
+      it 'should append a Change to the result list' do
+        @diff.insert('b')
+        @diff.should == diff('a', +'b')
+      end
+
+      it 'should prepend $; to the result' do
+        $; = '*'
+        @diff.insert('b')
+        @diff.should == diff('a', +'*b')
+      end
+    end
+  end
+end

data/spec/differ/format/ascii_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe Differ::Format::Ascii do
+  it 'should format inserts well' do
+    @expected = '{+"SAMPLE"}'
+    Differ::Format::Ascii.format(+'SAMPLE').should == @expected
+  end
+
+  it 'should format deletes well' do
+    @expected = '{-"SAMPLE"}'
+    Differ::Format::Ascii.format(-'SAMPLE').should == @expected
+  end
+
+  it 'should format changes well' do
+    @expected = '{"THEN" >> "NOW"}'
+    Differ::Format::Ascii.format('THEN' >> 'NOW').should == @expected
+  end
+end

data/spec/differ/format/color_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe Differ::Format::Color do
+  it 'should format inserts well' do
+    @expected = "\033[32mSAMPLE\033[0m"
+    Differ::Format::Color.format(+'SAMPLE').should == @expected
+  end
+
+  it 'should format deletes well' do
+    @expected = "\033[31mSAMPLE\033[0m"
+    Differ::Format::Color.format(-'SAMPLE').should == @expected
+  end
+
+  it 'should format changes well' do
+    @expected = "\033[31mTHEN\033[0m\033[32mNOW\033[0m"
+    Differ::Format::Color.format('THEN' >> 'NOW').should == @expected
+  end
+end

data/spec/differ/format/html_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe Differ::Format::HTML do
+  it 'should format inserts well' do
+    @expected = '<ins class="differ">SAMPLE</ins>'
+    Differ::Format::HTML.format(+'SAMPLE').should == @expected
+  end
+
+  it 'should format deletes well' do
+    @expected = '<del class="differ">SAMPLE</del>'
+    Differ::Format::HTML.format(-'SAMPLE').should == @expected
+  end
+
+  it 'should format changes well' do
+    @expected = '<del class="differ">THEN</del><ins class="differ">NOW</ins>'
+    Differ::Format::HTML.format('THEN' >> 'NOW').should == @expected
+  end
+end

data/spec/differ/string_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+require 'differ/string'
+
+describe Differ::StringDiffer do
+  it 'should be automatically mixed into String' do
+    String.included_modules.should include(Differ::StringDiffer)
+  end
+
+  before(:each) do
+    $; = nil
+  end
+
+  describe '#diff' do
+    it 'should call Differ#diff' do
+      Differ.should_receive(:diff).with('TO', 'FROM', "\n").once
+      'TO'.diff('FROM')
+    end
+
+    it 'should call Differ#diff with $;' do
+      $; = 'x'
+      Differ.should_receive(:diff).with('TO', 'FROM', $;).once
+      'TO'.diff('FROM')
+    end
+  end
+
+  describe '#-' do
+    it 'should call Differ#diff' do
+      Differ.should_receive(:diff).with('TO', 'FROM', "\n").once
+      'TO' - 'FROM'
+    end
+
+    it 'should call Differ#diff with $;' do
+      $; = 'x'
+      Differ.should_receive(:diff).with('TO', 'FROM', $;).once
+      'TO' - 'FROM'
+    end
+  end
+end

data/spec/differ_spec.rb

@@ -0,0 +1,512 @@
+require 'spec_helper'
+
+describe Differ do
+  describe '#format' do
+    before(:each) { Differ.format = nil }
+
+    it 'should return the last value it was set to' do
+      Differ.format = Differ::Format::HTML
+      Differ.format.should == Differ::Format::HTML
+    end
+
+    it 'should default to Differ::Format::Ascii' do
+      Differ.format.should == Differ::Format::Ascii
+    end
+  end
+
+  describe '#format=' do
+    it 'should call #format_for with the passed argument' do
+      Differ.should_receive(:format_for).with(:format).once
+      Differ.format = :format
+    end
+
+    it 'should raise an error on undefined behavior' do
+      lambda {
+        Differ.format = 'threeve'
+      }.should raise_error('Unknown format type "threeve"')
+    end
+  end
+
+  describe '#format_for' do
+    before(:each) { Differ.format = nil }
+
+    it 'should store any module passed to it' do
+      formatter = Module.new
+      Differ.format_for(formatter).should == formatter
+    end
+
+    it 'should permit nil (default behavior)' do
+      Differ.format_for(nil).should == nil
+    end
+
+    it 'should raise an error on undefined behavior' do
+      lambda {
+        Differ.format_for('threeve')
+      }.should raise_error('Unknown format type "threeve"')
+    end
+
+    describe 'when passed a symbol' do
+      it 'should translate the symbol :ascii into Differ::Format::Ascii' do
+        Differ.format_for(:ascii).should == Differ::Format::Ascii
+      end
+
+      it 'should translate the symbol :color into Differ::Format::Color' do
+        Differ.format_for(:color).should == Differ::Format::Color
+      end
+
+      it 'should translate the symbol :html into Differ::Format::HTML' do
+        Differ.format_for(:html).should == Differ::Format::HTML
+      end
+    end
+  end
+
+  describe '#diff_by_char' do
+    def diff_by_char
+      Differ.send(:diff_by_char, @to, @from)
+    end
+
+    before(:each) do
+      @to = @from = 'self'
+    end
+
+    it 'should hande no-change situations' do
+      @expected = diff('self')
+      diff_by_char.should == @expected
+    end
+
+    it 'should handle prepends' do
+      @to = "myself"
+      @expected = diff(+'my', 'self')
+      diff_by_char.should == @expected
+    end
+
+    it 'should handle appends' do
+      @to = 'self-interest'
+      @expected = diff('self', +'-interest')
+      diff_by_char.should == @expected
+    end
+
+    it 'should handle leading deletes' do
+      @to = 'elf'
+      @expected = diff(-'s', 'elf')
+      diff_by_char.should == @expected
+    end
+
+    it 'should handle trailing deletes' do
+      @to = 'sel'
+      @expected = diff('sel', -'f')
+      diff_by_char.should == @expected
+    end
+
+    it 'should handle simultaneous leading changes' do
+      @to = 'wood-elf'
+      @expected = diff(('s' >> 'wood-'), 'elf')
+      diff_by_char.should == @expected
+    end
+
+    it 'should handle simultaneous trailing changes' do
+      @to = "seasoning"
+      @expected = diff('se', ('lf' >> 'asoning'))
+      diff_by_char.should == @expected
+    end
+
+    it 'should handle full-string changes' do
+      @to = 'turgid'
+      @expected = diff('self' >> 'turgid')
+      diff_by_char.should == @expected
+    end
+
+    it 'should handle complex string additions' do
+      @to = 'my sleeplife'
+      @expected = diff(+'my ', 's', +'l', 'e', +'ep', 'l', +'i', 'f', +'e')
+      diff_by_char.should == @expected
+    end
+
+    it 'should handle complex string deletions' do
+      @from = 'my sleeplife'
+      @expected = diff(-'my ', 's', -'l', 'e', -'ep', 'l', -'i', 'f', -'e')
+      diff_by_char.should == @expected
+    end
+
+    it 'should handle complex string changes' do
+      @from = 'my sleeplife'
+      @to = 'seasonal'
+      @expected = diff(-'my ', 's', -'l', 'e', ('ep' >> 'asona'), 'l', -'ife')
+      diff_by_char.should == @expected
+    end
+  end
+
+  describe '#diff_by_word' do
+    def diff_by_word
+      Differ.send(:diff_by_word, @to, @from)
+    end
+
+    before(:each) do
+      @to = @from = 'the daylight will come'
+    end
+
+    it 'should hande no-change situations' do
+      @expected = diff('the daylight will come')
+      diff_by_word.should == @expected
+    end
+
+    it 'should handle prepends' do
+      @to = "surely the daylight will come"
+      @expected = diff(+'surely ', 'the daylight will come')
+      diff_by_word.should == @expected
+    end
+
+    it 'should handle appends' do
+      @to = 'the daylight will come in the morning'
+      @expected = diff('the daylight will come', +' in the morning')
+      diff_by_word.should == @expected
+    end
+
+    it 'should handle leading deletes' do
+      @to = 'daylight will come'
+      @expected = diff(-'the ', 'daylight will come')
+      diff_by_word.should == @expected
+    end
+
+    it 'should handle trailing deletes' do
+      @to = 'the daylight'
+      @expected = diff('the daylight', -' will come')
+      diff_by_word.should == @expected
+    end
+
+    it 'should handle simultaneous leading changes' do
+      @to = 'some daylight will come'
+      @expected = diff(('the' >> 'some'), ' daylight will come')
+      diff_by_word.should == @expected
+    end
+
+    it 'should handle simultaneous trailing changes' do
+      @to = "the daylight will flood the room"
+      @expected = diff('the daylight will ', ('come' >> 'flood the room'))
+      diff_by_word.should == @expected
+    end
+
+    it 'should handle full-string changes' do
+      @to = 'if we should expect it'
+      @expected = diff(
+        ('the' >> 'if'),
+        ' ',
+        ('daylight' >> 'we'),
+        ' ',
+        ('will' >> 'should'),
+        ' ',
+        ('come' >> 'expect it')
+      )
+      diff_by_word.should == @expected
+    end
+
+    it 'should handle complex string additions' do
+      @to = 'the fresh daylight will surely come'
+      @expected = diff('the ', +'fresh ', 'daylight will ', +'surely ', 'come')
+      diff_by_word.should == @expected
+    end
+
+    it 'should handle complex string deletions' do
+      @from = 'the fresh daylight will surely come'
+      @expected = diff('the ', -'fresh ', 'daylight will ', -'surely ', 'come')
+      diff_by_word.should == @expected
+    end
+
+    it 'should handle complex string changes' do
+      @from = 'the fresh daylight will surely come'
+      @to = 'something fresh will become surly'
+      @expected = diff(
+        ('the' >> 'something'),
+        ' fresh ',
+        -'daylight ',
+        'will ',
+        ( 'surely' >> 'become'),
+        ' ',
+        ( 'come' >> 'surly' )
+      )
+      diff_by_word.should == @expected
+    end
+  end
+
+  describe '#diff_by_line' do
+    def diff_by_line
+      Differ.send(:diff_by_line, @to, @from)
+    end
+
+    before(:each) do
+      @to = @from = <<-HAIKU.gsub(/  +|\n\Z/, '')
+        stallion sinks gently
+        slowly, sleeplessly
+        following harp flails
+      HAIKU
+    end
+
+    it 'should hande no-change situations' do
+      @expected = diff(@to)
+      diff_by_line.should == @expected
+    end
+
+    it 'should handle prepends' do
+      @to = <<-HAIKU.gsub(/  +|\n\Z/, '')
+        A Haiku:
+        stallion sinks gently
+        slowly, sleeplessly
+        following harp flails
+      HAIKU
+      @expected = diff(+"A Haiku:\n", @from)
+      diff_by_line.should == @expected
+    end
+
+    it 'should handle appends' do
+      @to = <<-HAIKU.gsub(/  +|\n\Z/, '')
+        stallion sinks gently
+        slowly, sleeplessly
+        following harp flails
+        -- http://everypoet.net
+      HAIKU
+      @expected = diff(@from, +"\n-- http://everypoet.net")
+      diff_by_line.should == @expected
+    end
+
+    it 'should handle leading deletes' do
+      @from = <<-HAIKU.gsub(/  +|\n\Z/, '')
+        A Haiku:
+        stallion sinks gently
+        slowly, sleeplessly
+        following harp flails
+      HAIKU
+      @expected = diff(-"A Haiku:\n", @to)
+      diff_by_line.should == @expected
+    end
+
+    it 'should handle trailing deletes' do
+      @from = <<-HAIKU.gsub(/  +|\n\Z/, '')
+        stallion sinks gently
+        slowly, sleeplessly
+        following harp flails
+        -- http://everypoet.net
+      HAIKU
+      @expected = diff(@to, -"\n-- http://everypoet.net")
+      diff_by_line.should == @expected
+    end
+
+    it 'should handle simultaneous leading changes' do
+      @to = <<-HAIKU.gsub(/  +|\n\Z/, '')
+        stallion sings gently
+        slowly, sleeplessly
+        following harp flails
+      HAIKU
+      @expected = diff(
+        ('stallion sinks gently' >> 'stallion sings gently'),
+        "\nslowly, sleeplessly" <<
+        "\nfollowing harp flails"
+      )
+      diff_by_line.should == @expected
+    end
+
+    it 'should handle simultaneous trailing changes' do
+      @to = <<-HAIKU.gsub(/  +|\n\Z/, '')
+        stallion sinks gently
+        slowly, sleeplessly
+        drifting ever on
+      HAIKU
+      @expected = diff(
+        "stallion sinks gently\n" <<
+        "slowly, sleeplessly\n",
+        ('following harp flails' >> 'drifting ever on')
+      )
+      diff_by_line.should == @expected
+    end
+
+    it 'should handle full-string changes' do
+      @to = <<-HAIKU.gsub(/  +|\n\Z/, '')
+        glumly inert coals
+        slumber lazily, shoulda
+        used more Burma Shave
+      HAIKU
+      @expected = diff(@from >> @to)
+      diff_by_line.should == @expected
+    end
+
+    it 'should handle complex string additions' do
+      @to = <<-HAIKU.gsub(/  +|\n\Z/, '')
+        A Haiku, with annotation:
+        stallion sinks gently
+        slowly, sleeplessly
+        (flailing)
+        following harp flails
+        -- modified from source
+      HAIKU
+      @expected = diff(
+        +"A Haiku, with annotation:\n",
+        "stallion sinks gently\n" <<
+        "slowly, sleeplessly\n",
+        +"(flailing)\n",
+        'following harp flails',
+        +"\n-- modified from source"
+      )
+      diff_by_line.should == @expected
+    end
+
+    it 'should handle complex string deletions' do
+      @from = <<-HAIKU.gsub(/  +|\n\Z/, '')
+        A Haiku, with annotation:
+        stallion sinks gently
+        slowly, sleeplessly
+        (flailing)
+        following harp flails
+        -- modified from source
+      HAIKU
+      @expected = diff(
+        -"A Haiku, with annotation:\n",
+        "stallion sinks gently\n" <<
+        "slowly, sleeplessly\n",
+        -"(flailing)\n",
+        'following harp flails',
+        -"\n-- modified from source"
+      )
+      diff_by_line.should == @expected
+    end
+
+    it 'should handle complex string changes' do
+      @to = <<-HAIKU.gsub(/  +|\n\Z/, '')
+        stallion sings gently
+        slowly, sleeplessly
+        (flailing)
+        following harp flails
+        -- modified from source
+      HAIKU
+      @expected = diff(
+        ('stallion sinks gently' >> 'stallion sings gently'),
+        "\nslowly, sleeplessly\n",
+        +"(flailing)\n",
+        'following harp flails',
+        +"\n-- modified from source"
+      )
+      diff_by_line.should == @expected
+    end
+  end
+
+  describe '#diff (with arbitrary boundary)' do
+    def diff_by_comma
+      Differ.send(:diff, @to, @from, ', ')
+    end
+
+    before(:each) do
+      @to = @from = 'alteration, asymmetry, a deviation'
+    end
+
+    it 'should hande no-change situations' do
+      @expected = diff('alteration, asymmetry, a deviation')
+      diff_by_comma.should == @expected
+    end
+
+    it 'should handle prepends' do
+      @to = "aberration, alteration, asymmetry, a deviation"
+      @expected = diff(+'aberration, ', 'alteration, asymmetry, a deviation')
+      diff_by_comma.should == @expected
+    end
+
+    it 'should handle appends' do
+      @to = "alteration, asymmetry, a deviation, change"
+      @expected = diff('alteration, asymmetry, a deviation', +', change')
+      diff_by_comma.should == @expected
+    end
+
+    it 'should handle leading deletes' do
+      @to = 'asymmetry, a deviation'
+      @expected = diff(-'alteration, ', 'asymmetry, a deviation')
+      diff_by_comma.should == @expected
+    end
+
+    it 'should handle trailing deletes' do
+      @to = 'alteration, asymmetry'
+      @expected = diff('alteration, asymmetry', -', a deviation')
+      diff_by_comma.should == @expected
+    end
+
+    it 'should handle simultaneous leading changes' do
+      @to = 'aberration, asymmetry, a deviation'
+      @expected = diff(('alteration' >> 'aberration'), ', asymmetry, a deviation')
+      diff_by_comma.should == @expected
+    end
+
+    it 'should handle simultaneous trailing changes' do
+      @to = 'alteration, asymmetry, change'
+      @expected = diff('alteration, asymmetry, ', ('a deviation' >> 'change'))
+      diff_by_comma.should == @expected
+    end
+
+    it 'should handle full-string changes' do
+      @to = 'uniformity, unison, unity'
+      @expected = diff(@from >> @to)
+      diff_by_comma.should == @expected
+    end
+
+    it 'should handle complex string additions' do
+      @to = 'aberration, alteration, anomaly, asymmetry, a deviation, change'
+      @expected = diff(
+        +'aberration, ',
+        'alteration, ',
+        +'anomaly, ',
+        'asymmetry, a deviation',
+        +', change'
+      )
+      diff_by_comma.should == @expected
+    end
+
+    it 'should handle complex string deletions' do
+      @from = 'aberration, alteration, anomaly, asymmetry, a deviation, change'
+      @expected = diff(
+        -'aberration, ',
+        'alteration, ',
+        -'anomaly, ',
+        'asymmetry, a deviation',
+        -', change'
+      )
+      diff_by_comma.should == @expected
+    end
+
+    it 'should handle complex string changes' do
+      @from = 'a, d, g, gh, x'
+      @to = 'a, b, c, d, e, f, g, h, i, j'
+      @expected = diff(
+        'a, ',
+        +'b, c, ',
+        'd, ',
+        +'e, f, ',
+        'g, ',
+        ('gh, x' >> 'h, i, j')
+      )
+      diff_by_comma.should == @expected
+    end
+  end
+
+  describe '#diff (with implied boundary)' do
+    def diff_by_line
+      Differ.send(:diff, @to, @from)
+    end
+
+    before(:each) do
+      @to = @from = <<-HAIKU.gsub(/  +|\n\Z/, '')
+        stallion sinks gently
+        slowly, sleeplessly
+        following harp flails
+      HAIKU
+    end
+
+    it 'should do diffs by line' do
+      @to = <<-HAIKU.gsub(/  +|\n\Z/, '')
+        stallion sinks gently
+        slowly, restlessly
+        following harp flails
+      HAIKU
+      @expected = diff(
+        "stallion sinks gently\n",
+        ('slowly, sleeplessly' >> 'slowly, restlessly'),
+        "\nfollowing harp flails"
+      )
+      diff_by_line.should == @expected
+    end
+  end
+end