diffing 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00a7b9d972e0846119c0771badcf7f95b7caf1d3
-  data.tar.gz: 5174c797bcb153d30fb75e1caa22cb909e0d0736
+  metadata.gz: 2a9db88ed0327a83b434f94b73fa9a425d14dbe8
+  data.tar.gz: 071b087aa7c10b65a685daa44a548c73176fbd88
 SHA512:
-  metadata.gz: 60aaebb3b18e13ede7385c6979081b0a118d2c2d5c1efb78f67d71b44ef77c84cd8f66e1f61da2618b767884f66a92ad8589ad90f7379cd22e8ab1d68f5a8942
-  data.tar.gz: 40bc19b32d599b8c5c51f38b37a94e0883526a13ab1c9c7ebd689ab1e252de3cd60e0f189b03dd5697aa2f14307d160a75064db0a71ac604e2283a64f08a2017
+  metadata.gz: d8e5f2ed5e39eabfa3b035bda196fe1d74d44978579aacda5354d000ebefb905fad14e0b164050990ef6b90e28e95ecb361e87f036afdef96c49c4decc831696
+  data.tar.gz: 502929c52ffc80ed63cf86b0109aeaea91e15382b224ed3aefc66741532ae0ca70e8b13b37ad6e0389b45c0198e7453bbefb7d10b0eedd427e4e4b5f5a4ea72b

data/README.md

@@ -20,7 +20,7 @@ to   = "Hi! I am two string for diffing"
 diff = Diffing.by_chars( from, to )
 
 diff.as_ascii
-# => H{"ello" >> "i"}! I am{+" two"} string for diffing{-" test"}
+# => 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>
 ```
@@ -30,9 +30,9 @@ diff.as_html
 diff = Diffing.by_words( from, to )
 
 diff.as_ascii
-# => {"Hello!" >> "Hi!"} I am {+"two"} string for diffing {-"test"}
+# => {`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>
+# => <del>Hello!</del><ins>Hi!</ins> I am<ins> two</ins> string for diffing<del> test</del>
 ```
 
 #### By lines
@@ -40,7 +40,7 @@ diff.as_html
 diff = Diffing.by_lines( from, to )
 
 diff.as_ascii
-# => {"Hello! I am string for diffing test" >> "Hi! I am two string for diffing"}
+# => {`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>
 ```
@@ -71,21 +71,15 @@ module CustomFormat
 end
 
 
-Diffing.by_chars.format( CustomFormat )
+Diffing.by_chars( from, to ).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 )
+Diffing.by_words( from, to ).format( CustomFormat )
+# => (Hello! => Hi!) I am(++ two) string for diffing(-- test)
+Diffing.by_lines( from, to ).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
 
@@ -98,10 +92,19 @@ Diffing.by_words( from, to ).parts.map { |part|
   result << "<delete:#{ part.delete }>" if part.delete?
   result
   
-}.join( '' )
-# => <insert:Hi!><delete:Hello!><source:I am><insert:two><source:string for diffing><delete:test>
+}.join 
+# => <insert:Hi!><delete:Hello!><source: I am><insert: two><source: string for diffing><delete: test>
 ```
 
+
+## Custom pattern of parts
+
+```ruby
+Diffing::Diff.new( from, to, /.{,3}\s?/ ).as_ascii
+# => {`Hello! `>>`Hi! `}I a{`m string `>>`m two string `}for diffin{`g test`>>`g`}
+```
+
+
 ## Copyright
 
 Copyright © 2015 Denis Churbanov

data/lib/diffing/diff.rb

@@ -5,36 +5,33 @@ module Diffing
 
     attr_reader :parts
 
-    def initialize( from, to, delimiter = '' )
-      @delimiter = delimiter
-      @parts = calcucate( split( from.to_s ), split( to.to_s ) ).flatten
+    def initialize( from, to, pattern = nil )
+      @pattern = pattern
+      @parts   = calcucate( split( from.to_s ), split( to.to_s ) ).flatten
     end
 
-    def format( format )
+    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
+        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?
       end
-      result.join @delimiter
+      result.join
     end
-
-    def as_ascii
-      format Format::Ascii
+
+    def as_ascii
+      format Format::Ascii
     end
-
-    def as_html
-      format Format::Html
+
+    def as_html
+      format Format::Html
     end
 
-    alias :to_s    :as_ascii
-    alias :inspect :as_ascii
-
+    alias :to_s    :as_ascii
+    alias :inspect :as_ascii
+
 
     private
 
@@ -78,7 +75,7 @@ module Diffing
     end
 
     def find_middle_index( set, search_subset )
-      return set.index( search_subset ) if @delimiter == ''
+      return set.index( search_subset ) unless @pattern
       subsets_each( set, search_subset.size ){ |subset, first, last| return first if subset == search_subset }
       nil
     end
@@ -92,11 +89,11 @@ module Diffing
     end
 
     def split( set )
-      @delimiter == '' ? set : set.split( @delimiter )
+      @pattern ? set.scan( @pattern ) : set
     end
 
     def join( set )
-      @delimiter == '' ? set : set.join( @delimiter )
+      @pattern ? set.join : set
     end
 
   end

data/lib/diffing/formats/ascii.rb

@@ -12,15 +12,15 @@ module Diffing
         end
 
         def insert( value )
-          "{+\"#{ value }\"}"
+          "{+`#{ value }`}"
         end
 
         def delete( value )
-          "{-\"#{ value }\"}"
+          "{-`#{ value }`}"
         end
 
         def replace( from, to )
-          "{\"#{ from }\" >> \"#{ to }\"}"
+          "{`#{ from }`>>`#{ to }`}"
         end
 
 

data/lib/diffing/part.rb

@@ -20,11 +20,7 @@ module Diffing
     def delete?
       not @delete.empty?
     end
-
-    def replace?
-      not @insert.empty? and not @delete.empty?
-    end
-
+
   end
 
 

data/lib/diffing.rb

@@ -9,16 +9,16 @@ module Diffing
   class << self
 
 
-    def by_lines( from, to )
-      Diff.new from, to, "\n"
+    def by_chars( from, to )
+      Diff.new from, to
     end
 
     def by_words( from, to )
-      Diff.new from, to, " "
+      Diff.new from, to, /\S+|\s+/
     end
-
-    def by_chars( from, to )
-      Diff.new from, to
+
+    def by_lines( from, to )
+      Diff.new from, to, /[^\n]+|\n+/
     end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diffing
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Denis Churbanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-04 00:00:00.000000000 Z
+date: 2015-08-05 00:00:00.000000000 Z
 dependencies: []
 description: Diffing of two strings
 email: 4urbanoff@gmail.com