diffing 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f515a9445aa155f3572e497fd3074293485f80b
-  data.tar.gz: 7fb8fb8c02e4e94c45c5f4d4a579839cc0819a62
+  metadata.gz: 78cda3e7cb88712418ded811e46b24ea9a313940
+  data.tar.gz: 1df3f815fa570ca10fdecea3c1003b6a96f39b4e
 SHA512:
-  metadata.gz: bf83c911a89640fcdf1716603d9b60305798b3a670478f5bb49d75cff7aeaa12461f212b20bd685c64d538af406e0fa20ff5cb5be68861646e9768d2c6846dc7
-  data.tar.gz: 4a117ea61cd887661511e6a022ab5b22f2e8f17c83fb4d8959fb29206f5df6774655652cca3a7d2cd20d696fc72ff7371074fd2274cb40757235adeed528cb5d
+  metadata.gz: aee5a434d152027da2a979fed35ef57283ec0d93c4feb5d324a8de4eb216f6c4bd28ff6b7afdb5fc2e1f3b2e00777a21a0a271f6e42817df7afb283e6c0a0a5b
+  data.tar.gz: 74d41e0ad413a2e7f9031cc61370369878b02f22c10b16f1c16b1800456ccaabaa559000db8d14077d97dd8e3ad8c8f4fcd02355800047fb616db39a2f395f1a

data/Gemfile

@@ -1,3 +1,3 @@
-source 'https://rubygems.org'
+source 'https://rubygems.org'
 
 gemspec

data/README.md

