daff 1.1.19 → 1.2.1

data/lib/lib/coopy/highlight_patch.rb

@@ -42,8 +42,6 @@ module Coopy
     attr_accessor :col_permutation_rev
     attr_accessor :have_dropped_columns
     
-    public
-    
     def reset 
       @header = {}
       @header_pre = {}
@@ -70,6 +68,8 @@ module Coopy
       @have_dropped_columns = false
     end
     
+    public
+    
     def apply 
       self.reset
       return true if @patch.get_width < 2
@@ -133,9 +133,9 @@ module Coopy
       state = ::Coopy::TableComparisonState.new
       state.a = @source
       state.b = @source
-      comp = ::Coopy::CompareTable.new
+      comp = ::Coopy::CompareTable.new(state)
       comp.store_indexes
-      comp.attach(state)
+      comp.run
       comp.align
       @indexes = comp.get_indexes
       self.need_source_columns
@@ -515,7 +515,7 @@ module Coopy
                 ::Coopy::DiffRender.examine_cell(0,0,txt,"",@row_info.value,"",@cell_info)
                 next if !@cell_info.updated
                 next if @cell_info.conflicted
-                d = @view.to_datum(@csv.parse_single_cell(@cell_info.rvalue))
+                d = @view.to_datum(@csv.parse_cell(@cell_info.rvalue))
                 @source.set_cell(@patch_in_source_col[c1],mod1.dest_row,d)
               end
             end

data/lib/lib/coopy/index_item.rb

@@ -7,8 +7,12 @@ module Coopy
     def initialize
     end
     
+    # protected - in ruby this doesn't play well with static/inline methods
+    
     attr_accessor :lst
     
+    public
+    
     def add(i)
       @lst = Array.new if @lst == nil
       @lst.push(i)

data/lib/lib/coopy/index_pair.rb

@@ -18,11 +18,6 @@ module Coopy
     
     public
     
-    def add_column(i)
-      @ia.add_column(i)
-      @ib.add_column(i)
-    end
-    
     def add_columns(ca,cb)
       @ia.add_column(ca)
       @ib.add_column(cb)

data/lib/lib/coopy/merger.rb

@@ -27,8 +27,6 @@ module Coopy
     attr_accessor :column_mix_remote
     attr_accessor :conflicts
     
-    public
-    
     def shuffle_dimension(dim_units,len,fate,cl,cr)
       at = 0
       begin
@@ -96,6 +94,8 @@ module Coopy
       @local.insert_or_delete_rows(fate,hfate)
     end
     
+    public
+    
     def apply 
       @conflicts = 0
       ct = ::Coopy::Coopy.compare_tables3(@parent,@local,@remote)
@@ -174,6 +174,8 @@ module Coopy
       return @conflicts
     end
     
+    # protected - in ruby this doesn't play well with static/inline methods
+    
     def Merger.make_conflicted_cell(view,pcell,lcell,rcell)
       return view.to_datum("((( " + _hx_str(view.to_s(pcell)) + " ))) " + _hx_str(view.to_s(lcell)) + " /// " + _hx_str(view.to_s(rcell)))
     end

data/lib/lib/coopy/mover.rb

@@ -4,9 +4,6 @@
 module Coopy
   class Mover 
     
-    def initialize
-    end
-    
     def Mover.move_units(units)
       isrc = Array.new
       idest = Array.new
@@ -59,7 +56,7 @@ module Coopy
       return ::Coopy::Mover.move_without_extras(isrc,idest)
     end
     
-    def Mover.move_with_extras(isrc,idest)
+    def Mover.move(isrc,idest)
       len = isrc.length
       len2 = idest.length
       in_src = {}
@@ -110,6 +107,8 @@ module Coopy
       return ::Coopy::Mover.move_without_extras(src,dest)
     end
     
+    # protected - in ruby this doesn't play well with static/inline methods
+    
     def Mover.move_without_extras(src,dest)
       return nil if src.length != dest.length
       return [] if src.length <= 1

data/lib/lib/coopy/simple_table.rb

