diffing 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a9db88ed0327a83b434f94b73fa9a425d14dbe8
-  data.tar.gz: 071b087aa7c10b65a685daa44a548c73176fbd88
+  metadata.gz: 8f515a9445aa155f3572e497fd3074293485f80b
+  data.tar.gz: 7fb8fb8c02e4e94c45c5f4d4a579839cc0819a62
 SHA512:
-  metadata.gz: d8e5f2ed5e39eabfa3b035bda196fe1d74d44978579aacda5354d000ebefb905fad14e0b164050990ef6b90e28e95ecb361e87f036afdef96c49c4decc831696
-  data.tar.gz: 502929c52ffc80ed63cf86b0109aeaea91e15382b224ed3aefc66741532ae0ca70e8b13b37ad6e0389b45c0198e7453bbefb7d10b0eedd427e4e4b5f5a4ea72b
+  metadata.gz: bf83c911a89640fcdf1716603d9b60305798b3a670478f5bb49d75cff7aeaa12461f212b20bd685c64d538af406e0fa20ff5cb5be68861646e9768d2c6846dc7
+  data.tar.gz: 4a117ea61cd887661511e6a022ab5b22f2e8f17c83fb4d8959fb29206f5df6774655652cca3a7d2cd20d696fc72ff7371074fd2274cb40757235adeed528cb5d

data/.rspec

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

data/Gemfile

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

data/README.md

@@ -1,5 +1,9 @@
 # Diffing
 
+[![Build Status](https://travis-ci.org/4urbanoff/Diffing.svg)](https://travis-ci.org/4urbanoff/Diffing)
+[![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
 
 ```
@@ -59,11 +63,11 @@ module CustomFormat
       "(++#{ value })"
     end
 
-    def delete( value )
+    def remove( value )
       "(--#{ value })"
     end
 
-    def replace( from, to )
+    def change( from, to )
       "(#{ from } => #{ to })"
     end
 
@@ -89,11 +93,11 @@ Diffing.by_words( from, to ).parts.map { |part|
   result = ''
   result << "<source:#{ part.source }>" if part.source?
   result << "<insert:#{ part.insert }>" if part.insert?
-  result << "<delete:#{ part.delete }>" if part.delete?
+  result << "<remove:#{ part.remove }>" if part.remove?
   result
   
 }.join 
-# => <insert:Hi!><delete:Hello!><source: I am><insert: two><source: string for diffing><delete: test>
+# => <insert:Hi!><remove:Hello!><source: I am><insert: two><source: string for diffing><remove: test>
 ```
 
 

data/Rakefile

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

data/lib/diffing/diff.rb

@@ -5,28 +5,28 @@ module Diffing
 
     attr_reader :parts
 
-    def initialize( from, to, pattern = nil )
-      @pattern = pattern
-      @parts   = calcucate( split( from.to_s ), split( to.to_s ) ).flatten
+    def initialize( from, to, pattern = nil )
+      @pattern = pattern
+      @parts   = calculate( split( from.to_s ), split( to.to_s ) ).flatten
     end
 
     def format( format )
       result = []
       @parts.each do |part|
-        result << format.source(  part.source )              if part.source?
-        result << format.insert(  part.insert )              if part.insert? && !part.delete?
-        result << format.delete(  part.delete )              if part.delete? && !part.insert?
-        result << format.replace( part.delete, part.insert ) if part.insert? && part.delete?
+        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?
       end
-      result.join
+      result.join
     end
 
     def as_ascii
-      format Format::Ascii
+      format Formats::Ascii
     end
 
     def as_html
-      format Format::Html
+      format Formats::Html
     end
 
     alias :to_s    :as_ascii
@@ -35,12 +35,12 @@ module Diffing
 
     private
 
-    def calcucate( from, to )
+    def calculate( from, to )
       if found = find_middle( from, to )
         from_l, to_l, source, from_r, to_r = found
-        [ calcucate( from_l, to_l ), Part.new( source: join( source ) ), calcucate( 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 ), delete: join( from ) ) ]
+        [ Part.new( insert: join( to ), remove: join( from ) ) ]
       end
     end
 
@@ -75,7 +75,7 @@ module Diffing
     end
 
     def find_middle_index( set, search_subset )
-      return set.index( search_subset ) unless @pattern
+      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 }
       nil
     end
@@ -89,11 +89,11 @@ module Diffing
     end
 
     def split( set )
-      @pattern ? set.scan( @pattern ) : set
+      @pattern ? set.scan( @pattern ) : set
     end
 
     def join( set )
-      @pattern ? set.join : set
+      set.is_a?( Array ) ? set.join : set
     end
 
   end

data/lib/diffing/formats/ascii.rb

@@ -1,6 +1,6 @@
 module Diffing
 
-  module Format
+  module Formats
 
     module Ascii
 
@@ -12,15 +12,15 @@ module Diffing
         end
 
         def insert( value )
-          "{+`#{ value }`}"
+          "{+`#{ value }`}"
         end
 
-        def delete( value )
-          "{-`#{ value }`}"
+        def remove( value )
+          "{-`#{ value }`}"
         end
 
-        def replace( from, to )
-          "{`#{ from }`>>`#{ to }`}"
+        def change( from, to )
+          "{`#{ from }`>>`#{ to }`}"
         end
 
 

data/lib/diffing/formats/html.rb

@@ -1,33 +1,33 @@
-module Diffing
-
-  module Format
-
-    module Html
-
-      class << self
-
-
-        def source( value )
-          value
-        end
-
-        def insert( value )
-          "<ins>#{ value }</ins>"
-        end
-
-        def delete( value )
-          "<del>#{ value }</del>"
-        end
-
-        def replace( from, to )
-          delete( from ) + insert( to )
-        end
-
-
-      end
-
-    end
-
-  end
-
-end
+module Diffing
+
+  module Formats
+
+    module Html
+
+      class << self
+
+
+        def source( value )
+          value
+        end
+
+        def insert( value )
+          "<ins>#{ value }</ins>"
+        end
+
+        def remove( value )
+          "<del>#{ value }</del>"
+        end
+
+        def change( from, to )
+          remove( from ) + insert( to )
+        end
+
+
+      end
+
+    end
+
+  end
+
+end

data/lib/diffing/part.rb

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

data/lib/diffing.rb

@@ -1,7 +1,7 @@
-require 'diffing/diff'
-require 'diffing/part'
-require 'diffing/formats/ascii'
-require 'diffing/formats/html'
+require 'diffing/diff'
+require 'diffing/part'
+require 'diffing/formats/ascii'
+require 'diffing/formats/html'
 
 
 module Diffing
@@ -9,16 +9,16 @@ module Diffing
   class << self
 
 
-    def by_chars( from, to )
-      Diff.new from, to
+    def by_chars( from, to )
+      Diff.new from, to
     end
 
     def by_words( from, to )
-      Diff.new from, to, /\S+|\s+/
+      Diff.new from, to, /\S+|\s+/
     end
-
-    def by_lines( from, to )
-      Diff.new from, to, /[^\n]+|\n+/
+
+    def by_lines( from, to )
+      Diff.new from, to, /[^\n]+|\n+/
     end
 
 

data/spec/diffing/diff_spec.rb

@@ -0,0 +1,48 @@
+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' )
+  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 )
+  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 )
+  end
+
+  it '#subsets_each' do
+    result = []
+    diff.send( :subsets_each, 'abcde', 3 ){ |*args| result << args }
+    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 )
+  end
+
+  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

