texttable 1.1.0 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7dc849d43312afb4106b6db6908f154f937409c3ac780a6d2ee36645f7155e7d
-  data.tar.gz: d947accbe4d63f66d6c9d321aa96f8936a594d4c5a3e34dd05259b61645bb3c7
+  metadata.gz: 926d3d58ed1350f3e78c718e4064b1200fb214bedad5227ef477971248e2a358
+  data.tar.gz: dc52ecae113f0385042fbf1fa1aee9b4f7ba92a2ae1d9f1e07d7706b05cf9a45
 SHA512:
-  metadata.gz: b40935ce7e9ea135221c2505cb6ea7c597d67f5d9e991b834c801ef7eb3fd162e1d320b2eec1c3b835bc343d4f8d5c5f5afebf7ba2b7e28164c69d16166b97d3
-  data.tar.gz: 1e21bbc4c2ebf4439910113ee6d0136c36894f2c7d2e357a82163e3e69842f051ea9903be5bed95cafc15a0a226a0f379655ba0df631b4301cdd5ddbaf3f3cf4
+  metadata.gz: 7c618a01e4a46eca7bb4b2bec56921c0ada77d1ba6570510e1b968b576d8c914cf9d4322ea3ca2c1351a6521ced8b9868cd76a7db332b4e56b2a9d9cebdeb097
+  data.tar.gz: 1368fb476f90884563b4ac0abdd89b014bfdb3c32a4613b1801d32eb3eabd23643ebb92f574670ed7c1820235a097a8f65fb0da28efccf9af4f4cbfe78dc0b12

data/lib/texttable.rb

@@ -2,15 +2,41 @@ class TextTable
   attr_accessor :values, :rows
 
   class << self
-    def csv(src, sep=',', encoding: nil)
+    def csv(src, sep=',', encoding: nil, **kw)
       require 'csv'
       new CSV.read(src || ARGF, {
         col_sep:  sep,
         encoding: encoding ? encoding + ":UTF-8" : nil,
+        **kw
       }.compact)
     end
-    def tsv(*args); csv(args.shift, "\t", *args); end
-    def psv(*args); csv(args.shift, "|" , *args); end
+    def tsv(*args, **kw); csv(args.shift, "\t", *args, **kw); end
+    def psv(*args, **kw); csv(args.shift, "|" , *args, **kw); end
+
+    def add(*args)
+      new.add(*args)
+    end
+
+    def load(data, delim="\t", headers=true)
+      case data
+      when String
+        if data.include?(delim) # string
+          text = data
+        elsif File.exist?(data) # filename
+          text = File.read(data)
+        end
+      when File, ARGF
+        text = data.read
+      end
+
+      text or raise "unable to load #{data.inspect}"
+      rows = text.split(/\r?\n/).map {|line| line.split(delim).map {|part| part.strip}}
+      info = new
+      rows.shift.each_with_index {|col, i| info.index!(col || i) } if headers
+      info.rows = rows
+      info.row(0)
+      info
+    end
   end
 
   def initialize(*args)
@@ -18,12 +44,11 @@ class TextTable
     cols        =  cols[0] if           cols[0].is_a?(Array) && cols[0][0].is_a?(Array)
     cols, *rows =  cols    if           cols[0].is_a?(Array)
     rows        = *rows[0] if  rows &&  rows[0].is_a?(Array) && rows[0][0].is_a?(Array)
-    rows        = []       if !rows || !rows[0].is_a?(Array)
+    rows        = []       if !rows || !rows[0].is_a?(Array) || rows[0].empty?
     @cols = Hash.new {|h,k| h[k] = h.size}
     @rows = rows
-    @values = nil
-    @row = 0
-    cols.each {|col| index!(col) }
+    row(0)
+    cols.each_with_index {|col, i| index!(col || i) }
   end
 
   def index(field, auto=false)
@@ -86,6 +111,10 @@ class TextTable
     @rows.each_with_index {|_, row| yield(row(row)) }
   end
 
+  def each_pair
+    @cols.each {|col, pos| yield col, @values[pos] }
+  end
+
   def [](field, val=nil)
     index = index(field)
     value = vals[index] if index
@@ -114,13 +143,15 @@ class TextTable
     obj = [obj, *args] if args.size > 0
     @values = @rows[@row = @rows.size] = []
     case obj