@@ -26,8 +26,6 @@ module Coopy
     def height=(__v) @height = __v end
     def width() get_width end
     def width=(__v) @width = __v end
-    def size() get_size end
-    def size=(__v) @size = __v end
     
     def get_width 
       return @w
@@ -37,10 +35,6 @@ module Coopy
       return @h
     end
     
-    def get_size 
-      return @h
-    end
-    
     def get_cell(x,y)
       return @data[x + y * @w]
     end
@@ -214,6 +208,28 @@ module Coopy
       return nil
     end
     
+    def clone 
+      result = ::Coopy::SimpleTable.new(self.get_width,self.get_height)
+      begin
+        _g1 = 0
+        _g = self.get_height
+        while(_g1 < _g) 
+          i = _g1
+          _g1+=1
+          begin
+            _g3 = 0
+            _g2 = self.get_width
+            while(_g3 < _g2) 
+              j = _g3
+              _g3+=1
+              result.set_cell(j,i,self.get_cell(j,i))
+            end
+          end
+        end
+      end
+      return result
+    end
+    
     def SimpleTable.table_to_string(tab)
       x = ""
       begin
@@ -241,6 +257,30 @@ module Coopy
       return x
     end
     
+    def SimpleTable.table_is_similar(tab1,tab2)
+      return false if tab1.get_width != tab2.get_width
+      return false if tab1.get_height != tab2.get_height
+      v = tab1.get_cell_view
+      begin
+        _g1 = 0
+        _g = tab1.get_height
+        while(_g1 < _g) 
+          i = _g1
+          _g1+=1
+          begin
+            _g3 = 0
+            _g2 = tab1.get_width
+            while(_g3 < _g2) 
+              j = _g3
+              _g3+=1
+              return false if !v.equals(tab1.get_cell(j,i),tab2.get_cell(j,i))
+            end
+          end
+        end
+      end
+      return true
+    end
+    
   haxe_me
   end
 

data/lib/lib/coopy/simple_view.rb

@@ -12,18 +12,6 @@ module Coopy
       return "" + _hx_str(d.to_s)
     end
     
-    def get_bag(d)
-      return nil
-    end
-    
-    def get_table(d)
-      return nil
-    end
-    
-    def has_structure(d)
-      return false
-    end
-    
     def equals(d1,d2)
       return true if d1 == nil && d2 == nil
       return true if d1 == nil && "" + _hx_str(d2.to_s) == ""

data/lib/lib/coopy/table.rb

@@ -15,6 +15,7 @@ module Coopy
     def get_width() puts "Abstract Table.get_width called" end
     def get_height() puts "Abstract Table.get_height called" end
     def getData() puts "Abstract Table.getData called" end
+    def clone() puts "Abstract Table.clone called" end
   haxe_me
   end
 

data/lib/lib/coopy/table_diff.rb

@@ -22,6 +22,8 @@ module Coopy
       @builder = builder
     end
     
+    protected
+    
     def get_separator(t,t2,root)
       sep = root
       w = t.get_width
@@ -91,8 +93,6 @@ module Coopy
       return str
     end
     
-    protected
-    
     def is_reordered(m,ct)
       reordered = false
       l = -1

data/lib/lib/coopy/table_text.rb

@@ -4,20 +4,20 @@
 module Coopy
   class TableText 
     
-    def initialize(rows)
-      @rows = rows
-      @view = rows.get_cell_view
+    def initialize(tab)
+      @tab = tab
+      @view = tab.get_cell_view
     end
     
     protected
     
-    attr_accessor :rows
+    attr_accessor :tab
     attr_accessor :view
     
     public
     
     def get_cell_text(x,y)
-      return @view.to_s(@rows.get_cell(x,y))
+      return @view.to_s(@tab.get_cell(x,y))
     end
     
   haxe_me

data/lib/lib/coopy/unit.rb

@@ -57,6 +57,8 @@ module Coopy
       return false
     end
     
+    # protected - in ruby this doesn't play well with static/inline methods
+    
     def Unit.describe(i)
       if i >= 0 
         return "" + _hx_str(i)

