daff 1.2.3 → 1.2.4

data/lib/lib/coopy/view.rb

@@ -6,6 +6,11 @@ module Coopy
     def toString(d) puts "Abstract View.toString called" end
     def equals(d1,d2) puts "Abstract View.equals called" end
     def toDatum(str) puts "Abstract View.toDatum called" end
+    def makeHash() puts "Abstract View.makeHash called" end
+    def hashSet(h,str,d) puts "Abstract View.hashSet called" end
+    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
   haxe_me
   end
 

data/lib/lib/haxe/ds/int_map.rb

@@ -8,6 +8,10 @@ module Ds
     def initialize
     end
     
+    def get(key)
+      return self[key]
+    end
+    
   haxe_me
   end
 

data/lib/lib/haxe/ds/string_map.rb

@@ -8,6 +8,10 @@ module Ds
     def initialize
     end
     
+    def get(key)
+      return self[key]
+    end
+    
   haxe_me
   end
 

data/lib/lib/haxe/format/json_parser.rb

@@ -183,7 +183,7 @@ module Format
           end
           f = nil
           begin
-            x = @str[start,@pos - start]
+            x = HxOverrides.substr(@str,start,@pos - start)
             f = x.to_f
           end
           i = f.to_i
@@ -210,7 +210,7 @@ module Format
         end
         break if c == 34
         if c == 92 
-          buf_b += @str[start,@pos - start - 1]
+          buf_b += HxOverrides.substr(@str,start,@pos - start - 1)
           begin
             index1 = @pos
             @pos+=1
@@ -232,30 +232,30 @@ module Format
           when 117
             uc = nil
             begin
-              x = "0x" + _hx_str(@str[@pos,4])
+              x = "0x" + _hx_str(HxOverrides.substr(@str,@pos,4))
               uc = x.to_i
             end
             @pos += 4
             buf_b += [uc].pack("U")
           else
-            raise "Invalid escape sequence \\" + _hx_str([c].pack("U")) + " at position " + _hx_str((@pos - 1))
+            raise hx_raise("Invalid escape sequence \\" + _hx_str([c].pack("U")) + " at position " + _hx_str((@pos - 1)))
           end
           start = @pos
         elsif c == 0 
-          raise "Unclosed string"
+          raise hx_raise("Unclosed string")
         end
       end
-      buf_b += @str[start,@pos - start - 1]
+      buf_b += HxOverrides.substr(@str,start,@pos - start - 1)
       return buf_b
     end
     
     def invalid_char 
       @pos-=1
-      raise "Invalid char " + _hx_str((@str[@pos] || 0).ord) + " at position " + _hx_str(@pos)
+      raise hx_raise("Invalid char " + _hx_str((@str[@pos] || 0).ord) + " at position " + _hx_str(@pos))
     end
     
     def invalid_number(start)
-      raise "Invalid number at position " + _hx_str(start) + ": " + _hx_str(@str[start,@pos - start])
+      raise hx_raise("Invalid number at position " + _hx_str(start) + ": " + _hx_str(HxOverrides.substr(@str,start,@pos - start)))
     end
     
   haxe_me

data/lib/lib/haxe/imap.rb

@@ -3,6 +3,7 @@
 
 module Haxe
   class IMap 
+    def get(k) puts "Abstract IMap.get called" end
   haxe_me
   end
 

data/lib/lib/haxe/io/bytes.rb

@@ -19,7 +19,7 @@ module Io
     public
     
     def get_string(pos,len)
-      raise ::Haxe::Io::Error.outside_bounds if pos < 0 || len < 0 || pos + len > @length
+      raise hx_raise(::Haxe::Io::Error.outside_bounds) if pos < 0 || len < 0 || pos + len > @length
       return @b.byteslice(pos,len)
     end
     

data/lib/lib/haxe/io/bytes_output.rb

@@ -20,7 +20,7 @@ module Io
     
     def write_bytes(buf,pos,len)
       begin
-        raise ::Haxe::Io::Error.outside_bounds if pos < 0 || len < 0 || pos + len > buf.length
+        raise hx_raise(::Haxe::Io::Error.outside_bounds) if pos < 0 || len < 0 || pos + len > buf.length
         @b.b += buf.b.byteslice(pos,len)
       end
       return len

