texttable 1.1.2 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9952b36c316d6bfb8b99b98c83e6b443e8df7fab62098d48d2106bfaba910762
-  data.tar.gz: fac19dec457d9b53adbdb11a6f24b39496af73b882ab4abd856039f10c6b07e4
+  metadata.gz: 7e00f8d89b3eda372e1d263c439bde89c2a49fc514733c03d9d173c27d88a21b
+  data.tar.gz: bd3e7c03b5baa30ad80517ed68ed2cf14937ac037119a49af90e97bc99fe9cf0
 SHA512:
-  metadata.gz: 55ef3df123eaf0261b9c3962389b667828653ea50430ca31183c51418aedba3047f9522d5e2bb8b666a81263cd283d1bb63e0fbea75ece990b24cc654cc39562
-  data.tar.gz: 7198b28bdf371c91976476542a5b903f393009a5d2cbadb8ca1ba89911670453d536929588ced94f6d2f84c05335cf7f0a3568a8e008db079d3ae3ae75d13220
+  metadata.gz: 8983dbf73e36741f53acb51f953e88bfc2a77068ddd79aef042ed74e608e17d186d6c3f245bc6d8bcf548cfdb34bb3c40774af6df9e7375d8b6255a744affa10
+  data.tar.gz: c85f63f6c92c17475860fac370fb64c5990e7de39ebf471fcc722e099f6c3b36329d2309f3ea919851c48f99a2515f54b4ed3319f05c63e287fb5e30b04e8a8a

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)
@@ -21,9 +47,8 @@ class TextTable
     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,31 @@ 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)
+    out = kw.key?(:out) ? (kw.delete(:out) || "").dup : nil
+    csv = CSV.new(out || $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
+    out
   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, timestamps: false, verb: 'insert')
+  def sql(table='table', quote: false, timestamps: false, verb: 'insert', out: nil)
     q = quote ? '`' : ''
     flip = @cols.invert
     @rows.each do |vals|
@@ -167,9 +214,12 @@ class TextTable
         list
       end
       list.push('created_at=now(), updated_at=now()') if timestamps
-      puts "#{verb} into #{q}#{table}#{q} set #{list * ', '};" if !list.empty?
+      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.2"
+  s.version     = "1.1.7"
   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.2
+  version: 1.1.7
 platform: ruby
 authors:
 - Steve Shreeve
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-02 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.1.2
-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: []