daff 1.3.2 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f83e7c531044c8304fe471789f88f1a25ccc3618
-  data.tar.gz: a131ce2c9f90a56e11c1cf7f0f7cf7216db7668a
+  metadata.gz: 56cd28220d87d43853faf7c8133eb23dcd7fc0b3
+  data.tar.gz: 0c14ac8d72f5f3348fe5b6b73c804a30364981f1
 SHA512:
-  metadata.gz: 3125f64b0ebf44d43e3fa7fa68223d093803842e360680720a7fbdba7a250f872b4e906ce8adc8265abec8e5072608da4e330a3d95653581f00ff394232046f4
-  data.tar.gz: 3ddd77a33fd57de5db60e056a9b269e07f3294e5a670d9ee5334d14e78bc75c1cff10dd867e768795217262091ebc6f04d1571a6c9003b882edfb7ce96ead4e1
+  metadata.gz: c26c1ed6019d5131a5623dbd6b3eb120d237724c39e8c3c037c921b78ec7996ad83ec9dc121c7cf518b635a143db696aa5b4d8f800795ca2228b8f3e443fca8a
+  data.tar.gz: 4a42d2fbe3732653ae83459aed3f01643c6ec8b78735717b0f248e5b763a332f851c79d00d61e18c669c2eacfbc17b872c227f9c06dab64dfaf561a7e8e7d9fc

data/README.md

