daff 1.3.2 → 1.3.6

data/lib/lib/coopy/terminal_diff_render.rb

@@ -4,8 +4,14 @@
 module Coopy
   class TerminalDiffRender 
     
-    def initialize
+    def initialize(flags = nil)
       @align_columns = true
+      @wide_columns = false
+      @flags = flags
+      if flags != nil 
+        @align_columns = false if flags.padding_strategy == "dense"
+        @wide_columns = true if flags.padding_strategy == "sparse"
+      end
     end
     
     protected
@@ -15,6 +21,8 @@ module Coopy
     attr_accessor :csv
     attr_accessor :v
     attr_accessor :align_columns
+    attr_accessor :wide_columns
+    attr_accessor :flags
     
     public
     
@@ -47,25 +55,32 @@ module Coopy
         while(_g < h) 
           y = _g
           _g+=1
+          target = 0
+          at = 0
           begin
             _g1 = 0
             while(_g1 < w) 
               x = _g1
               _g1+=1
               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)
+                spaces = target - at
                 begin
-                  _g3 = 0
-                  _g2 = sizes[x] - bit.length
-                  while(_g3 < _g2) 
-                    i = _g3
-                    _g3+=1
+                  _g2 = 0
+                  while(_g2 < spaces) 
+                    i = _g2
+                    _g2+=1
                     txt += " "
+                    at+=1
                   end
                 end
               end
+              txt += self.get_text(x,y,true)
+              if sizes != nil 
+                bit = self.get_text(x,y,false)
+                at += bit.length
+                target += sizes[x]
+              end
             end
           end
           txt += "\r\n"
@@ -157,6 +172,7 @@ module Coopy
           if mmin != -1 
             most = mmin if most < mmin
           end
+          most = full if @wide_columns
           sizes.push(most)
           total += most
         end

data/lib/lib/coopy/view.rb

@@ -11,6 +11,9 @@ module Coopy
     def isHash(h) puts "Abstract View.isHash called" end
     def hashExists(h,str) puts "Abstract View.hashExists called" end
     def hashGet(h,str) puts "Abstract View.hashGet called" end
+    def isTable(t) puts "Abstract View.isTable called" end
+    def getTable(t) puts "Abstract View.getTable called" end
+    def wrapTable(t) puts "Abstract View.wrapTable called" end
   haxe_me ["coopy", "View"]
   end
 

data/lib/lib/rb/boot.rb

@@ -14,6 +14,25 @@ module Rb
       end
     end
     
+    public
+    
+    def Boot.__instanceof(o,cl)
+      return false if cl == nil
+      if cl == Fixnum 
+        return o.is_a? Fixnum
+      elsif cl == Float 
+        return o.is_a?(Float) || o.is_a?(Fixnum)
+      elsif cl == TrueClass 
+        return ((o.is_a? TrueClass)||(o.is_a? FalseClass))
+      elsif cl == String 
+        return o.is_a? String
+      else 
+        return true if cl == Object
+        return false if o == nil
+        return o.is_a?(cl)
+      end
+    end
+    
   haxe_me ["rb", "Boot"]
   end
 

data/lib/lib/reflect.rb

@@ -26,6 +26,16 @@
       f.respond_to?("call")
     end
     
+    def Reflect.compare(a,b)
+      if a == b 
+        return 0
+      elsif a > b 
+        return 1
+      else 
+        return -1
+      end
+    end
+    
   haxe_me ["Reflect"]
   end
 

data/lib/lib/std.rb

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+  class Std 
+    
+    def Std._is(v,t)
+      ::Rb::Boot.__instanceof(v,t)
+    end
+    
+  haxe_me ["Std"]
+  end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daff
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.6
 platform: ruby
 authors:
 - James Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-22 00:00:00.000000000 Z
+date: 2015-11-05 00:00:00.000000000 Z
 dependencies: []
 description: Diff and patch tables
 email:
@@ -27,6 +27,9 @@ files:
 - lib/lib/coopy/cell_builder.rb
 - lib/lib/coopy/cell_info.rb
 - lib/lib/coopy/column_change.rb
+- lib/lib/coopy/combined_table.rb
+- lib/lib/coopy/combined_table_body.rb
+- lib/lib/coopy/combined_table_head.rb
 - lib/lib/coopy/compare_flags.rb
 - lib/lib/coopy/compare_table.rb
 - lib/lib/coopy/coopy.rb
@@ -39,6 +42,8 @@ files:
 - lib/lib/coopy/index.rb
 - lib/lib/coopy/index_item.rb
 - lib/lib/coopy/index_pair.rb
+- lib/lib/coopy/json_table.rb
+- lib/lib/coopy/json_tables.rb
 - lib/lib/coopy/merger.rb
 - lib/lib/coopy/meta.rb
 - lib/lib/coopy/mover.rb
