diffing 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8ac1c37dffd7e67d6b3f13890414c6c2d78ed9e
-  data.tar.gz: 356faa930542c3f4e5bd9be4637a2ad06cee8028
+  metadata.gz: 00a7b9d972e0846119c0771badcf7f95b7caf1d3
+  data.tar.gz: 5174c797bcb153d30fb75e1caa22cb909e0d0736
 SHA512:
-  metadata.gz: b9ef2fe7b2aecc6ec334337145a0e706721491311bb1d9587b6085c2a87004dfacc7926444950ac73758b547a4a4aef73cd45b8c3dbe2cac251b3c389ff582c6
-  data.tar.gz: 093b08812f08bea5649e6a8decd5f6da5cddf7aed82a4d7d1dc248e3b0e49a907e5888fef821c1debf4bd74973eba35f274efa7f7aa685daeea3cdde4c623a5d
+  metadata.gz: 60aaebb3b18e13ede7385c6979081b0a118d2c2d5c1efb78f67d71b44ef77c84cd8f66e1f61da2618b767884f66a92ad8589ad90f7379cd22e8ab1d68f5a8942
+  data.tar.gz: 40bc19b32d599b8c5c51f38b37a94e0883526a13ab1c9c7ebd689ab1e252de3cd60e0f189b03dd5697aa2f14307d160a75064db0a71ac604e2283a64f08a2017

data/Gemfile

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

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014 4urbanoff
+Copyright (c) 2015 4urbanoff
 
 MIT License
 

data/README.md

@@ -1 +1,107 @@
-Diffing two strings
+# Diffing
+
+## Installation
+
+```
+sudo gem install differ
+```
+
+## Usage
+
+```ruby
+require 'diffing'
+
+from = "Hello! I am string for diffing test"
+to   = "Hi! I am two string for diffing"
+```
+
+#### By chars
+```ruby
+diff = Diffing.by_chars( from, to )
+
+diff.as_ascii
+# => H{"ello" >> "i"}! I am{+" two"} string for diffing{-" test"}
+diff.as_html
+# => H<del>ello</del><ins>i</ins>! I am<ins> two</ins> string for diffing<del> test</del>
+```
+
+#### By words
+```ruby
+diff = Diffing.by_words( from, to )
+
+diff.as_ascii
+# => {"Hello!" >> "Hi!"} I am {+"two"} string for diffing {-"test"}
+diff.as_html
+# => <del>Hello!</del><ins>Hi!</ins> I am <ins>two</ins> string for diffing <del>test</del>
+```
+
+#### By lines
+```ruby
+diff = Diffing.by_lines( from, to )
+
+diff.as_ascii
+# => {"Hello! I am string for diffing test" >> "Hi! I am two string for diffing"}
+diff.as_html
+# => <del>Hello! I am string for diffing test</del><ins>Hi! I am two string for diffing</ins>
+```
+
+## Custom format
+
+```ruby
+module CustomFormat
+  class << self
+
+    def source( value )
+      value
+    end
+
+    def insert( value )
+      "(++#{ value })"
+    end
+
+    def delete( value )
+      "(--#{ value })"
+    end
+
+    def replace( from, to )
+      "(#{ from } => #{ to })"
+    end
+
+  end
+end
+
+
+Diffing.by_chars.format( CustomFormat )
+# => H(ello => i)! I am(++ two) string for diffing(-- test)
+Diffing.by_words.format( CustomFormat )
+# => (Hello! => Hi!) I am (++two) string for diffing (--test)
+Diffing.by_lines.format( CustomFormat )
+# => (Hello! I am string for diffing test => Hi! I am two string for diffing)
+
+```
+
+## Custom delimiter
+
+```ruby
+Diffing::Diff.new( from, to, 'i' ).as_ascii
+# => {"Hello! I am str" >> "Hi! I am two str"}ing for diffi{"ng test" >> "ng"}
+```
+
+## Custom use separated parts
+
+```ruby
+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
+  
+}.join( '' )
+# => <insert:Hi!><delete:Hello!><source:I am><insert:two><source:string for diffing><delete:test>
+```
+
+## Copyright
+
+Copyright © 2015 Denis Churbanov

