daff 1.3.6 → 1.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56cd28220d87d43853faf7c8133eb23dcd7fc0b3
-  data.tar.gz: 0c14ac8d72f5f3348fe5b6b73c804a30364981f1
+  metadata.gz: fe5ac7c2439b43f603b802861b9e04b04f1c2773
+  data.tar.gz: 7d2bd90c028eb968d7369d765db5c2f319eb5d10
 SHA512:
-  metadata.gz: c26c1ed6019d5131a5623dbd6b3eb120d237724c39e8c3c037c921b78ec7996ad83ec9dc121c7cf518b635a143db696aa5b4d8f800795ca2228b8f3e443fca8a
-  data.tar.gz: 4a42d2fbe3732653ae83459aed3f01643c6ec8b78735717b0f248e5b763a332f851c79d00d61e18c669c2eacfbc17b872c227f9c06dab64dfaf561a7e8e7d9fc
+  metadata.gz: 29d7a4fd4f68ef891f2b739b983d18b3bb20cebcb47bb91394ebc98814cd7d6452480526c6ced4aee7ca00afa28b05cd6c2336cd8531e404aa729f1a5ec14b28
+  data.tar.gz: 379780b6745360e7b4d2842d57260b68b36e41cce310d01e3e158b343ddaf285d9adcc254888a36fd2dad95321ec9dc97a213894808bae5bf5dd26d94df52948

data/lib/daff.rb

@@ -144,6 +144,7 @@ def hx_rescued(x)
 end
 
 
+require_relative 'lib/coopy/table_view'
 Daff = Coopy
 if __FILE__ == $0
 	Coopy::Coopy.main

data/lib/lib/coopy/coopy.rb

@@ -4,8 +4,9 @@
 module Coopy
   class Coopy 
     
-    def initialize
+    def initialize(io = nil)
       self.init
+      @io = io
     end
     
     # protected - in ruby this doesn't play well with static/inline methods
@@ -262,6 +263,8 @@ module Coopy
       output
     end
     
+    public
+    
     def load_table(name)
       ext = self.check_format(name)
       if ext == "sqlite" 
@@ -298,6 +301,8 @@ module Coopy
       output
     end
     
+    # protected - in ruby this doesn't play well with static/inline methods
+    
     attr_accessor :status
     attr_accessor :daff_cmd
     
@@ -811,12 +816,19 @@ module Coopy
     class << self
     attr_accessor :version
     end
-    @version = "1.3.6"
+    @version = "1.3.8"
     
     def Coopy.diff_as_html(local,remote,flags = nil)
-      o = ::Coopy::Coopy.diff(local,remote,flags)
+      comp = ::Coopy::TableComparisonState.new
+      td = ::Coopy::Coopy.align(local,remote,flags,comp)
+      o = ::Coopy::Coopy.get_blank_table(td,comp)
+      o = comp.a.create if comp.a != nil
+      o = comp.b.create if o == nil && comp.b != nil
+      o = ::Coopy::SimpleTable.new(0,0) if o == nil
+      os = ::Coopy::Tables.new(o)
+      td.hilite_with_nesting(os)
       render = ::Coopy::DiffRender.new
-      render.render(o).html
+      render.render_tables(os).html
     end
     
     def Coopy.diff_as_ansi(local,remote,flags = nil)
@@ -827,6 +839,26 @@ module Coopy
     
     def Coopy.diff(local,remote,flags = nil)
       comp = ::Coopy::TableComparisonState.new
+      td = ::Coopy::Coopy.align(local,remote,flags,comp)
+      o = ::Coopy::Coopy.get_blank_table(td,comp)
+      o = comp.a.create if comp.a != nil
+      o = comp.b.create if o == nil && comp.b != nil
+      o = ::Coopy::SimpleTable.new(0,0) if o == nil
+      td.hilite(o)
+      o
+    end
+    
+    # protected - in ruby this doesn't play well with static/inline methods
+    
+    def Coopy.get_blank_table(td,comp)
+      o = nil
+      o = comp.a.create if comp.a != nil
+      o = comp.b.create if o == nil && comp.b != nil
+      o = ::Coopy::SimpleTable.new(0,0) if o == nil
+      o
+    end
+    
+    def Coopy.align(local,remote,flags,comp)
       comp.a = ::Coopy::Coopy.tablify(local)
       comp.b = ::Coopy::Coopy.tablify(remote)
       flags = ::Coopy::CompareFlags.new if flags == nil
@@ -834,14 +866,11 @@ module Coopy
       ct = ::Coopy::CompareTable.new(comp)
       align = ct.align
       td = ::Coopy::TableDiff.new(align,flags)
-      o = nil
-      o = comp.a.create if comp.a != nil
-      o = comp.b.create if o == nil && comp.b != nil
-      o = ::Coopy::SimpleTable.new(0,0) if o == nil
-      td.hilite(o)
-      o
+      td
     end
     
+    public
+    
     def Coopy.patch(local,patch,flags = nil)
       patcher = ::Coopy::HighlightPatch.new(::Coopy::Coopy.tablify(local),::Coopy::Coopy.tablify(patch))
       patcher.apply
@@ -959,8 +988,7 @@ module Coopy
     def Coopy.tablify(data)
       return data if data == nil
       return data if data.respond_to? :get_cell_view
-      require 'ruby_table_view' unless defined?(RubyTableView)
-      ::RubyTableView.new(data)
+      ::Coopy::TableView.new(data)
     end
     
   haxe_me ["coopy", "Coopy"]

data/lib/lib/coopy/diff_render.rb

@@ -97,6 +97,7 @@ module Coopy
     end
     
     def render(tab)