@@ -0,0 +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

data/spec/diffing/part_spec.rb

@@ -0,0 +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

data/spec/diffing_spec.rb

@@ -0,0 +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

data/spec/spec_helper.rb

@@ -0,0 +1,34 @@
+require 'diffing'
+
+
+module Diffing
+
+  module SpecHelper
+
+    def diff( type = :by_chars, from = "", to = "" )
+      Diffing.send type, from, to
+    end
+
+    def diff_by_chars( from = "", to = "" )
+      diff :by_chars, from, to
+    end
+
+    def diff_by_words( from = "", to = "" )
+      diff :by_words, from, to
+    end
+
+    def diff_by_lines( from = "", to = "" )
+      diff :by_lines, from, to
+    end
+
+  end
+
+end
+
+
+
+RSpec.configure do |config|
+
+  config.include Diffing::SpecHelper
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diffing
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Denis Churbanov
@@ -9,7 +9,35 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2015-08-05 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Diffing of two strings
 email: 4urbanoff@gmail.com
 executables: []
@@ -21,10 +49,16 @@ files:
 - lib/diffing/formats/html.rb
 - lib/diffing/part.rb
 - lib/diffing.rb
+- spec/diffing/diff_spec.rb
+- spec/diffing/formats_spec.rb
+- spec/diffing/part_spec.rb
+- spec/diffing_spec.rb
+- spec/spec_helper.rb
 - LICENSE.txt
 - Rakefile
 - Gemfile
 - README.md
+- .rspec
 homepage: https://github.com/4urbanoff/Diffing
 licenses:
 - MIT