daff 1.2.6 → 1.3.1

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

@@ -26,7 +26,7 @@ module Io
       s = b.get_string(p,l)
       r = @__f.write(s)
       raise hx_raise(::Haxe::Io::Error.custom("An error occurred")) if r < l
-      return r
+      r
     end
     
   haxe_me ["sys", "io", "FileOutput"]

data/lib/lib/sys/io/hx_file.rb

@@ -6,7 +6,7 @@ module Io
   class HxFile 
     
     def HxFile.get_content(path)
-      return IO.read(path)
+      IO.read(path)
     end
     
     def HxFile.save_content(path,content)

data/lib/lib/x_list/list_iterator.rb

@@ -17,13 +17,13 @@ module X_List
     public
     
     def has_next 
-      return @head != nil
+      @head != nil
     end
     
     def _next 
       @val = @head[0]
       @head = @head[1]
-      return @val
+      @val
     end
     
   haxe_me ["_List", "ListIterator"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daff
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.3.1
 platform: ruby
 authors:
 - James Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-09-18 00:00:00.000000000 Z
 dependencies: []
 description: Diff and patch tables
 email:
@@ -26,6 +26,7 @@ files:
 - lib/lib/coopy/alignment.rb
 - lib/lib/coopy/cell_builder.rb
 - lib/lib/coopy/cell_info.rb
+- lib/lib/coopy/column_change.rb
 - lib/lib/coopy/compare_flags.rb
 - lib/lib/coopy/compare_table.rb
 - lib/lib/coopy/coopy.rb
@@ -39,11 +40,15 @@ files:
 - lib/lib/coopy/index_item.rb
 - lib/lib/coopy/index_pair.rb
 - lib/lib/coopy/merger.rb
+- lib/lib/coopy/meta.rb
 - lib/lib/coopy/mover.rb
 - lib/lib/coopy/ndjson.rb
 - lib/lib/coopy/nested_cell_builder.rb
 - lib/lib/coopy/ordering.rb
+- lib/lib/coopy/property_change.rb
 - lib/lib/coopy/row.rb
+- lib/lib/coopy/row_change.rb
+- lib/lib/coopy/row_stream.rb
 - lib/lib/coopy/simple_table.rb
 - lib/lib/coopy/simple_view.rb
 - lib/lib/coopy/sparse_sheet.rb
@@ -59,7 +64,7 @@ files:
 - lib/lib/coopy/table_diff.rb
 - lib/lib/coopy/table_io.rb
 - lib/lib/coopy/table_modifier.rb
-- lib/lib/coopy/table_text.rb
+- lib/lib/coopy/table_stream.rb
 - lib/lib/coopy/terminal_diff_render.rb
 - lib/lib/coopy/unit.rb
 - lib/lib/coopy/view.rb
@@ -70,12 +75,8 @@ files:
 - lib/lib/haxe/format/json_printer.rb
 - lib/lib/haxe/imap.rb
 - lib/lib/haxe/io/bytes.rb
-- lib/lib/haxe/io/bytes_buffer.rb
-- lib/lib/haxe/io/bytes_input.rb
-- lib/lib/haxe/io/bytes_output.rb
 - lib/lib/haxe/io/eof.rb
 - lib/lib/haxe/io/error.rb
-- lib/lib/haxe/io/input.rb
 - lib/lib/haxe/io/output.rb
 - lib/lib/hx_overrides.rb
 - lib/lib/hx_sys.rb
@@ -102,17 +103,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: '[![Build Status](https://travis-ci.org/paulfitz/daff.svg?branch=master)](https://travis-ci.org/paulfitz/daff)
@@ -153,7 +154,7 @@ summary: '[![Build Status](https://travis-ci.org/paulfitz/daff.svg?branch=master
   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
+  suddenly understand about rows and columns, not just lines:  ![Example CSV diff](http://paulfitz.github.io/daff-doc/images/daff_vs_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
@@ -183,30 +184,33 @@ summary: '[![Build Status](https://travis-ci.org/paulfitz/daff.svg?branch=master
   how to apply that difference as a patch: ```js var patcher = new daff.HighlightPatch(table1,table_diff);
   patcher.apply(); // table1 should now equal table2 ```  For other languages, you
   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
+  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 * 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 ```  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.  Other possibilities:  * There''s a
-  daff wrapper for R written by [Edwin de Jonge](https://github.com/edwindj), see
-  https://github.com/edwindj/daff 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
+  page. To make another translation, or to compile from source first follow the [Haxe
+  getting started tutorial](http://haxe.org/doc/start) for the language you care about.  At
+  the time of writing, if you are on OSX, you should install haxe using `brew install
+  haxe --HEAD`.  Then do one of:  ``` make js make php make py make 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.  Other possibilities:  * There''s a daff wrapper for R
+  written by [Edwin de Jonge](https://github.com/edwindj), see https://github.com/edwindj/daff
+  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
   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
+  : using this library with github. * https://github.com/ropensci/unconf/issues/19
+  : a thread about diffing data in which daff shows up in at least four guises (see
+  if you can spot them all). * 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/
   : a post about storing small data in git/github. * http://blog.ouseful.info/2013/08/27/diff-or-chop-github-csv-data-files-and-openrefine/
   : counterpoint - a post discussing tracked-changes rather than diffs.  ## License  daff

data/lib/lib/coopy/table_text.rb

@@ -1,26 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: utf-8
-
-module Coopy
-  class TableText 
-    
-    def initialize(tab)
-      @tab = tab
-      @view = tab.get_cell_view
-    end
-    
-    protected
-    
-    attr_accessor :tab
-    attr_accessor :view
-    
-    public
-    
-    def get_cell_text(x,y)
-      return @view.to_s(@tab.get_cell(x,y))
-    end
-    
-  haxe_me
-  end
-
-end

data/lib/lib/haxe/io/bytes_buffer.rb

@@ -1,19 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: utf-8
-
-module Haxe
-module Io
-  class BytesBuffer 
-    
-    # protected - in ruby this doesn't play well with static/inline methods
-    
-    attr_accessor :b
-    
-    public
-    
-    attr_accessor :length
-  haxe_me
-  end
-
-end
-end

data/lib/lib/haxe/io/bytes_input.rb

@@ -1,13 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: utf-8
-
-module Haxe
-module Io
-  class BytesInput < ::Haxe::Io::Input 
-    attr_accessor :position
-    attr_accessor :length
-  haxe_me
-  end
-
-end
-end

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

@@ -1,33 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: utf-8
-
-module Haxe
-module Io
-  class BytesOutput < ::Haxe::Io::Output 
-    
-    # protected - in ruby this doesn't play well with static/inline methods
-    
-    attr_accessor :b
-    
-    public
-    
-    attr_accessor :length 
-    
-    def write_byte(c)
-      @b.b.concat(c)
-    end
-     
-    
-    def write_bytes(buf,pos,len)
-      begin
-        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
-    end
-    
-  haxe_me
-  end
-
-end
-end

data/lib/lib/haxe/io/input.rb

@@ -1,11 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: utf-8
-
-module Haxe
-module Io
-  class Input 
-  haxe_me
-  end
-
-end
-end