daff 1.2.1 → 1.2.3

data/README.md

@@ -18,7 +18,7 @@ For a live demo, see:
 Install the library for your favorite language:
 ````sh
 npm install daff -g  # node/javascript
-pip3 install daff    # python3
+pip install daff     # python
 gem install daff     # ruby
 composer require paulfitz/daff-php  # php
 ````

data/lib/lib/coopy/coopy.rb

@@ -545,7 +545,7 @@ module Coopy
     class << self
     attr_accessor :version
     end
-    @version = "1.2.1"
+    @version = "1.2.3"
     
     def Coopy.compare_tables(local,remote,flags = nil)
       comp = ::Coopy::TableComparisonState.new

data/lib/lib/coopy/index.rb

@@ -39,7 +39,10 @@ module Coopy
           i = _g1
           _g1+=1
           key = @keys[i]
-          @keys[i] = key = self.to_key(t,i) if key == nil
+          if key == nil 
+            key = self.to_key(t,i)
+            @keys[i] = key
+          end
           item = @items[key]
           if item == nil 
             item = ::Coopy::IndexItem.new

data/lib/lib/coopy/table_diff.rb

@@ -264,7 +264,8 @@ module Coopy
         a = @align.get_source
         b = @align.get_target
         p = a
-        rp_header = ra_header = @align.meta.get_source_header
+        ra_header = @align.meta.get_source_header
+        rp_header = ra_header
         rb_header = @align.meta.get_target_header
         if @align.get_index_columns != nil 
           _g3 = 0

data/lib/lib/coopy/terminal_diff_render.rb

@@ -5,25 +5,42 @@ module Coopy
   class TerminalDiffRender 
     
     def initialize
+      @align_columns = true
+    end
+    
+    protected
+    
+    attr_accessor :codes
+    attr_accessor :tt
+    attr_accessor :csv
+    attr_accessor :v
+    attr_accessor :align_columns
+    
+    public
+    
+    def align_columns(enable)
+      @align_columns = enable
     end
     
     def render(t)
-      csv = ::Coopy::Csv.new
+      @csv = ::Coopy::Csv.new
       result = ""
       w = t.get_width
       h = t.get_height
       txt = ""
-      v = t.get_cell_view
-      tt = ::Coopy::TableText.new(t)
-      codes = {}
-      codes["header"] = "\x1B[0;1m"
-      codes["spec"] = "\x1B[35;1m"
-      codes["add"] = "\x1B[32;1m"
-      codes["conflict"] = "\x1B[33;1m"
-      codes["modify"] = "\x1B[34;1m"
-      codes["remove"] = "\x1B[31;1m"
-      codes["minor"] = "\x1B[2m"
-      codes["done"] = "\x1B[0m"
+      @v = t.get_cell_view
+      @tt = ::Coopy::TableText.new(t)
+      @codes = {}
+      @codes["header"] = "\x1B[0;1m"
+      @codes["spec"] = "\x1B[35;1m"
+      @codes["add"] = "\x1B[32;1m"
+      @codes["conflict"] = "\x1B[33;1m"
+      @codes["modify"] = "\x1B[34;1m"
+      @codes["remove"] = "\x1B[31;1m"
+      @codes["minor"] = "\x1B[2m"
+      @codes["done"] = "\x1B[0m"
+      sizes = nil
+      sizes = self.pick_sizes(t) if @align_columns
       begin
         _g = 0
         while(_g < h) 
@@ -34,34 +51,120 @@ module Coopy
             while(_g1 < w) 
               x = _g1
               _g1+=1
-              txt += _hx_str(codes["minor"]) + "," + _hx_str(codes["done"]) if x > 0
-              val = tt.get_cell_text(x,y)
-              val = "" if val == nil
-              cell = ::Coopy::DiffRender.render_cell(tt,x,y)
-              code = nil
-              code = codes[cell.category] if cell.category != nil
-              if cell.category_given_tr != nil 
-                code_tr = codes[cell.category_given_tr]
-                code = code_tr if code_tr != nil
-              end
-              if code != nil 
-                if cell.rvalue != nil 
-                  val = _hx_str(codes["remove"]) + _hx_str(cell.lvalue) + _hx_str(codes["modify"]) + _hx_str(cell.pretty_separator) + _hx_str(codes["add"]) + _hx_str(cell.rvalue) + _hx_str(codes["done"])
-                  val = _hx_str(codes["conflict"]) + _hx_str(cell.pvalue) + _hx_str(codes["modify"]) + _hx_str(cell.pretty_separator) + _hx_str(val) if cell.pvalue != nil
-                else 
-                  val = cell.pretty_value
-                  val = _hx_str(code) + _hx_str(val) + _hx_str(codes["done"])
+              txt += _hx_str(@codes["minor"]) + "," + _hx_str(@codes["done"]) if x > 0
+              txt += self.get_text(x,y,true)
+              if sizes != nil 
+                bit = self.get_text(x,y,false)
+                begin
+                  _g3 = 0
+                  _g2 = sizes[x] - bit.length
+                  while(_g3 < _g2) 
+                    i = _g3
+                    _g3+=1
+                    txt += " "
+                  end
                 end
               end
