daff 1.3.2 → 1.3.6

data/lib/lib/coopy/csv.rb

@@ -104,8 +104,27 @@ module Coopy
           tab.resize(w,h)
         end
         if at >= w 
-          w = at + 1
-          tab.resize(w,h)
+          if yat > 0 
+            if cell != "" && cell != nil 
+              context = ""
+              begin
+                _g = 0
+                while(_g < w) 
+                  i = _g
+                  _g+=1
+                  context += "," if i > 0
+                  begin
+                    s = tab.get_cell(i,yat)
+                    context += s.to_s
+                  end
+                end
+              end
+              puts "Ignored overflowing row " + _hx_str(yat) + " with cell '" + _hx_str(cell) + "' after: " + _hx_str(context)
+            end
+          else 
+            w = at + 1
+            tab.resize(w,h)
+          end
         end
         tab.set_cell(at,h - 1,cell)
         at+=1
@@ -157,7 +176,7 @@ module Coopy
                 @row_ended = true
                 break
               end
-              if ch == 34 || ch == 39 
+              if ch == 34 
                 if i == @cursor 
                   quoting = true
                   quote = ch

data/lib/lib/coopy/diff_render.rb

@@ -69,7 +69,11 @@ module Coopy
       cell_decorate = ""
       cell_decorate = " class=\"" + _hx_str(mode) + "\"" if mode != ""
       self.insert(_hx_str(@td_open) + _hx_str(cell_decorate) + ">")
-      self.insert(txt)
+      if txt != nil 
+        self.insert(txt)
+      else 
+        self.insert("null")
+      end
       self.insert(@td_close)
     end
     
@@ -144,6 +148,27 @@ module Coopy
       self
     end
     
+    def render_tables(tabs)
+      order = tabs.get_order
+      self.render(tabs.one) if order.length == 0 || tabs.has_ins_del
+      begin
+        _g1 = 1
+        _g = order.length
+        while(_g1 < _g) 
+          i = _g1
+          _g1+=1
+          name = order[i]
+          tab = tabs.get(name)
+          next if tab.get_height <= 1
+          self.insert("<h3>")
+          self.insert(name)
+          self.insert("</h3>\n")
+          self.render(tab)
+        end
+      end
+      self
+    end
+    
     def sample_css 
       ".highlighter .add { \n  background-color: #7fff7f;\n}\n\n.highlighter .remove { \n  background-color: #ff7f7f;\n}\n\n.highlighter td.modify { \n  background-color: #7f7fff;\n}\n\n.highlighter td.conflict { \n  background-color: #f00;\n}\n\n.highlighter .spec { \n  background-color: #aaa;\n}\n\n.highlighter .move { \n  background-color: #ffa;\n}\n\n.highlighter .null { \n  color: #888;\n}\n\n.highlighter table { \n  border-collapse:collapse;\n}\n\n.highlighter td, .highlighter th {\n  border: 1px solid #2D4068;\n  padding: 3px 7px 2px;\n}\n\n.highlighter th, .highlighter .header, .highlighter .meta {\n  background-color: #aaf;\n  font-weight: bold;\n  padding-bottom: 4px;\n  padding-top: 5px;\n  text-align:left;\n}\n\n.highlighter tr.header th {\n  border-bottom: 2px solid black;\n}\n\n.highlighter tr.index td, .highlighter .index, .highlighter tr.header th.index {\n  background-color: white;\n  border: none;\n}\n\n.highlighter .gap {\n  color: #888;\n}\n\n.highlighter td {\n  empty-cells: show;\n}\n"
     end
@@ -157,8 +182,6 @@ module Coopy
     
     def DiffRender.examine_cell(x,y,view,raw,vcol,vrow,vcorner,cell,offset = 0)
       nested = view.is_hash(raw)
-      value = nil
-      value = view.to_s(raw) if !nested
       cell.category = ""
       cell.category_given_tr = ""
       cell.separator = ""
@@ -166,8 +189,7 @@ module Coopy
       cell.conflicted = false
       cell.updated = false
       cell.meta = cell.pvalue = cell.lvalue = cell.rvalue = nil