@@ -3,7 +3,8 @@
 [![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/)
+[![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
 ===============
@@ -23,6 +24,7 @@ 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:
@@ -228,7 +230,9 @@ API documentation
 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/)
+<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
 ----------------

data/lib/daff.rb

@@ -45,6 +45,7 @@ require_relative 'lib/lambda'
 require_relative 'lib/list'
 require_relative 'lib/x_list/list_iterator'
 require_relative 'lib/reflect'
+require_relative 'lib/std'
 require_relative 'lib/string_buf'
 require_relative 'lib/hx_sys'
 require_relative 'lib/value_type'
@@ -53,6 +54,10 @@ require_relative 'lib/coopy/alignment'
 require_relative 'lib/coopy/cell_builder'
 require_relative 'lib/coopy/cell_info'
 require_relative 'lib/coopy/column_change'
+require_relative 'lib/coopy/table'
+require_relative 'lib/coopy/combined_table'
+require_relative 'lib/coopy/combined_table_body'
+require_relative 'lib/coopy/combined_table_head'
 require_relative 'lib/coopy/compare_flags'
 require_relative 'lib/coopy/compare_table'
 require_relative 'lib/coopy/coopy'
@@ -66,8 +71,10 @@ require_relative 'lib/coopy/highlight_patch_unit'
 require_relative 'lib/coopy/index'
 require_relative 'lib/coopy/index_item'
 require_relative 'lib/coopy/index_pair'
-require_relative 'lib/coopy/merger'
 require_relative 'lib/coopy/meta'
+require_relative 'lib/coopy/json_table'
+require_relative 'lib/coopy/json_tables'
+require_relative 'lib/coopy/merger'
 require_relative 'lib/coopy/mover'
 require_relative 'lib/coopy/ndjson'
 require_relative 'lib/coopy/nested_cell_builder'
@@ -75,7 +82,7 @@ require_relative 'lib/coopy/ordering'
 require_relative 'lib/coopy/property_change'
 require_relative 'lib/coopy/row_change'
 require_relative 'lib/coopy/row_stream'
-require_relative 'lib/coopy/table'
+require_relative 'lib/coopy/simple_meta'
 require_relative 'lib/coopy/simple_table'
 require_relative 'lib/coopy/view'
 require_relative 'lib/coopy/simple_view'
@@ -86,12 +93,14 @@ require_relative 'lib/coopy/sql_database'
 require_relative 'lib/coopy/sql_helper'
 require_relative 'lib/coopy/sql_table'
 require_relative 'lib/coopy/sql_table_name'
+require_relative 'lib/coopy/sql_tables'
 require_relative 'lib/coopy/sqlite_helper'
 require_relative 'lib/coopy/table_comparison_state'
 require_relative 'lib/coopy/table_diff'
 require_relative 'lib/coopy/table_io'
 require_relative 'lib/coopy/table_modifier'
 require_relative 'lib/coopy/table_stream'
+require_relative 'lib/coopy/tables'
 require_relative 'lib/coopy/terminal_diff_render'
 require_relative 'lib/coopy/unit'
 require_relative 'lib/coopy/viterbi'

data/lib/lib/coopy/alignment.rb

@@ -11,9 +11,11 @@ module Coopy
       @map_count = 0
       @reference = nil
       @meta = nil
+      @comp = nil
       @order_cache_has_reference = false
       @ia = -1
       @ib = -1
+      @marked_as_identical = false
     end
     
     protected
@@ -30,11 +32,15 @@ module Coopy
     attr_accessor :order_cache
     attr_accessor :order_cache_has_reference
     attr_accessor :index_columns
+    attr_accessor :marked_as_identical
     
     public
     
     attr_accessor :reference
     attr_accessor :meta
+    attr_accessor :comp
+    attr_accessor :has_addition
+    attr_accessor :has_removal
     
     def range(ha,hb)
       @ha = ha
@@ -55,8 +61,16 @@ module Coopy
     end
     
     def link(a,b)
-      @map_a2b[a] = b if a != -1
-      @map_b2a[b] = a if b != -1
+      if a != -1 
+        @map_a2b[a] = b
+      else 
+        @has_addition = true
+      end
+      if b != -1 
+        @map_b2a[b] = a
+      else 
+        @has_removal = true
+      end
       @map_count+=1
     end
     
@@ -277,6 +291,16 @@ module Coopy
       result
     end
     
+    public
+    
+    def mark_identical 
+      @marked_as_identical = true
+    end
+    
+    def is_marked_as_identical 
+      @marked_as_identical
+    end
+    
   haxe_me ["coopy", "Alignment"]
   end
 

data/lib/lib/coopy/combined_table.rb

@@ -0,0 +1,127 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+module Coopy
+  class CombinedTable 
+    
+    def initialize(t)
+      @t = t
+      @dx = 0
+      @dy = 0
+      @core = t
+      @head = nil
+      return if t.get_width < 1 || t.get_height < 1
+      v = t.get_cell_view
+      return if v.to_s(t.get_cell(0,0)) != "@@"
+      @dx = 1
+      @dy = 0
+      begin
+        _g1 = 0
+        _g = t.get_height
+        while(_g1 < _g) 
+          y = _g1
+          _g1+=1
+          txt = v.to_s(t.get_cell(0,y))
+          break if txt == nil || txt == "" || txt == "null"
+          @dy+=1
+        end
+      end
+      @head = ::Coopy::CombinedTableHead.new(self,@dx,@dy)
+      @body = ::Coopy::CombinedTableBody.new(self,@dx,@dy)
+      @core = @body
+      @meta = ::Coopy::SimpleMeta.new(@head)
+    end
+    
+    protected
+    
+    attr_accessor :t
+    attr_accessor :body
+    attr_accessor :head
+    attr_accessor :dx
+    attr_accessor :dy
+    attr_accessor :core
+    attr_accessor :meta
+    
+    public
+    
+    def all 
+      @t
+    end
+    
+    def get_table 
+      self
+    end
+    
+    def height() get_height end
+    def height=(__v) @height = __v end
+    def width() get_width end
+    def width=(__v) @width = __v end
+    
+    def get_width 
+      @core.get_width
+    end
+    
+    def get_height 
+      @core.get_height
+    end
+    
+    def get_cell(x,y)
+      @core.get_cell(x,y)
+    end
+    
+    def set_cell(x,y,c)
+      @core.set_cell(x,y,c)
+    end
+    
+    def to_s 
+      ::Coopy::SimpleTable.table_to_string(self)
+    end
+    
+    def get_cell_view 
+      @t.get_cell_view
+    end
+    
+    def is_resizable 
+      @core.is_resizable
+    end
+    
+    def resize(w,h)
+      @core.resize(h,w)
+    end
+    
+    def clear 
+      @core.clear
+    end
+    
+    def insert_or_delete_rows(fate,hfate)
+      @core.insert_or_delete_rows(fate,hfate)
+    end
+    
+    def insert_or_delete_columns(fate,wfate)
+      @core.insert_or_delete_columns(fate,wfate)
+    end
+    
+    def trim_blank 
+      @core.trim_blank
+    end
+    
+    def get_data 
+      nil
+    end
+    
+    def clone 
+      @core.clone
+    end
+    
+    def create 
+      @t.create
+    end
+    
+    def get_meta 
+      @meta
+    end
+    
+  haxe_me ["coopy", "CombinedTable"]
+  end
+
+end

data/lib/lib/coopy/combined_table_body.rb

@@ -0,0 +1,151 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+module Coopy
+  class CombinedTableBody 
+    
+    def initialize(parent,dx,dy)
+      @parent = parent
+      @dx = dx
+      @dy = dy
+      @all = parent.all
+    end
+    
+    protected
+    
+    attr_accessor :parent
+    attr_accessor :dx
+    attr_accessor :dy
+    attr_accessor :all
+    attr_accessor :meta
+    
+    public
+    
+    def get_table 
+      self
+    end
+    
+    def height() get_height end
+    def height=(__v) @height = __v end
+    def width() get_width end
+    def width=(__v) @width = __v end
+    
+    def get_width 
+      @all.get_width - 1
+    end
+    
+    def get_height 
+      @all.get_height - @dy + 1
+    end
+    
+    def get_cell(x,y)
+      if y == 0 
+        @meta = @parent.get_meta.as_table if @meta == nil
+        return @meta.get_cell(x + @dx,0)
+      end
+      @all.get_cell(x + @dx,y + @dy - 1)
+    end
+    
+    def set_cell(x,y,c)
+      if y == 0 
+        @all.set_cell(x + @dx,0,c)
+        return
+      end
+      @all.set_cell(x + @dx,y + @dy - 1,c)
+    end
+    
+    def to_s 
+      ::Coopy::SimpleTable.table_to_string(self)
+    end
+    
+    def get_cell_view 
+      @all.get_cell_view
+    end
+    
+    def is_resizable 
+      @all.is_resizable
+    end
+    
+    def resize(w,h)
+      @all.resize(w + 1,h + @dy)
+    end
+    
+    def clear 
+      @all.clear
+      @dx = 0
+      @dy = 0
+    end
+    
+    def insert_or_delete_rows(fate,hfate)
+      fate2 = Array.new
+      begin
+        _g1 = 0
+        _g = @dy
+        while(_g1 < _g) 
+          y = _g1
+          _g1+=1
+          fate2.push(y)
+        end
+      end
+      hdr = true
+      begin
+        _g2 = 0
+        while(_g2 < fate.length) 
+          f = fate[_g2]
+          _g2+=1
+          if hdr 
+            hdr = false
+            next
+          end
+          fate2.push(((f >= 0) ? f + @dy - 1 : f))
+        end
+      end
+      @all.insert_or_delete_rows(fate2,hfate + @dy - 1)
+    end
+    
+    def insert_or_delete_columns(fate,wfate)
+      fate2 = Array.new
+      begin
+        _g1 = 0
+        _g = @dx + 1
+        while(_g1 < _g) 
+          x = _g1
+          _g1+=1
+          fate2.push(x)
+        end
+      end
+      begin
+        _g2 = 0
+        while(_g2 < fate.length) 
+          f = fate[_g2]
+          _g2+=1
+          fate2.push(((f >= 0) ? f + @dx + 1 : f))
+        end
+      end
+      @all.insert_or_delete_columns(fate2,wfate + @dx)
+    end
+    
+    def trim_blank 
+      @all.trim_blank
+    end
+    
+    def get_data 
+      nil
+    end
+    
+    def clone 
+      ::Coopy::CombinedTable.new(@all.clone)
+    end
+    
+    def create 
+      ::Coopy::CombinedTable.new(@all.create)
+    end
+    
+    def get_meta 
+      @parent.get_meta
+    end
+    
+  haxe_me ["coopy", "CombinedTableBody"]
+  end
+
+end

data/lib/lib/coopy/combined_table_head.rb

@@ -0,0 +1,103 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+module Coopy
+  class CombinedTableHead 
+    
+    def initialize(parent,dx,dy)
+      @parent = parent
+      @dx = dx
+      @dy = dy
+      @all = parent.all
+    end
+    
+    protected
+    
+    attr_accessor :parent
+    attr_accessor :dx
+    attr_accessor :dy
+    attr_accessor :all
+    
+    public
+    
+    def get_table 
+      self
+    end
+    
+    def height() get_height end
+    def height=(__v) @height = __v end
+    def width() get_width end
+    def width=(__v) @width = __v end
+    
+    def get_width 
+      @all.get_width
+    end
+    
+    def get_height 
+      @dy
+    end
+    
+    def get_cell(x,y)
+      if x == 0 
+        v = self.get_cell_view
+        txt = v.to_s(@all.get_cell(x,y))
+        return txt[1,txt.length] if txt[0] == "@"
+      end
+      @all.get_cell(x,y)
+    end
+    
+    def set_cell(x,y,c)
+      @all.set_cell(x,y,c)
+    end
+    
+    def to_s 
+      ::Coopy::SimpleTable.table_to_string(self)
+    end
+    
+    def get_cell_view 
+      @all.get_cell_view
+    end
+    
+    def is_resizable 
+      false
+    end
+    
+    def resize(w,h)
+      false
+    end
+    
+    def clear 
+    end
+    
+    def insert_or_delete_rows(fate,hfate)
+      false
+    end
+    
+    def insert_or_delete_columns(fate,wfate)
+      @all.insert_or_delete_columns(fate,wfate)
+    end
+    
+    def trim_blank 
+      false
+    end
+    
+    def get_data 
+      nil
+    end
+    
+    def clone 
+      nil
+    end
+    
+    def create 
+      nil
+    end
+    
+    def get_meta 
+      nil
+    end
+    
+  haxe_me ["coopy", "CombinedTableHead"]
+  end
+
+end