@@ -1,8 +1,8 @@
 # Diffing
 
 [![Build Status](https://travis-ci.org/4urbanoff/Diffing.svg)](https://travis-ci.org/4urbanoff/Diffing)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/4urbanoff/Diffing/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/4urbanoff/Diffing/?branch=master)
 [![Code Climate](https://codeclimate.com/github/4urbanoff/Diffing/badges/gpa.svg)](https://codeclimate.com/github/4urbanoff/Diffing)
-[![Test Coverage](https://codeclimate.com/github/4urbanoff/Diffing/badges/coverage.svg)](https://codeclimate.com/github/4urbanoff/Diffing/coverage)
 
 ## Installation
 

data/Rakefile

@@ -1,3 +1,3 @@
 require 'rspec/core/rake_task'
 
-RSpec::Core::RakeTask.new( :default )
+RSpec::Core::RakeTask.new( :default )

data/lib/diffing/diff.rb

@@ -7,26 +7,26 @@ module Diffing
 
     def initialize( from, to, pattern = nil )
       @pattern = pattern
-      @parts   = calculate( split( from.to_s ), split( to.to_s ) ).flatten
+      @parts   = calculate( split( from.to_s ), split( to.to_s ) ).flatten
     end
 
-    def format( format )
+    def format( formatter )
       result = []
       @parts.each do |part|
-        result << format.source( part.source )              if part.source?
-        result << format.insert( part.insert )              if part.insert? && !part.remove?
-        result << format.remove( part.remove )              if part.remove? && !part.insert?
-        result << format.change( part.remove, part.insert ) if part.insert? && part.remove?
+        result << formatter.source( part.source )              if part.source?
+        result << formatter.insert( part.insert )              if part.insert? && !part.remove?
+        result << formatter.remove( part.remove )              if part.remove? && !part.insert?
+        result << formatter.change( part.remove, part.insert ) if part.insert? && part.remove?
       end
       result.join
     end
 
     def as_ascii
-      format Formats::Ascii
+      format Formats::Ascii
     end
 
     def as_html
-      format Formats::Html
+      format Formats::Html
     end
 
     alias :to_s    :as_ascii
@@ -35,10 +35,10 @@ module Diffing
 
     private
 
-    def calculate( from, to )
+    def calculate( from, to )
       if found = find_middle( from, to )
         from_l, to_l, source, from_r, to_r = found
-        [ calculate( from_l, to_l ), Part.new( source: join( source ) ), calculate( from_r, to_r ) ]
+        [ calculate( from_l, to_l ), Part.new( source: join( source ) ), calculate( from_r, to_r ) ]
       else
         [ Part.new( insert: join( to ), remove: join( from ) ) ]
       end
@@ -46,7 +46,7 @@ module Diffing
 
     def find_middle( from, to, min = 0, max = nil )
 
-      return nil if from.empty? or to.empty?
+      return nil if from.empty? || to.empty?
 
       max  = from.size unless max
       size = min + ( ( max - min ) / 2.to_f ).round
@@ -56,7 +56,7 @@ module Diffing
         if found = find_middle_index( to, subset )
 
           return (
-            size != min and find_middle( from, to, size, max ) or
+            size != min && find_middle( from, to, size, max ) ||
             (
               from_l = from[ 0...first ]
               to_l   = to[ 0...found ]
@@ -70,13 +70,38 @@ module Diffing
 
       end
 
-      size != max and find_middle( from, to, min, size ) or nil
+      size != max && find_middle( from, to, min, size ) || nil
+
+    end
+
+    def scan_index( set, search_subset )
+
+      offset = 0
+      while found = set.slice( offset..-1 ).index( search_subset ) do
+        yield found
+        offset += found + 1
+      end
 
     end
 
     def find_middle_index( set, search_subset )
       return set.index( search_subset ) if set.is_a?( String ) && search_subset.is_a?( String )
-      subsets_each( set, search_subset.size ){ |subset, first, last| return first if subset == search_subset }
+
+      set = set.dup
+
+      index = 0
+
+      scan_index( set.join, search_subset.join ) do |found|
+
+        size = 0
+        while size != found
+          break if size + set[0].size > found
+          size  += set.shift.size
+          index += 1
+        end
+
+        return index if set.slice(0, search_subset.size ) == search_subset
+      end
       nil
     end
 

data/lib/diffing/formats/ascii.rb

@@ -1,6 +1,6 @@
 module Diffing
 
-  module Formats
+  module Formats
 
     module Ascii
 

data/lib/diffing/formats/html.rb

@@ -1,6 +1,6 @@
 module Diffing
 
-  module Formats
+  module Formats
 
     module Html
 

data/lib/diffing/part.rb

@@ -3,10 +3,10 @@ module Diffing
 
   class Part
 
-    attr_reader :source, :insert, :remove
+    attr_reader :source, :insert, :remove
 
-    def initialize( source: '', insert: '', remove: '' )
-      @source, @insert, @remove = source, insert, remove
+    def initialize( source: '', insert: '', remove: '' )
+      @source, @insert, @remove = source, insert, remove
     end
 
     def source?
@@ -17,8 +17,8 @@ module Diffing
       not @insert.empty?
     end
 
-    def remove?
-      not @remove.empty?
+    def remove?
+      not @remove.empty?
     end
 
   end

data/spec/diffing/diff_spec.rb

@@ -1,32 +1,32 @@
 describe Diffing::Diff do
-
-  it '#initialize' do
-    expect( diff ).to an_instance_of( Diffing::Diff )
-  end
-
-  it '#calculate' do
-    ex = diff_by_chars.send( :calculate, 'ab', 'bc' ).flatten.map { |part|
-      ( part.source? and part.source ) or ( part.insert? and part.insert ) or ( part.remove? and part.remove )
-    }.join
-    expect( ex ).to eql( 'abc' )
-    ex = diff_by_words.send( :calculate, %w(a b), %w(b c) ).flatten.map { |part|
-      ( part.source? and part.source ) or ( part.insert? and part.insert ) or ( part.remove? and part.remove )
-    }.join
-    expect( ex ).to eql( 'abc' )
+
+  it '#initialize' do
+    expect( diff ).to an_instance_of( Diffing::Diff )
+  end
+
+  it '#calculate' do
+    ex = diff_by_chars.send( :calculate, 'ab', 'bc' ).flatten.map { |part|
+      ( part.source? && part.source ) || ( part.insert? && part.insert ) || ( part.remove? && part.remove )
+    }.join
+    expect( ex ).to eql( 'abc' )
+    ex = diff_by_words.send( :calculate, %w(a b), %w(b c) ).flatten.map { |part|
+      ( part.source? && part.source ) || ( part.insert? && part.insert ) || ( part.remove? && part.remove )
+    }.join
+    expect( ex ).to eql( 'abc' )
   end
 
-  it '#find_middle' do
-    expect( diff_by_chars.send( :find_middle, '.mid..', '--mid-' ) ).to eq( ['.', '--', 'mid', '..', '-'] )
-    expect( diff_by_chars.send( :find_middle, '.mid..', '__===_' ) ).to eq( nil )
-    expect( diff_by_words.send( :find_middle, %w(. m i d . .), %w(- - m i d -) ) ).to eq( [['.'], ['-', '-'], ['m', 'i', 'd'], ['.', '.'], ['-']] )
-    expect( diff_by_words.send( :find_middle, %w(. m i d . .), %w(_ _ = = = _) ) ).to eq( nil )
+  it '#find_middle' do
+    expect( diff_by_chars.send( :find_middle, '.mid..', '--mid-' ) ).to eq( ['.', '--', 'mid', '..', '-'] )
+    expect( diff_by_chars.send( :find_middle, '.mid..', '__===_' ) ).to eq( nil )
+    expect( diff_by_words.send( :find_middle, %w(. m i d . .), %w(- - m i d -) ) ).to eq( [['.'], ['-', '-'], ['m', 'i', 'd'], ['.', '.'], ['-']] )
+    expect( diff_by_words.send( :find_middle, %w(. m i d . .), %w(_ _ = = = _) ) ).to eq( nil )
   end
 
-  it '#find_middle_index' do
-    expect( diff_by_chars.send( :find_middle_index, '...mid...', 'mid' ) ).to eq( 3 )
-    expect( diff_by_words.send( :find_middle_index, %w(. . . m i d . . .), %w(m i d) ) ).to eq( 3 )
-    expect( diff_by_chars.send( :find_middle_index, '...mid...', 'nil' ) ).to eq( nil )
-    expect( diff_by_words.send( :find_middle_index, %w(. . . m i d . . .), %w(n i l) ) ).to eq( nil )
+  it '#find_middle_index' do
+    expect( diff_by_chars.send( :find_middle_index, '...mid...', 'mid' ) ).to eq( 3 )
+    expect( diff_by_words.send( :find_middle_index, %w(. . . m i d . . .), %w(m i d) ) ).to eq( 3 )
+    expect( diff_by_chars.send( :find_middle_index, '...mid...', 'nil' ) ).to eq( nil )
+    expect( diff_by_words.send( :find_middle_index, %w(. . . m i d . . .), %w(n i l) ) ).to eq( nil )
   end
 
   it '#subsets_each' do
@@ -35,14 +35,14 @@ describe Diffing::Diff do
     expect( result ).to eq( [ ['abc', 0, 3], ['bcd', 1, 4], ['cde', 2, 5] ] )
   end
 
-  it '#split' do
-    expect( diff_by_chars.send( :split, 'abc' ) ).to an_instance_of( String )
-    expect( diff_by_words.send( :split, 'a b' ) ).to an_instance_of( Array )
+  it '#split' do
+    expect( diff_by_chars.send( :split, 'abc' ) ).to an_instance_of( String )
+    expect( diff_by_words.send( :split, 'a b' ) ).to an_instance_of( Array )
   end
 
-  it '#join' do
-    expect( diff.send( :join, 'abc' ) ).to     eq( 'abc' )
-    expect( diff.send( :join, %w(a b c) ) ).to eq( 'abc' )
+  it '#join' do
+    expect( diff.send( :join, 'abc' ) ).to     eq( 'abc' )
+    expect( diff.send( :join, %w(a b c) ) ).to eq( 'abc' )
   end
-
+
 end

data/spec/diffing/formats_spec.rb

@@ -1,29 +1,29 @@
-describe Diffing::Formats do
-
-  Diffing::Formats.constants.each do |name|
-
-    name do
-
-      subject = Diffing::Formats.const_get name
-
-      it 'does not have method source' do
-        subject.source ''
-      end
-
-      it 'does not have method insert' do
-        subject.insert ''
-      end
-
-      it 'does not have method remove' do
-        subject.remove ''
-      end
-
-      it 'does not have method change' do
-        subject.change '', ''
-      end
-
-    end
-
-  end
-
-end
+describe Diffing::Formats do
+
+  Diffing::Formats.constants.each do |name|
+
+    name do
+
+      subject = Diffing::Formats.const_get name
+
+      it 'does not have method source' do
+        subject.source ''
+      end
+
+      it 'does not have method insert' do
+        subject.insert ''
+      end
+
+      it 'does not have method remove' do
+        subject.remove ''
+      end
+
+      it 'does not have method change' do
+        subject.change '', ''
+      end
+
+    end
+
+  end
+
+end

data/spec/diffing/part_spec.rb

@@ -1,33 +1,33 @@
-describe Diffing::Part do
-
-  subject { Diffing::Part.new( source: 'a', insert: 'b', remove: 'c' ) }
-
-  it '#initialize' do
-    expect( subject ).to an_instance_of( Diffing::Part )
-  end
-
-  it '#source' do
-    expect( subject.source ).to eq( 'a' )
-  end
-
-  it '#insert' do
-    expect( subject.insert ).to eq( 'b' )
-  end
-
-  it '#remove' do
-    expect( subject.remove ).to eq( 'c' )
-  end
-
-  it '#source?' do
-    expect( subject.source? ).to eq( true )
-  end
-
-  it '#insert?' do
-    expect( subject.insert? ).to eq( true )
-  end
-
-  it '#remove?' do
-    expect( subject.remove? ).to eq( true )
-  end
-
-end
+describe Diffing::Part do
+
+  subject { Diffing::Part.new( source: 'a', insert: 'b', remove: 'c' ) }
+
+  it '#initialize' do
+    expect( subject ).to an_instance_of( Diffing::Part )
+  end
+
+  it '#source' do
+    expect( subject.source ).to eq( 'a' )
+  end
+
+  it '#insert' do
+    expect( subject.insert ).to eq( 'b' )
+  end
+
+  it '#remove' do
+    expect( subject.remove ).to eq( 'c' )
+  end
+
+  it '#source?' do
+    expect( subject.source? ).to eq( true )
+  end
+
+  it '#insert?' do
+    expect( subject.insert? ).to eq( true )
+  end
+
+  it '#remove?' do
+    expect( subject.remove? ).to eq( true )
+  end
+
+end

data/spec/diffing_spec.rb

@@ -1,19 +1,19 @@
-describe Diffing do
-
-  it 'does not exists' do
-    Diffing
-  end
-
-  it 'does not have method by_chars( from, to )' do
-    Diffing.by_chars "", ""
-  end
-
-  it 'does not have method by_words( from, to )' do
-    Diffing.by_words "", ""
-  end
-
-  it 'does not have method by_lines( from, to )' do
-    Diffing.by_lines "", ""
-  end
-
-end
+describe Diffing do
+
+  it 'does not exists' do
+    Diffing
+  end
+
+  it 'does not have method by_chars( from, to )' do
+    Diffing.by_chars "", ""
+  end
+
+  it 'does not have method by_words( from, to )' do
+    Diffing.by_words "", ""
+  end
+
+  it 'does not have method by_lines( from, to )' do
+    Diffing.by_lines "", ""
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-require 'diffing'
+require 'diffing'
 
 
 module Diffing
@@ -26,9 +26,9 @@ module Diffing
 end
 
 
-
+
 RSpec.configure do |config|
 
   config.include Diffing::SpecHelper
-
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diffing
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Denis Churbanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-05 00:00:00.000000000 Z
+date: 2015-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -58,7 +58,6 @@ files:
 - Rakefile
 - Gemfile
 - README.md
-- .rspec
 homepage: https://github.com/4urbanoff/Diffing
 licenses:
 - MIT

data/.rspec

@@ -1,2 +0,0 @@
---color
---require spec_helper