data/lib/lib/coopy/view.rb

@@ -4,9 +4,6 @@
 module Coopy
   class View 
     def toString(d) puts "Abstract View.toString called" end
-    def getBag(d) puts "Abstract View.getBag called" end
-    def getTable(d) puts "Abstract View.getTable called" end
-    def hasStructure(d) puts "Abstract View.hasStructure called" end
     def equals(d1,d2) puts "Abstract View.equals called" end
     def toDatum(str) puts "Abstract View.toDatum called" end
   haxe_me

data/lib/lib/coopy/viterbi.rb

@@ -41,11 +41,15 @@ module Coopy
       @path.resize(1,@t,-1)
     end
     
+    protected
+    
     def assert_mode(_next)
       @index+=1 if _next == 0 && @mode == 1
       @mode = _next
     end
     
+    public
+    
     def add_transition(s0,s1,c)
       resize = false
       if s0 >= @k 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daff
 version: !ruby/object:Gem::Version
-  version: 1.1.19
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-24 00:00:00.000000000 Z
+date: 2014-10-28 00:00:00.000000000 Z
 dependencies: []
 description: Diff and patch tables
 email:
@@ -32,13 +32,10 @@ files:
 - lib/lib/hx_overrides.rb
 - lib/lib/coopy/simple_table.rb
 - lib/lib/coopy/cell_builder.rb
-- lib/lib/coopy/workspace.rb
 - lib/lib/coopy/compare_table.rb
 - lib/lib/coopy/table_io.rb
 - lib/lib/coopy/flat_cell_builder.rb
-- lib/lib/coopy/compare.rb
 - lib/lib/coopy/index_item.rb
-- lib/lib/coopy/simple_cell.rb
 - lib/lib/coopy/index_pair.rb
 - lib/lib/coopy/diff_render.rb
 - lib/lib/coopy/cross_match.rb
@@ -50,11 +47,8 @@ files:
 - lib/lib/coopy/table_text.rb
 - lib/lib/coopy/simple_view.rb
 - lib/lib/coopy/row.rb
-- lib/lib/coopy/change_type.rb
 - lib/lib/coopy/index.rb
-- lib/lib/coopy/bag.rb
 - lib/lib/coopy/coopy.rb
-- lib/lib/coopy/viewed_datum.rb
 - lib/lib/coopy/cell_info.rb
 - lib/lib/coopy/view.rb
 - lib/lib/coopy/highlight_patch_unit.rb
@@ -65,17 +59,13 @@ files:
 - lib/lib/coopy/csv.rb
 - lib/lib/coopy/ordering.rb
 - lib/lib/coopy/merger.rb
-- lib/lib/coopy/change.rb
 - lib/lib/coopy/sparse_sheet.rb
-- lib/lib/coopy/report.rb
 - lib/lib/coopy/table.rb
 - lib/lib/coopy/viterbi.rb
 - lib/lib/list.rb
 - lib/lib/sys/io/hx_file.rb
 - lib/lib/sys/io/file_output.rb
-- lib/lib/sys/io/file.rb
 - lib/lib/sys/io/file_handle.rb
-- lib/lib/_list/list_iterator.rb
 - lib/lib/x_list/list_iterator.rb
 - lib/lib/string_buf.rb
 - lib/lib/haxe/imap.rb
@@ -87,12 +77,10 @@ files:
 - lib/lib/haxe/io/bytes.rb
 - lib/lib/haxe/io/error.rb
 - lib/lib/haxe/io/output.rb
-- lib/lib/haxe/log.rb
 - lib/lib/haxe/ds/int_map.rb
 - lib/lib/haxe/ds/string_map.rb
 - lib/lib/haxe/format/json_parser.rb
 - lib/lib/haxe/format/json_printer.rb
-- lib/lib/sys.rb
 - bin/daff.rb
 - README.md
 homepage: https://github.com/paulfitz/daff