data/lib/lib/haxe/io/error.rb

@@ -15,6 +15,7 @@ module Io
     def Error.outside_bounds() Error.new("OutsideBounds",2) end
     def Error.overflow() Error.new("Overflow",1) end
     CONSTRUCTS__ = ["Blocked","Overflow","OutsideBounds","Custom"]
+    def ==(a) a.tag === @tag && a.index === @index && a.params == @params end
   end
 
 end

data/lib/lib/haxe/io/output.rb

@@ -6,13 +6,13 @@ module Io
   class Output 
     
     def write_byte(c)
-      raise "Not implemented"
+      raise hx_raise("Not implemented")
     end
     
     def write_bytes(s,pos,len)
       k = len
       b = s.b
-      raise ::Haxe::Io::Error.outside_bounds if pos < 0 || len < 0 || pos + len > s.length
+      raise hx_raise(::Haxe::Io::Error.outside_bounds) if pos < 0 || len < 0 || pos + len > s.length
       while(k > 0) 
         self.write_byte(b[pos])
         pos+=1

data/lib/lib/hx_overrides.rb

@@ -14,6 +14,18 @@
       return _hx_str(date.get_full_year) + "-" + _hx_str((((m < 10) ? "0" + _hx_str(m) : "" + _hx_str(m)))) + "-" + _hx_str((((d < 10) ? "0" + _hx_str(d) : "" + _hx_str(d)))) + " " + _hx_str((((h < 10) ? "0" + _hx_str(h) : "" + _hx_str(h)))) + ":" + _hx_str((((mi < 10) ? "0" + _hx_str(mi) : "" + _hx_str(mi)))) + ":" + _hx_str((((s < 10) ? "0" + _hx_str(s) : "" + _hx_str(s))))
     end
     
+    def HxOverrides.substr(s,pos,len = nil)
+      return "" if pos != nil && pos != 0 && len != nil && len < 0
+      len = s.length if len == nil
+      if pos < 0 
+        pos = s.length + pos
+        pos = 0 if pos < 0
+      elsif len < 0 
+        len = s.length + len - pos
+      end
+      return s[pos,len]
+    end
+    
   haxe_me
   end
 

data/lib/lib/hx_sys.rb

@@ -22,7 +22,7 @@
           when 32,34
             ok = false
           when 0,13,10
-            arg = arg[0,i]
+            arg = HxOverrides.substr(arg,0,i)
           end if _g2 != nil
         end
       end

data/lib/lib/rb/boot.rb

@@ -7,7 +7,11 @@ module Rb
     # protected - in ruby this doesn't play well with static/inline methods
     
     def Boot.__trace(v,i)
-      puts(v)
+      if i != nil 
+        puts "#{v} #{i.inspect}"
+      else 
+        puts v
+      end
     end
     
   haxe_me

data/lib/lib/reflect.rb

@@ -9,6 +9,7 @@
         result = o[field.to_sym] if result == nil
         return result
       rescue => e
+        e = hx_rescued(e)
         return field
       end
     end

data/lib/lib/sys/io/file_handle.rb

@@ -11,6 +11,7 @@ module Io
     def initialize(t,index,p = nil ) @tag = t; @index = index; @params = p; end
     
     CONSTRUCTS__ = []
+    def ==(a) a.tag === @tag && a.index === @index && a.params == @params end
   end
 
 end

data/lib/lib/sys/io/file_output.rb

@@ -25,7 +25,7 @@ module Io
     def write_bytes(b,p,l)
       s = b.get_string(p,l)
       r = @__f.write(s)
-      raise ::Haxe::Io::Error.custom("An error occurred") if r < l
+      raise hx_raise(::Haxe::Io::Error.custom("An error occurred")) if r < l
       return r
     end
     

data/lib/lib/value_type.rb

@@ -18,5 +18,6 @@
     def ValueType.tobject() ValueType.new("TObject",4) end
     def ValueType.tunknown() ValueType.new("TUnknown",8) end
     CONSTRUCTS__ = ["TNull","TInt","TFloat","TBool","TObject","TFunction","TClass","TEnum","TUnknown"]