-      when Hash  then obj.each {|k, v| @values[@cols[k]] = v}
+      when Hash  then obj.each {|k, v| @values[index(k.to_s, true)] = v }
       when Array then @values.replace(obj)
       else raise "unable to add #{obj.class} objects"
     end
     self
   end
 
+  alias :<< :add
+
   def show(*)
     self
   end
@@ -128,15 +159,20 @@ class TextTable
   def show!(list=nil)
     meth = list.is_a?(Array) ? list.method(:push) : method(:puts)
     join = " | "
-    both = [@cols.keys] + rows
-    flip = both.transpose
-    wide = flip.map {|row| row.map {|col| col.to_s.size }.max }
-    pict = wide.map {|len| "%-#{len}.#{len}s" }.join(join)
+    size = @cols.size
+    full = [@cols.keys] + rows
+    full.each_with_index do |vals, i| # only when asymmetric
+      miss = size - vals.size
+      full[i] += [nil] * miss  if miss > 0
+      full[i] = vals[0...size] if miss < 0
+    end
+    lens = full.map {|r| r.map {|c| c.to_s.size}}.transpose.map(&:max)
+    pict = lens.map {|len| "%-#{len}.#{len}s" }.join(join)
     pict = [join, pict, join].join.strip
-    line = (pict % ([""] * @cols.size)).tr("| ", "+-")
+    line = (pict % ([""] * size)).tr("| ", "+-")
     seen = -1
     meth["", line]
-    both.each do |vals|
+    full.each do |vals|
       meth[pict % vals]
       meth[line] if (seen += 1) == 0
     end
@@ -144,20 +180,30 @@ class TextTable
     self
   end
 
-  def csv(sep=',', encoding: nil)
+  def lookup!(field)
+    @rows or raise "no rows defined"
+    index = index(field)
+    lookup = {}
+    @rows.each_with_index {|cols, i| lookup[cols[index]] = i}
+    lookup
+  end
+
+  def csv(sep=',', encoding: nil, **kw)
     require 'csv'
-    csv = {}
-    csv[:encoding] = encoding + ":UTF-8" if encoding
-    csv[:col_sep ] = sep
-    csv = CSV.new($stdout, csv)
+    csv = CSV.new($stdout, {
+      col_sep:     sep,
+      encoding:    encoding ? encoding + ":UTF-8" : nil,
+      quote_empty: false, #!# TODO: make this an option
+      **kw
+    })
     csv << @cols.keys
     @rows.each {|vals| csv << vals}
     nil
   end
-  def tsv; csv("\t"); end
-  def psv; csv("|" ); end
+  def tsv(**kw); csv("\t", **kw); end
+  def psv(**kw); csv("|" , **kw); end
 
-  def sql(table='table', quote: false)
+  def sql(table='table', quote: false, timestamps: false, verb: 'insert', out: nil)
     q = quote ? '`' : ''
     flip = @cols.invert
     @rows.each do |vals|
@@ -166,9 +212,13 @@ class TextTable
         list << "#{q}#{flip[i]}#{q}='#{item.gsub("'","''")}'" if item =~ /\S/
         list
       end
-      puts "insert into #{q}#{table}#{q} set #{list * ', '};" if !list.empty?
+      list.push('created_at=now(), updated_at=now()') if timestamps
+      if !list.empty?
+        line = "#{verb} into #{q}#{table}#{q} set #{list * ', '};"
+        out ? (out << line) : puts(line)
+      end
     end
-    nil
+    out
   end
 end
 

data/texttable.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "texttable"
-  s.version     = "1.1.0"
+  s.version     = "1.1.6"
   s.author      = "Steve Shreeve"
   s.email       = "steve.shreeve@gmail.com"
   s.summary     = "An easy way to work with rows and columns as simple tables"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: texttable
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.6
 platform: ruby
 authors:
 - Steve Shreeve
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-27 00:00:00.000000000 Z
+date: 2021-03-25 00:00:00.000000000 Z
 dependencies: []
 description: This gem will auto-size based on column widths.
 email: steve.shreeve@gmail.com
@@ -26,7 +26,7 @@ homepage: https://github.com/shreeve/texttable
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -41,8 +41,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: An easy way to work with rows and columns as simple tables
 test_files: []