data/lib/diffing.rb

@@ -1,12 +1,13 @@
 require 'diffing/diff'
 require 'diffing/part'
 require 'diffing/formats/ascii'
+require 'diffing/formats/html'
 
 
 module Diffing
 
   class << self
-
+
 
     def by_lines( from, to )
       Diff.new from, to, "\n"
@@ -19,7 +20,7 @@ module Diffing
     def by_chars( from, to )
       Diff.new from, to
     end
-
+
 
   end
 

data/lib/diffing/diff.rb

@@ -1,101 +1,104 @@
-module Diffing
-
-  class Diff
-
-
-    attr_reader :parts
-
-    def initialize( from, to, delimiter = '' )
-      @delimiter = delimiter
-      @parts = calcucate( split( from.to_s ), split( to.to_s ) ).flatten
-    end
-
-    def format( format = Format::Ascii )
-      result = []
-      @parts.each do |part|
-        result << format.source( part.source ) if part.source?
-        if part.replace? and format.respond_to?( :replace )
-          result << format.replace( part.delete, part.insert )
-        else
-          result << format.insert( part.insert ) if part.insert?
-          result << format.delete( part.delete ) if part.delete?
-        end
-      end
-      result.join @delimiter
-    end
-
-    def to_s
-      format
-    end
-
-    def inspect
-      format
-    end
-
-
-    private
-
-    def calcucate( 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 ) ]
-      else
-        [ Part.new( insert: join( to ), delete: join( from ) ) ]
-      end
-    end
-
-    def find_middle( from, to, min = 0, max = nil )
-
-      return nil if from.empty? or to.empty?
-
-      max  = from.size unless max
-      size = min + ( ( max - min ) / 2.to_f ).round
-
-      subsets_each( from, size ) do |subset, first, last|
-
-        if found = find_middle_index( to, subset )
-
-          return (
-            size != min and find_middle( from, to, size, max ) or
-            (
-              from_l = from[ 0...first ]
-              to_l   = to[ 0...found ]
-              from_r = from[ last...from.size ]
-              to_r   = to[ found + subset.size...to.size ]
-              [ from_l, to_l, subset, from_r, to_r ]
-            )
-          )
-
-        end
-
-      end
-
-      size != max and find_middle( from, to, min, size ) or nil
-
-    end
-
-    def find_middle_index( set, search_subset )
-      return set.index( search_subset ) if @delimiter == ''
-      subsets_each( set, search_subset.size ){ |subset, first, last| return first if subset == search_subset }
-      nil
-    end
-
-    def subsets_each( from, size )
-      ( from.size - size + 1 ).times do |first|
-        last     = first + size
-        subset = from[ first...last ]
-        yield subset, first, last
-      end
-    end
-
-    def split( set )
-      @delimiter == '' ? set : set.split( @delimiter )
-    end
-
-    def join( set )
-      @delimiter == '' ? set : set.join( @delimiter )
-    end
-
-  end
-
-end
+module Diffing
+
+  class Diff
+
+
+    attr_reader :parts
+
+    def initialize( from, to, delimiter = '' )
+      @delimiter = delimiter
+      @parts = calcucate( 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?
+        if part.replace? and format.respond_to?( :replace )
+          result << format.replace( part.delete, part.insert )
+        else
+          result << format.insert( part.insert ) if part.insert?
+          result << format.delete( part.delete ) if part.delete?
+        end
+      end
+      result.join @delimiter
+    end
+
+    def as_ascii
+      format Format::Ascii
+    end
+
+    def as_html
+      format Format::Html
+    end
+
+    alias :to_s    :as_ascii
+    alias :inspect :as_ascii
+
+
+    private
+
+    def calcucate( 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 ) ]
+      else
+        [ Part.new( insert: join( to ), delete: join( from ) ) ]
+      end
+    end
+
+    def find_middle( from, to, min = 0, max = nil )
+
+      return nil if from.empty? or to.empty?
+
+      max  = from.size unless max
+      size = min + ( ( max - min ) / 2.to_f ).round
+
+      subsets_each( from, size ) do |subset, first, last|
+
+        if found = find_middle_index( to, subset )
+
+          return (
+            size != min and find_middle( from, to, size, max ) or
+            (
+              from_l = from[ 0...first ]
+              to_l   = to[ 0...found ]
+              from_r = from[ last...from.size ]
+              to_r   = to[ found + subset.size...to.size ]
+              [ from_l, to_l, subset, from_r, to_r ]
+            )
+          )
+
+        end
+
+      end
+
+      size != max and find_middle( from, to, min, size ) or nil
+
+    end
+
+    def find_middle_index( set, search_subset )
+      return set.index( search_subset ) if @delimiter == ''
+      subsets_each( set, search_subset.size ){ |subset, first, last| return first if subset == search_subset }
+      nil
+    end
+
+    def subsets_each( from, size )
+      ( from.size - size + 1 ).times do |first|
+        last     = first + size
+        subset = from[ first...last ]
+        yield subset, first, last
+      end
+    end
+
+    def split( set )
+      @delimiter == '' ? set : set.split( @delimiter )
+    end
+
+    def join( set )
+      @delimiter == '' ? set : set.join( @delimiter )
+    end
+
+  end
+
+end