+      tab = ::Coopy::Coopy.tablify(tab)
       return self if tab.get_width == 0 || tab.get_height == 0
       render = self
       render.begin_table

data/lib/lib/coopy/json_table.rb

@@ -112,7 +112,7 @@ module Coopy
     end
     
     def create 
-      ::Coopy::JsonTable.new(nil,nil)
+      nil
     end
     
     def alter_columns(columns)

data/lib/lib/coopy/json_tables.rb

@@ -9,7 +9,7 @@ module Coopy
       names = Reflect.field(json,"names")
       allowed = nil
       count = names.length
-      if flags.tables != nil 
+      if flags != nil && flags.tables != nil 
         allowed = {}
         begin
           _g = 0
@@ -120,7 +120,7 @@ module Coopy
     end
     
     def create 
-      ::Coopy::JsonTables.new(nil,nil)
+      nil
     end
     
   haxe_me ["coopy", "JsonTables"]

data/lib/lib/coopy/table_diff.rb

@@ -953,6 +953,13 @@ module Coopy
     public
     
     def hilite(output)
+      output = ::Coopy::Coopy.tablify(output)
+      self.hilite_single(output)
+    end
+    
+    protected
+    
+    def hilite_single(output)
       return false if !output.is_resizable
       if @builder == nil 
         if @flags.allow_nested_cells 
@@ -1065,9 +1072,11 @@ module Coopy
       true
     end
     
+    public
+    
     def hilite_with_nesting(output)
       base = output.add("base")
-      result = self.hilite(base)
+      result = self.hilite_single(base)
       return false if !result
       return true if @align.comp == nil
       order = @align.comp.child_order
@@ -1086,7 +1095,7 @@ module Coopy
           end
           td = ::Coopy::TableDiff.new(alignment,@flags)
           child_output = output.add(name)
-          result = result && td.hilite(child_output)
+          result = result && td.hilite_single(child_output)
         end
       end
       result
@@ -1104,6 +1113,11 @@ module Coopy
       @nesting_present
     end
     
+    def get_comparison_state 
+      return nil if @align == nil
+      @align.comp
+    end
+    
   haxe_me ["coopy", "TableDiff"]
   end
 

data/lib/lib/coopy/table_view.rb

@@ -0,0 +1,148 @@
+module Coopy
+  class TableView < ::Coopy::Table
+    def initialize(data)
+      @data = data
+      @height = data.length
+      @width = 0
+      @width = data[0].length if @height>0
+    end
+
+    def get_width() @width end
+
+    def get_height() @height end
+
+    def get_cell(x,y)
+      @data[y][x]
+    end
+
+    def set_cell(x,y,c)
+      @data[y][x] = c
+    end
+
+    def to_s
+      ::Coopy::SimpleTable::table_to_string(self)
+    end
+
+    def get_cell_view
+      ::Coopy::SimpleView.new
+    end
+
+    def is_resizable
+      true
+    end
+
+    def resize(w,h)
+      @width = w
+      @height = h
+      @data.length.times do |i|
+        row = @data[i]
+        row = @data[i] = [] if row.nil?
+        while row.length<w
+          row << nil
+        end
+      end
+      while @data.length<h
+        row = []
+        w.times do |i|
+          row << nil
+        end
+        @data << row
+      end
+      true
+    end
+
+    def clear
+      @data.clear
+      @width = 0
+      @height = 0
+    end
+
+    def trim_blank
+      false
+    end
+
+    def get_data
+      return @data
+    end
+
+    def insert_or_delete_rows(fate,hfate)
+      ndata = []
+      fate.length.times do |i|
+        j = fate[i];
+        ndata[j] = @data[i] if j!=-1
+      end
+      @data.clear
+      ndata.length.times do |i|
+        @data[i] = ndata[i]
+      end
+      self.resize(@width,hfate)
+      true
+    end
+
+    def insert_or_delete_columns(fate,wfate)
+      if wfate==@width and wfate==fate.length
+        eq = true
+        wfate.times do |i|
+          if fate[i]!=i
+            eq = false
+            break
+          end
+        end
+        return true if eq
+      end
+      @height.times do |i|
+        row = @data[i]
+        nrow = []
+        @width.times do |j|
+          next if fate[j]==-1
+          nrow[fate[j]] = row[j]
+        end
+        while nrow.length<wfate
+          nrow << nil
+        end
+        @data[i] = nrow
+      end
+      @width = wfate
+      if @width == 0
+        @height = 0
+      end
+      true
+    end
+
+    def is_similar(alt)
+      return false if alt.width!=@width
+      return false if alt.height!=@height
+      @width.times do |c|
+        @height.times do |r|
+          v1 = "" + self.get_cell(c,r)
+          v2 = "" + alt.get_cell(c,r) 
+          if (v1!=v2)
+            puts("MISMATCH "+ v1 + " " + v2);
+            return false
+          end
+        end
+      end
+      true
+    end
+
+
+    def clone
+      result = TableView.new([])
+      result.resize(@width,@height)
+      @width.times do |c|
+        @height.times do |r|
+          result.set_cell(c,r,self.get_cell(c,r))
+        end
+      end
+      result
+    end
+
+    def create
+      TableView.new([])
+    end
+
+    def get_meta
+      nil
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daff
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.3.8
 platform: ruby
 authors:
 - James Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-05 00:00:00.000000000 Z
+date: 2016-01-03 00:00:00.000000000 Z
 dependencies: []
 description: Diff and patch tables
 email:
@@ -72,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/table_view.rb
 - lib/lib/coopy/tables.rb
 - lib/lib/coopy/terminal_diff_render.rb
 - lib/lib/coopy/unit.rb