-      cell.value = value
-      cell.value = "" if cell.value == nil
+      cell.value = raw
       cell.pretty_value = cell.value
       vrow = "" if vrow == nil
       vcol = "" if vcol == nil
@@ -204,14 +226,16 @@ module Coopy
           full = vrow
           part = tokens[1]
           part = full if part == nil
-          if nested || (cell.value.index(part,nil || 0) || -1) >= 0 
+          str = view.to_s(cell.value)
+          str = "" if str == nil
+          if nested || (str.index(part,nil || 0) || -1) >= 0 
             cat = "modify"
             div = part
             if part != full 
               if nested 
                 cell.conflicted = view.hash_exists(raw,"theirs")
               else 
-                cell.conflicted = (cell.value.index(full,nil || 0) || -1) >= 0
+                cell.conflicted = (str.index(full,nil || 0) || -1) >= 0
               end
               if cell.conflicted 
                 div = full
@@ -227,10 +251,14 @@ module Coopy
               else 
                 tokens = [view.hash_get(raw,"before"),view.hash_get(raw,"after")]
               end
-            elsif cell.pretty_value == div 
-              tokens = ["",""]
             else 
-              tokens = cell.pretty_value.split(div)
+              cell.pretty_value = view.to_s(cell.pretty_value)
+              cell.pretty_value = "" if cell.pretty_value == nil
+              if cell.pretty_value == div 
+                tokens = ["",""]
+              else 
+                tokens = cell.pretty_value.split(div)
+              end
             end
             pretty_tokens = tokens
             if tokens.length >= 2 

data/lib/lib/coopy/highlight_patch.rb

@@ -216,7 +216,7 @@ module Coopy
         while(_g1 < _g) 
           i = _g1
           _g1+=1
-          txt = self.get_string(i)
+          txt = self.get_datum(i)
           idx_patch = i
           idx_src = nil
           if @patch_in_source_col.include?(idx_patch) 

data/lib/lib/coopy/index.rb

@@ -12,7 +12,11 @@ module Coopy
       @height = 0
       @hdr = 0
       @ignore_whitespace = false
-      @ignore_whitespace = flags.ignore_whitespace if flags != nil
+      @ignore_case = false
+      if flags != nil 
+        @ignore_whitespace = flags.ignore_whitespace
+        @ignore_case = flags.ignore_case
+      end
     end
     
     attr_accessor :items
@@ -27,6 +31,7 @@ module Coopy
     attr_accessor :indexed_table
     attr_accessor :hdr
     attr_accessor :ignore_whitespace
+    attr_accessor :ignore_case
     
     public
     
@@ -83,6 +88,7 @@ module Coopy
           d = t.get_cell(@cols[k],i)
           txt = @v.to_s(d)
           txt = txt.strip if @ignore_whitespace
+          txt = txt.downcase if @ignore_case
           wide += " // " if k > 0
           next if txt == nil || txt == "" || txt == "null" || txt == "undefined"
           wide += txt
@@ -106,6 +112,7 @@ module Coopy
           _g1+=1
           txt = row.get_row_string(@cols[k])
           txt = txt.strip if @ignore_whitespace
+          txt = txt.downcase if @ignore_case
           wide += " // " if k > 0
           next if txt == nil || txt == "" || txt == "null" || txt == "undefined"
           wide += txt

data/lib/lib/coopy/json_table.rb