-              txt += csv.render_cell(v,val)
             end
           end
           txt += "\r\n"
         end
       end
+      @tt = nil
+      @csv = nil
+      @codes = nil
       return txt
     end
     
+    protected
+    
+    def get_text(x,y,color)
+      val = @tt.get_cell_text(x,y)
+      val = "" if val == nil
+      cell = ::Coopy::DiffRender.render_cell(@tt,x,y)
+      if color 
+        code = nil
+        code = @codes[cell.category] if cell.category != nil
+        if cell.category_given_tr != nil 
+          code_tr = @codes[cell.category_given_tr]
+          code = code_tr if code_tr != nil
+        end
+        if code != nil 
+          if cell.rvalue != nil 
+            val = _hx_str(@codes["remove"]) + _hx_str(cell.lvalue) + _hx_str(@codes["modify"]) + _hx_str(cell.pretty_separator) + _hx_str(@codes["add"]) + _hx_str(cell.rvalue) + _hx_str(@codes["done"])
+            val = _hx_str(@codes["conflict"]) + _hx_str(cell.pvalue) + _hx_str(@codes["modify"]) + _hx_str(cell.pretty_separator) + _hx_str(val) if cell.pvalue != nil
+          else 
+            val = cell.pretty_value
+            val = _hx_str(code) + _hx_str(val) + _hx_str(@codes["done"])
+          end
+        end
+      else 
+        val = cell.pretty_value
+      end
+      return @csv.render_cell(@v,val)
+    end
+    
+    def pick_sizes(t)
+      w = t.get_width
+      h = t.get_height
+      v = t.get_cell_view
+      tt = ::Coopy::TableText.new(t)
+      csv = ::Coopy::Csv.new
+      sizes = Array.new
+      row = -1
+      total = w - 1
+      begin
+        _g = 0
+        while(_g < w) 
+          x = _g
+          _g+=1
+          m = 0
+          m2 = 0
+          mmax = 0
+          mmostmax = 0
+          mmin = -1
+          begin
+            _g1 = 0
+            while(_g1 < h) 
+              y = _g1
+              _g1+=1
+              txt = self.get_text(x,y,false)
+              row = y if txt == "@@" && row == -1
+              len = txt.length
+              mmin = len if y == row
+              m += len
+              m2 += len * len
+              mmax = len if len > mmax
+            end
+          end
+          mean = m / h
+          stddev = Math.sqrt(m2 / h - mean * mean)
+          most = (mean + stddev * 2 + 0.5).to_i
+          begin
+            _g11 = 0
+            while(_g11 < h) 
+              y1 = _g11
+              _g11+=1
+              txt1 = self.get_text(x,y1,false)
+              len1 = txt1.length
+              if len1 <= most 
+                mmostmax = len1 if len1 > mmostmax
+              end
+            end
+          end
+          full = mmax
+          most = mmostmax
+          if mmin != -1 
+            most = mmin if most < mmin
+          end
+          sizes.push(most)
+          total += most
+        end
+      end
+      return nil if total > 130
+      return sizes
+    end
+    
   haxe_me
   end
 

data/lib/lib/math.rb

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+# This space left blank
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daff
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-28 00:00:00.000000000 Z
+date: 2014-10-30 00:00:00.000000000 Z
 dependencies: []
 description: Diff and patch tables
 email:
@@ -62,6 +62,7 @@ files:
 - lib/lib/coopy/sparse_sheet.rb
 - lib/lib/coopy/table.rb
 - lib/lib/coopy/viterbi.rb
+- lib/lib/math.rb
 - lib/lib/list.rb
 - lib/lib/sys/io/hx_file.rb
 - lib/lib/sys/io/file_output.rb
@@ -117,7 +118,7 @@ summary: ! '[![Build Status](https://travis-ci.org/paulfitz/daff.svg?branch=mast
   for comparing tables that share a common origin, in other words multiple versions
   of the "same" table.  For a live demo, see: > http://paulfitz.github.com/daff/  Install
   the library for your favorite language: ````sh npm install daff -g  # node/javascript
-  pip3 install daff    # python3 gem install daff     # ruby composer require paulfitz/daff-php  #
+  pip install daff     # python gem install daff     # ruby composer require paulfitz/daff-php  #
   php ````  Other translations are available here: > https://github.com/paulfitz/daff/releases  Or
   use the library to view csv diffs on github via a chrome extension: > https://github.com/theodi/csvhub  The
   diff format used by `daff` is specified here: > http://dataprotocols.org/tabular-diff-format/  This