@@ -127,50 +115,51 @@ summary: ! '[![Build Status](https://travis-ci.org/paulfitz/daff.svg?branch=mast
   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/  Download
-  the code for your preferred language here: > https://github.com/paulfitz/daff/releases  For
-  certain languages you can use the command-line: ````sh npm install daff -g  # node/javascript
+  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  #
-  php ````  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 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 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 option to patch and merge
-  will result in modification of a.csv.  If you need more control, here is the full
-  list of flags: daff diff [--output OUTPUT.csv] [--context NUM] [--all] [--act ACT]
-  a.csv b.csv --context NUM: show NUM rows of context --all:         do not prune
-  unchanged rows --act ACT:     show only a certain kind of change (update, insert,
-  delete)  daff diff --git path old-file old-hex old-mode new-file new-hex new-mode
-  --git:         process arguments provided by git to diff drivers  daff 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.  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
+  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
+  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
+  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
+  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
+  option to patch and merge will result in modification of a.csv.  If you need more
+  control, here is the full list of flags: daff diff [--output OUTPUT.csv] [--context
+  NUM] [--all] [--act ACT] a.csv b.csv --context NUM: show NUM rows of context --all:         do
+  not prune unchanged rows --act ACT:     show only a certain kind of change (update,
+  insert, delete)  daff diff --git path old-file old-hex old-mode new-file new-hex
+  new-mode --git:         process arguments provided by git to diff drivers  daff
+  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
   [ [ ''!'', '''', ''+++'', '''' ], [ ''@@'', ''Country'', ''Code'', ''Capital'' ],
   [ ''+'', ''Ireland'', ''ie'', ''Dublin'' ], [ ''+'', ''France'', ''fr'', ''Paris''
   ], [ ''->'', ''Spain'', ''es'', ''Barcelona->Madrid'' ], [ ''+++'', ''Germany'',
@@ -185,18 +174,18 @@ summary: ! '[![Build Status](https://travis-ci.org/paulfitz/daff.svg?branch=mast
   should find sample code in  the packages on the [Releases](https://github.com/paulfitz/daff/releases)
   page.   Supported languages -------------------  The `daff` library is written in
   [Haxe](http://haxe.org/), which can be translated reasonably well into at least
-  the following languages:  * Javascript * PHP * Python * Java * C# * C++ * (via a
-  hack, just for `daff`) Ruby  Some translations are done for you on the [Releases](https://github.com/paulfitz/daff/releases)
+  the following languages:  * Javascript * Python * Java * C# * C++ * Ruby (using
+  an [unofficial haxe target](https://github.com/paulfitz/haxe) developed for `daff`)  *
+  PHP  Some translations are done for you on the [Releases](https://github.com/paulfitz/daff/releases)
   page. To make another translation,  follow the  [Haxe getting started tutorial](http://haxe.org/doc/start)
   for the language you care about, then do one of:  ``` make js make php make py make
-  java make cs make cpp ```  [@Floppy](https://github.com/Floppy) has made a lovingly-hand-written
-  [native Ruby port](https://github.com/theodi/coopy-ruby) that covers core functionality.  I''ve
-  made a brutally-machine-converted port that is a full translation but less idiomatic.  For
-  each language, the `daff` library expects to be handed an interface to tables you
-  create, rather than creating them itself.  This is to avoid inefficient copies from
-  one format to another.  You''ll find a `SimpleTable` class you can use if you find
-  this awkward.  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
+  java make cs make cpp ```  For each language, the `daff` library expects to be handed
+  an interface to tables you create, rather than creating them itself.  This is to
+  avoid inefficient copies from one format to another.  You''ll find a `SimpleTable`
+  class you can use if you find this awkward.  API documentation -----------------  *
+  You can browse the `daff` classes at http://paulfitz.github.io/daff-doc/  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. * http://theodi.org/blog/adapting-git-simple-data
   : using this library with gitlab. * http://okfnlabs.org/blog/2013/08/08/diffing-and-patching-data.html
   : a summary of where the library came from. * http://blog.okfn.org/2013/07/02/git-and-github-for-data/