data/lib/diffing/formats/ascii.rb

@@ -1,33 +1,33 @@
-module Diffing
-
-  module Format
-
-    module Ascii
-
-      class << self
-
-
-        def source( value )
-          value
-        end
-
-        def insert( value )
-          "{+\"#{ value }\"}"
-        end
-
-        def delete( value )
-          "{-\"#{ value }\"}"
-        end
-
-        def replace( from, to )
-          "{\"#{ from }\" >> \"#{ to }\"}"
-        end
-
-
-      end
-
-    end
-
-  end
-
-end
+module Diffing
+
+  module Format
+
+    module Ascii
+
+      class << self
+
+
+        def source( value )
+          value
+        end
+
+        def insert( value )
+          "{+\"#{ value }\"}"
+        end
+
+        def delete( value )
+          "{-\"#{ value }\"}"
+        end
+
+        def replace( from, to )
+          "{\"#{ from }\" >> \"#{ to }\"}"
+        end
+
+
+      end
+
+    end
+
+  end
+
+end

data/lib/diffing/formats/html.rb

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

data/lib/diffing/part.rb

@@ -1,31 +1,31 @@
-module Diffing
-
-
-  class Part
-
-    attr_reader :source, :insert, :delete
-
-    def initialize( source: '', insert: '', delete: '' )
-      @source, @insert, @delete = source, insert, delete
-    end
-
-    def source?
-      not @source.empty?
-    end
-
-    def insert?
-      not @insert.empty?
-    end
-
-    def delete?
-      not @delete.empty?
-    end
-
-    def replace?
-      not @insert.empty? and not @delete.empty?
-    end
-
-  end
-
-
-end
+module Diffing
+
+
+  class Part
+
+    attr_reader :source, :insert, :delete
+
+    def initialize( source: '', insert: '', delete: '' )
+      @source, @insert, @delete = source, insert, delete
+    end
+
+    def source?
+      not @source.empty?
+    end
+
+    def insert?
+      not @insert.empty?
+    end
+
+    def delete?
+      not @delete.empty?
+    end
+
+    def replace?
+      not @insert.empty? and not @delete.empty?
+    end
+
+  end
+
+
+end

metadata

@@ -1,24 +1,24 @@
 --- !ruby/object:Gem::Specification
 name: diffing
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
-- 4urbanoff
+- Denis Churbanov
 autorequire: 
 bindir: bin
 cert_chain: []
 date: 2015-08-04 00:00:00.000000000 Z
 dependencies: []
-description: Diffing two strings
-email:
-- 4urbanoff@gmail.com
+description: Diffing of two strings
+email: 4urbanoff@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/diffing/diff.rb
 - lib/diffing/formats/ascii.rb
+- lib/diffing/formats/html.rb
 - lib/diffing/part.rb
 - lib/diffing.rb
 - LICENSE.txt
@@ -48,5 +48,5 @@ rubyforge_project:
 rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
-summary: ''
+summary: Gem for calculating two strings difference
 test_files: []