@@ -49,6 +54,7 @@ files:
 - lib/lib/coopy/row.rb
 - lib/lib/coopy/row_change.rb
 - lib/lib/coopy/row_stream.rb
+- lib/lib/coopy/simple_meta.rb
 - lib/lib/coopy/simple_table.rb
 - lib/lib/coopy/simple_view.rb
 - lib/lib/coopy/sparse_sheet.rb
@@ -58,6 +64,7 @@ files:
 - lib/lib/coopy/sql_helper.rb
 - lib/lib/coopy/sql_table.rb
 - lib/lib/coopy/sql_table_name.rb
+- lib/lib/coopy/sql_tables.rb
 - lib/lib/coopy/sqlite_helper.rb
 - lib/lib/coopy/table.rb
 - lib/lib/coopy/table_comparison_state.rb
@@ -65,6 +72,7 @@ files:
 - lib/lib/coopy/table_io.rb
 - lib/lib/coopy/table_modifier.rb
 - lib/lib/coopy/table_stream.rb
+- lib/lib/coopy/tables.rb
 - lib/lib/coopy/terminal_diff_render.rb
 - lib/lib/coopy/unit.rb
 - lib/lib/coopy/view.rb
@@ -86,6 +94,7 @@ files:
 - lib/lib/rb/boot.rb
 - lib/lib/rb/ruby_iterator.rb
 - lib/lib/reflect.rb
+- lib/lib/std.rb
 - lib/lib/string_buf.rb
 - lib/lib/sys/io/file_handle.rb
 - lib/lib/sys/io/file_output.rb
@@ -121,16 +130,17 @@ summary: '[![Build Status](https://travis-ci.org/paulfitz/daff.svg?branch=master
   [![Gem Version](https://badge.fury.io/rb/daff.svg)](http://badge.fury.io/rb/daff)
   [![PyPI version](https://badge.fury.io/py/daff.svg)](http://badge.fury.io/py/daff)
   [![PHP version](https://badge.fury.io/ph/paulfitz%2Fdaff-php.svg)](http://badge.fury.io/ph/paulfitz%2Fdaff-php)
-  [![tips](https://img.shields.io/gratipay/paulfitz.svg)](https://gratipay.com/paulfitz/)  daff:
-  data diff ===============  This is a library for comparing tables, producing a summary
-  of their differences, and using such a summary as a patch file.  It is optimized
-  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
-  pip install daff     # python gem install daff     # ruby composer require paulfitz/daff-php  #
-  php install.packages(''daff'') # R wrapper by Edwin de Jonge ````  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
+  [![Bower version](https://badge.fury.io/bo/daff.svg)](http://badge.fury.io/bo/daff)
+  ![Badge count](http://img.shields.io/:badges-7/7-33aa33.svg)  daff: data diff ===============  This
+  is a library for comparing tables, producing a summary of their differences, and
+  using such a summary as a patch file.  It is optimized 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 pip install daff     #
+  python gem install daff     # ruby composer require paulfitz/daff-php  # php install.packages(''daff'')
+  # R wrapper by Edwin de Jonge bower install daff   # web/javascript ````  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
   library is a stripped down version of the coopy toolbox (see http://share.find.coop).  To
   compare tables from different origins,  or with automatically generated IDs, or
@@ -201,10 +211,11 @@ summary: '[![Build Status](https://travis-ci.org/paulfitz/daff.svg?branch=master
   and http://cran.r-project.org/web/packages/daff * There''s a hand-written ruby port
   by [James Smith](https://github.com/Floppy), see https://github.com/theodi/coopy-ruby  API
   documentation -----------------  * You can browse the `daff` classes at http://paulfitz.github.io/daff-doc/  Sponsors
-  --------  The [Data Commons Co-op](http://datacommons.coop),  "perhaps the geekiest
-  of all cooperative organizations on the planet," has given great moral support during
-  the initial development of `daff`. There''s currently no financial support for `daff`.
-  You could change that! [![tips](https://img.shields.io/gratipay/paulfitz.svg)](https://gratipay.com/paulfitz/)  Reading
+  --------  <img src="http://datacommons.coop/images/the_zen_of_venn.png" alt="the
+  zen of venn" height="100"> The [Data Commons Co-op](http://datacommons.coop),  "perhaps
+  the geekiest of all cooperative organizations on the planet," has given great moral
+  support during the development of `daff`. Donate a multiple of `42.42` in your currency
+  to let them know you care: [http://datacommons.coop/donate/](http://datacommons.coop/donate/)  Reading
   material ----------------  * http://dataprotocols.org/tabular-diff-format/ : a specification
   of the diff format we use. * http://theodi.org/blog/csvhub-github-diffs-for-csv-files
   : using this library with github. * https://github.com/ropensci/unconf/issues/19