+    def ==(a) a.tag === @tag && a.index === @index && a.params == @params end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daff
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-30 00:00:00.000000000 Z
+date: 2015-02-01 00:00:00.000000000 Z
 dependencies: []
 description: Diff and patch tables
 email:
@@ -34,14 +34,18 @@ files:
 - lib/lib/coopy/cell_builder.rb
 - lib/lib/coopy/compare_table.rb
 - lib/lib/coopy/table_io.rb
+- lib/lib/coopy/sql_compare.rb
 - lib/lib/coopy/flat_cell_builder.rb
+- lib/lib/coopy/nested_cell_builder.rb
 - lib/lib/coopy/index_item.rb
 - lib/lib/coopy/index_pair.rb
+- lib/lib/coopy/sql_column.rb
 - lib/lib/coopy/diff_render.rb
 - lib/lib/coopy/cross_match.rb
 - lib/lib/coopy/table_diff.rb
 - lib/lib/coopy/alignment.rb
 - lib/lib/coopy/terminal_diff_render.rb
+- lib/lib/coopy/sql_table.rb
 - lib/lib/coopy/table_modifier.rb
 - lib/lib/coopy/highlight_patch.rb
 - lib/lib/coopy/table_text.rb
@@ -51,15 +55,20 @@ files:
 - lib/lib/coopy/coopy.rb
 - lib/lib/coopy/cell_info.rb
 - lib/lib/coopy/view.rb
+- lib/lib/coopy/sql_table_name.rb
 - lib/lib/coopy/highlight_patch_unit.rb
 - lib/lib/coopy/compare_flags.rb
 - lib/lib/coopy/unit.rb
 - lib/lib/coopy/mover.rb
 - lib/lib/coopy/table_comparison_state.rb
+- lib/lib/coopy/sql_database.rb
 - lib/lib/coopy/csv.rb
+- lib/lib/coopy/sqlite_helper.rb
 - lib/lib/coopy/ordering.rb
 - lib/lib/coopy/merger.rb
+- lib/lib/coopy/sql_helper.rb
 - lib/lib/coopy/sparse_sheet.rb
+- lib/lib/coopy/ndjson.rb
 - lib/lib/coopy/table.rb
 - lib/lib/coopy/viterbi.rb
 - lib/lib/math.rb