@@ -0,0 +1,165 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+module Coopy
+  class JsonTable 
+    
+    def initialize(data,name)
+      @data = data
+      @columns = Reflect.field(data,"columns")
+      @rows = Reflect.field(data,"rows")
+      @w = @columns.length
+      @h = @rows.length
+      @idx2col = {}
+      begin
+        _g1 = 0
+        _g = @columns.length
+        while(_g1 < _g) 
+          idx = _g1
+          _g1+=1
+          begin
+            v = @columns[idx]
+            @idx2col[idx] = v
+            v
+          end
+        end
+      end
+      @name = name
+    end
+    
+    protected
+    
+    attr_accessor :w
+    attr_accessor :h
+    attr_accessor :columns
+    attr_accessor :rows
+    attr_accessor :data
+    attr_accessor :idx2col
+    attr_accessor :name
+    
+    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 
+      @w
+    end
+    
+    def get_height 
+      @h + 1
+    end
+    
+    def get_cell(x,y)
+      return @idx2col[x] if y == 0
+      Reflect.field(@rows[y - 1],@idx2col[x])
+    end
+    
+    def set_cell(x,y,c)
+      puts "JsonTable is read-only"
+    end
+    
+    def to_s 
+      ""
+    end
+    
+    def get_cell_view 
+      ::Coopy::SimpleView.new
+    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)
+      false
+    end
+    
+    def trim_blank 
+      false
+    end
+    
+    def get_data 
+      nil
+    end
+    
+    def clone 
+      nil
+    end
+    
+    def set_meta(meta)
+    end
+    
+    def get_meta 
+      self
+    end
+    
+    def create 
+      ::Coopy::JsonTable.new(nil,nil)
+    end
+    
+    def alter_columns(columns)
+      false
+    end
+    
+    def change_row(rc)
+      false
+    end
+    
+    def apply_flags(flags)
+      false
+    end
+    
+    def as_table 
+      nil
+    end
+    
+    def clone_meta(table = nil)
+      nil
+    end
+    
+    def use_for_column_changes 
+      false
+    end
+    
+    def use_for_row_changes 
+      false
+    end
+    
+    def get_row_stream 
+      nil
+    end
+    
+    def is_nested 
+      false
+    end
+    
+    def is_sql 
+      false
+    end
+    
+    def get_name 
+      @name
+    end
+    
+  haxe_me ["coopy", "JsonTable"]
+  end
+
+end

data/lib/lib/coopy/json_tables.rb

@@ -0,0 +1,129 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+module Coopy
+  class JsonTables 
+    
+    def initialize(json,flags)
+      @db = json
+      names = Reflect.field(json,"names")
+      allowed = nil
+      count = names.length
+      if flags.tables != nil 
+        allowed = {}
+        begin
+          _g = 0
+          _g1 = flags.tables
+          while(_g < _g1.length) 
+            name = _g1[_g]
+            _g+=1
+            allowed[name] = true
+          end
+        end
+        count = 0
+        begin
+          _g2 = 0
+          while(_g2 < names.length) 
+            name1 = names[_g2]
+            _g2+=1
+            count+=1 if allowed.include?(name1)
+          end
+        end
+      end
+      @t = ::Coopy::SimpleTable.new(2,count + 1)
+      @t.set_cell(0,0,"name")
+      @t.set_cell(1,0,"table")
+      v = @t.get_cell_view
+      at = 1
+      begin
+        _g3 = 0
+        while(_g3 < names.length) 
+          name2 = names[_g3]
+          _g3+=1
+          if allowed != nil 
+            next if !allowed.include?(name2)
+          end
+          @t.set_cell(0,at,name2)
+          tab = Reflect.field(@db,"tables")
+          tab = Reflect.field(tab,name2)
+          @t.set_cell(1,at,v.wrap_table(::Coopy::JsonTable.new(tab,name2)))
+          at+=1
+        end
+      end
+    end
+    
+    protected
+    
+    attr_accessor :db
+    attr_accessor :t
+    attr_accessor :flags
+    
+    public
+    
+    def height() get_height end
+    def height=(__v) @height = __v end
+    def width() get_width end
+    def width=(__v) @width = __v end
+    
+    def get_cell(x,y)
+      @t.get_cell(x,y)
+    end
+    
+    def set_cell(x,y,c)
+    end
+    
+    def get_cell_view 
+      @t.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)
+      false
+    end
+    
+    def trim_blank 
+      false
+    end
+    
+    def get_width 
+      @t.get_width
+    end
+    
+    def get_height 
+      @t.get_height
+    end
+    
+    def get_data 
+      nil
+    end
+    
+    def clone 
+      nil
+    end
+    
+    def get_meta 
+      ::Coopy::SimpleMeta.new(self,true,true)
+    end
+    
+    def create 
+      ::Coopy::JsonTables.new(nil,nil)
+    end
+    
+  haxe_me ["coopy", "JsonTables"]
+  end
+
+end