daff 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 469baec08599142e1445a291410b340d9b621c52
-  data.tar.gz: f9781651f9ca2650d61a1ba5632b2e8e40543b1a
+  metadata.gz: f83e7c531044c8304fe471789f88f1a25ccc3618
+  data.tar.gz: a131ce2c9f90a56e11c1cf7f0f7cf7216db7668a
 SHA512:
-  metadata.gz: cfc0aa8b457f18094e9d8ed4c9835fee504ecc9875949a4c5e74057821eae741941bf98a75c9c295b520a2f22b1add61dd5099d63f900894bbe63c31cde47888
-  data.tar.gz: 5a510890fe93b6b2d7c771524fe25f811f48a3addb377f97f565aa1f6507caa4069b09900c32c6c26c4242bf83b80dea94d47685472f53f733e44eecdf9333a4
+  metadata.gz: 3125f64b0ebf44d43e3fa7fa68223d093803842e360680720a7fbdba7a250f872b4e906ce8adc8265abec8e5072608da4e330a3d95653581f00ff394232046f4
+  data.tar.gz: 3ddd77a33fd57de5db60e056a9b269e07f3294e5a670d9ee5334d14e78bc75c1cff10dd867e768795217262091ebc6f04d1571a6c9003b882edfb7ce96ead4e1

data/lib/lib/coopy/compare_flags.rb

@@ -24,6 +24,7 @@ module Coopy
       @tables = nil
       @parent = nil
       @count_like_a_spreadsheet = true
+      @ignore_whitespace = false
     end
     
     attr_accessor :ordered
@@ -45,6 +46,7 @@ module Coopy
     attr_accessor :show_unchanged_meta
     attr_accessor :parent
     attr_accessor :count_like_a_spreadsheet
+    attr_accessor :ignore_whitespace
     
     def filter(act,allow)
       if @acts == nil 

data/lib/lib/coopy/compare_table.rb

@@ -121,7 +121,7 @@ module Coopy
       used = {}
       used_reverse = {}
       if ids != nil 
-        index_top = ::Coopy::IndexPair.new
+        index_top = ::Coopy::IndexPair.new(@comp.compare_flags)
         ids_as_map = {}
         begin
           _g2 = 0
@@ -260,7 +260,7 @@ module Coopy
               kk >>= 1
               at+=1
             end
-            index = ::Coopy::IndexPair.new
+            index = ::Coopy::IndexPair.new(@comp.compare_flags)
             begin
               _g23 = 0
               _g13 = active_columns.length

data/lib/lib/coopy/coopy.rb

@@ -499,6 +499,11 @@ module Coopy
               @flags.add_table(args[i + 1])
               args.slice!(i,2)
               break
+            elsif tag == "-w" || tag == "--ignore-whitespace" 
+              more = true
+              @flags.ignore_whitespace = true
+              args.slice!(i,1)
+              break
             end
           end
         end
@@ -567,6 +572,7 @@ module Coopy
         io.write_stderr("     --output-format [csv|tsv|ssv|json|copy|html]: set format for output\n")
         io.write_stderr("     --table NAME:  compare the named table, used with SQL sources\n")
         io.write_stderr("     --unordered:   assume row order is meaningless (default for json formats)\n")
+        io.write_stderr("     -w / --ignore-whitespace: ignore changes in leading/trailing whitespace\n")
         io.write_stderr("\n")
         io.write_stderr("  daff render [--output OUTPUT.html] [--css CSS.css] [--fragment] [--plain] diff.csv\n")
         io.write_stderr("     --css CSS.css: generate a suitable css file to go with the html\n")
@@ -685,7 +691,7 @@ module Coopy
     class << self
     attr_accessor :version
     end
-    @version = "1.3.1"
+    @version = "1.3.2"
     
     def Coopy.diff_as_html(local,remote,flags = nil)
       o = ::Coopy::Coopy.diff(local,remote,flags)
@@ -743,9 +749,9 @@ module Coopy
       st = ::Coopy::SimpleTable.new(1,1)
       v = ::Coopy::Viterbi.new
       td = ::Coopy::TableDiff.new(nil,nil)
-      idx = ::Coopy::Index.new
-      dr = ::Coopy::DiffRender.new
       cf = ::Coopy::CompareFlags.new