@@ -112,7 +121,8 @@ summary: ! '[![Build Status](https://travis-ci.org/paulfitz/daff.svg?branch=mast
   [![NPM version](https://badge.fury.io/js/daff.svg)](http://badge.fury.io/js/daff)
   [![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)  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
@@ -127,7 +137,7 @@ summary: ! '[![Build Status](https://travis-ci.org/paulfitz/daff.svg?branch=mast
   other complications, check out the coopy toolbox.  The program -----------  You
   can run `daff`/`daff.py`/`daff.rb` as a utility program: ```` $ daff daff can produce
   and apply tabular diffs. Call as: daff [--output OUTPUT.csv] a.csv b.csv daff [--output
-  OUTPUT.csv] parent.csv a.csv b.csv daff [--output OUTPUT.jsonbook] a.jsonbook b.jsonbook
+  OUTPUT.csv] parent.csv a.csv b.csv daff [--output OUTPUT.ndjson] a.ndjson b.ndjson
   daff patch [--inplace] [--output OUTPUT.csv] a.csv patch.csv daff merge [--inplace]
   [--output OUTPUT.csv] parent.csv a.csv b.csv daff trim [--output OUTPUT.csv] source.csv
   daff render [--output OUTPUT.html] diff.csv daff git daff version  The --inplace
@@ -140,27 +150,28 @@ summary: ! '[![Build Status](https://travis-ci.org/paulfitz/daff.svg?branch=mast
   render [--output OUTPUT.html] [--css CSS.css] [--fragment] [--plain] diff.csv --css
   CSS.css: generate a suitable css file to go with the html --fragment:    generate
   just a html fragment rather than a page --plain:       do not use fancy utf8 characters
-  to make arrows prettier ````  Using with git --------------  Run `daff git csv`
-  to install daff as a diff and merge handler for `*.csv` files in your repository.  Run
-  `daff git` for instructions on doing this manually. Your CSV diffs and merges will
-  get smarter, since git will suddenly understand about rows and columns, not just
-  lines:  ![Example CSV diff](scripts/diff.png)  The library -----------  You can
-  use `daff` as a library from any supported language.  We take  here the example
-  of Javascript.  To use `daff` on a webpage, first include `daff.js`: ```html <script
-  src="daff.js"></script> ``` Or if using node outside the browser: ```js var daff
-  = require(''daff''); ```  For concreteness, assume we have two versions of a table,
-  `data1` and `data2`: ```js var data1 = [ [''Country'',''Capital''], [''Ireland'',''Dublin''],
-  [''France'',''Paris''], [''Spain'',''Barcelona''] ]; var data2 = [ [''Country'',''Code'',''Capital''],
-  [''Ireland'',''ie'',''Dublin''], [''France'',''fr'',''Paris''], [''Spain'',''es'',''Madrid''],
-  [''Germany'',''de'',''Berlin''] ]; ```  To make those tables accessible to the library,
-  we wrap them in `daff.TableView`: ```js var table1 = new daff.TableView(data1);
-  var table2 = new daff.TableView(data2); ```  We can now compute the alignment between
-  the rows and columns in the two tables: ```js var alignment = daff.compareTables(table1,table2).align();
-  ```  To produce a diff from the alignment, we first need a table for the output:
-  ```js var data_diff = []; var table_diff = new daff.TableView(data_diff); ```  Using
-  default options for the diff: ```js var flags = new daff.CompareFlags(); var highlighter
-  = new daff.TableDiff(alignment,flags); highlighter.hilite(table_diff); ```  The
-  diff is now in `data_diff` in highlighter format, see specification here: > http://share.find.coop/doc/spec_hilite.html  ```js
+  to make arrows prettier ````  Formats supported are CSV, TSV, and [ndjson](http://dataprotocols.org/ndjson/).  Using
+  with git --------------  Run `daff git csv` to install daff as a diff and merge
+  handler for `*.csv` files in your repository.  Run `daff git` for instructions on
+  doing this manually. Your CSV diffs and merges will get smarter, since git will
+  suddenly understand about rows and columns, not just lines:  ![Example CSV diff](scripts/diff.png)  The
+  library -----------  You can use `daff` as a library from any supported language.  We
+  take  here the example of Javascript.  To use `daff` on a webpage, first include
+  `daff.js`: ```html <script src="daff.js"></script> ``` Or if using node outside
+  the browser: ```js var daff = require(''daff''); ```  For concreteness, assume we
+  have two versions of a table, `data1` and `data2`: ```js var data1 = [ [''Country'',''Capital''],
+  [''Ireland'',''Dublin''], [''France'',''Paris''], [''Spain'',''Barcelona''] ]; var
+  data2 = [ [''Country'',''Code'',''Capital''], [''Ireland'',''ie'',''Dublin''], [''France'',''fr'',''Paris''],
+  [''Spain'',''es'',''Madrid''], [''Germany'',''de'',''Berlin''] ]; ```  To make those
+  tables accessible to the library, we wrap them in `daff.TableView`: ```js var table1
+  = new daff.TableView(data1); var table2 = new daff.TableView(data2); ```  We can
+  now compute the alignment between the rows and columns in the two tables: ```js
+  var alignment = daff.compareTables(table1,table2).align(); ```  To produce a diff
+  from the alignment, we first need a table for the output: ```js var data_diff =
+  []; var table_diff = new daff.TableView(data_diff); ```  Using default options for
+  the diff: ```js var flags = new daff.CompareFlags(); var highlighter = new daff.TableDiff(alignment,flags);
+  highlighter.hilite(table_diff); ```  The diff is now in `data_diff` in highlighter
+  format, see specification here: > http://share.find.coop/doc/spec_hilite.html  ```js
   [ [ ''!'', '''', ''+++'', '''' ], [ ''@@'', ''Country'', ''Code'', ''Capital'' ],
   [ ''+'', ''Ireland'', ''ie'', ''Dublin'' ], [ ''+'', ''France'', ''fr'', ''Paris''
   ], [ ''->'', ''Spain'', ''es'', ''Barcelona->Madrid'' ], [ ''+++'', ''Germany'',