+      idx = ::Coopy::Index.new(cf)
+      dr = ::Coopy::DiffRender.new
       hp = ::Coopy::HighlightPatch.new(nil,nil)
       csv = ::Coopy::Csv.new
       tm = ::Coopy::TableModifier.new(nil)

data/lib/lib/coopy/index.rb

@@ -4,13 +4,15 @@
 module Coopy
   class Index 
     
-    def initialize
+    def initialize(flags)
       @items = {}
       @cols = Array.new
       @keys = Array.new
       @top_freq = 0
       @height = 0
       @hdr = 0
+      @ignore_whitespace = false
+      @ignore_whitespace = flags.ignore_whitespace if flags != nil
     end
     
     attr_accessor :items
@@ -24,6 +26,7 @@ module Coopy
     attr_accessor :v
     attr_accessor :indexed_table
     attr_accessor :hdr
+    attr_accessor :ignore_whitespace
     
     public
     
@@ -79,6 +82,7 @@ module Coopy
           _g1+=1
           d = t.get_cell(@cols[k],i)
           txt = @v.to_s(d)
+          txt = txt.strip if @ignore_whitespace
           wide += " // " if k > 0
           next if txt == nil || txt == "" || txt == "null" || txt == "undefined"
           wide += txt
@@ -101,6 +105,7 @@ module Coopy
           k = _g1
           _g1+=1
           txt = row.get_row_string(@cols[k])
+          txt = txt.strip if @ignore_whitespace
           wide += " // " if k > 0
           next if txt == nil || txt == "" || txt == "null" || txt == "undefined"
           wide += txt

data/lib/lib/coopy/index_pair.rb

@@ -4,9 +4,10 @@
 module Coopy
   class IndexPair 
     
-    def initialize
-      @ia = ::Coopy::Index.new
-      @ib = ::Coopy::Index.new
+    def initialize(flags)
+      @flags = flags
+      @ia = ::Coopy::Index.new(flags)
+      @ib = ::Coopy::Index.new(flags)
       @quality = 0
       @hdr = 0
     end
@@ -17,6 +18,7 @@ module Coopy
     attr_accessor :ib
     attr_accessor :hdr
     attr_accessor :quality
+    attr_accessor :flags
     
     public
     

data/lib/lib/coopy/table_diff.rb

@@ -743,6 +743,13 @@ module Coopy
       end
     end
     
+    def is_equal(v,aa,bb)
+      return lambda{|_this_| s = v.to_s(aa)
+      _r = s.strip}.call(self) == lambda{|_this_| s1 = v.to_s(bb)
+      _r2 = s1.strip}.call(self) if @flags.ignore_whitespace
+      v.equals(aa,bb)
+    end
+    
     def scan_row(unit,output,at,i)
       begin
         _g1 = 0
@@ -784,14 +791,14 @@ module Coopy
           if have_pp 
             if !have_rr 
               dd = pp
-            elsif @v.equals(pp,rr) 
+            elsif self.is_equal(@v,pp,rr) 
               dd = ll
             else 
               dd = pp
               dd_to = rr
               have_dd_to = true
-              if !@v.equals(pp,ll) 
-                if !@v.equals(pp,rr) 
+              if !self.is_equal(@v,pp,ll) 
+                if !self.is_equal(@v,pp,rr) 
                   dd_to_alt = ll
                   have_dd_to_alt = true
                 end
@@ -800,7 +807,7 @@ module Coopy
           elsif have_ll 
             if !have_rr 
               dd = ll
-            elsif @v.equals(ll,rr) 
+            elsif self.is_equal(@v,ll,rr) 
               dd = ll
             else 
               dd = ll
@@ -823,7 +830,7 @@ module Coopy
             end
             is_conflict = false
             if have_dd_to_alt 
-              is_conflict = true if !@v.equals(dd_to,dd_to_alt)
+              is_conflict = true if !self.is_equal(@v,dd_to,dd_to_alt)
             end
             if !is_conflict 
               cell = @builder.update(dd,dd_to)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daff
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - James Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-18 00:00:00.000000000 Z
+date: 2015-09-22 00:00:00.000000000 Z
 dependencies: []
 description: Diff and patch tables
 email: