fat_table 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 558944c93313d81954da19744fec105b8562a4634781f77accd0fd7677dce76b
-  data.tar.gz: e301c37c690d01a77a24679e676c35cefd0f68b01d72b4e16835e54e44223790
+  metadata.gz: af65227dda201238ba06b2296e548bcfbab9cc209ad66fc7e5efafe6bbcde8d5
+  data.tar.gz: f59e53d1ec7aa54a36e96d475f32d50e0d7b668a838476fe3e73f9cd091396f4
 SHA512:
-  metadata.gz: 6430e39eb4261ab51eb855a0e3119e7bfae2e0f104215e637d8091d8d2ba4847f8b2e91ee1b1be08531bc69a72dc4a4b6233fbbc2d0f8fa7b43c11c73ac8c305
-  data.tar.gz: 1eec9ab1576cdda1ebdcd0833601573f343ecab9cd16244c6fd4038b6a3dc86ba7303b693e7c7d852ef1443e9b2b3d20b9ff32ccb652fcb73a92e7337d3511c7
+  metadata.gz: 3e5d1f93e4c0fb505afd5f8f5e1c2cb918d31653a4c64ce2db63cd20733fdccd75649f756cb90597c761a61a26d4a76ddaf8a34f7f9f4db8029cd93db62dc70d
+  data.tar.gz: a6f8b68c21b13382cb6cff7b65f05ed8de120d6e1296ccf2376152da92ba30efbee5196d9b792642e8f3097ed57f11147cc5eac65a330acb4efe4719bae51a79

data/.travis.yml

@@ -17,4 +17,5 @@ rvm:
   - 2.3
   - 2.4
   - 2.5
+  - 2.6
   - ruby-head

data/README.org

@@ -533,7 +533,7 @@ database parameters to be used for the queries.
 #+BEGIN_SRC ruby
   # This automatically requires sequel.
   require 'fat_table'
-  FatTable.set_db(adapter: 'postgres',
+  FatTable.connect(adapter: 'postgres',
                   database: 'XXX_development',
                   user: 'ken',
                   password: 'imsecret',
@@ -541,8 +541,8 @@ database parameters to be used for the queries.
   tab = FatTable.from_sql('select * from trades;')
 #+END_SRC
 
-The arguments to ~set_db~ are simply passed on to ~sequel~'s connect method, so
-any set of arguments that work for it should work for ~set_db~. Alternatively,
+The arguments to ~connect~ are simply passed on to ~sequel~'s connect method, so
+any set of arguments that work for it should work for ~connect~. Alternatively,
 you can build the ~Sequel~ connection directly with ~Sequel.connect~ or with
 adapter-specific ~Sequel~ connection methods and let ~FatTable~ know to use that
 connection:
@@ -556,8 +556,8 @@ connection:
 Consult ~Sequel's~ documentation for details on its connection methods.
 [[http://sequel.jeremyevans.net/rdoc/files/doc/opening_databases_rdoc.html]]
 
-The ~.set_db~ function need only be called once, and the database handle it
-creates will be used for all subsequent ~.from_sql~ calls until ~.set_db~ is
+The ~.connect~ function need only be called once, and the database handle it
+creates will be used for all subsequent ~.from_sql~ calls until ~.connect~ is
 called again.
 
 *** Marking Groups in Input

data/README.rdoc

@@ -485,7 +485,7 @@ Another way to initialize a +FatTable+ table is with the results of a SQL query.
 database parameters to be used for the queries.
 
   require 'fat_table'
-  FatTable.set_db(driver: 'Pg',
+  FatTable.connect(driver: 'Pg',
                   database: 'XXX_development',
                   user: 'dtd',
                   password: 'slflpowert',
@@ -493,15 +493,15 @@ database parameters to be used for the queries.
                   socket: '/tmp/.s.PGSQL.5432')
   tab = FatTable.from_sql('select * from trades;')
 
-Some of the parameters to the +.set_db+ function have defaults. The driver
+Some of the parameters to the +.connect+ function have defaults. The driver
 defaults to 'Pg' for postgresql and the socket defaults to +/tmp/.s.PGSQL.5432+
 if the host is 'localhost', which it is by default. If the host is not
 'localhost', the dsn uses a port rather than a socket and defaults to port
 '5432'. While user and password default to nil, the database parameter is
 required.
 
-The +.set_db+ function need only be called once, and the database handle it
-creates will be used for all subsequent +.from_sql+ calls until +.set_db+ is
+The +.connect+ function need only be called once, and the database handle it
+creates will be used for all subsequent +.from_sql+ calls until +.connect+ is
 called again.
 
 === Marking Groups in Input

data/lib/fat_table.rb

@@ -114,7 +114,7 @@ module FatTable
   end
 
   # Construct a Table by running a SQL query against the database set up with
-  # FatTable.set_db. Return the Table with the query results as rows and the
+  # FatTable.connect. Return the Table with the query results as rows and the
   # headers from the query, converted to symbols, as headers.
   def self.from_sql(query)
     Table.from_sql(query)

data/lib/fat_table/column.rb

@@ -21,7 +21,7 @@ module FatTable
     attr_reader :type
 
     # An Array of the items of this Column, all of which must be values of the
-    # Columns type or a nil.  This Array contains the value of the item after
+    # Column's type or a nil.  This Array contains the value of the item after
     # conversion to a native Ruby type, such as TrueClass, Date, DateTime,
     # Integer, String, etc.  Thus, you can perform operations on the items,
     # perhaps after removing nils with +.items.compact+.
@@ -92,6 +92,7 @@ module FatTable
       @type = 'NilClass'
       msg = "unknown column type '#{type}"
       raise UserError, msg unless TYPES.include?(@type.to_s)
+
       @items = []
       items.each { |i| self << i }
     end
@@ -103,8 +104,8 @@ module FatTable
     # :category: Attributes
 
     # Return the item of the Column at the given index.
-    def [](k)
-      items[k]
+    def [](idx)
+      items[idx]
     end
 
     # :category: Attributes
@@ -229,11 +230,13 @@ module FatTable
     # average back to a DateTime.
     def avg
       only_with('avg', 'DateTime', 'Numeric')
+      itms = items.compact
+      size = itms.size.to_d
       if type == 'DateTime'
-        avg_jd = items.compact.map(&:jd).sum / items.compact.size.to_d
+        avg_jd = itms.map(&:jd).sum / size
         DateTime.jd(avg_jd)
       else
-        sum / items.compact.size.to_d
+        itms.sum / size
       end
     end
 
@@ -515,7 +518,7 @@ module FatTable
     # looks like one. Any Float is promoted to a BigDecimal. Otherwise return
     # nil.
     def convert_to_numeric(val)
-      return BigDecimal.new(val, Float::DIG) if val.is_a?(Float)
+      return BigDecimal(val, Float::DIG) if val.is_a?(Float)
       return val if val.is_a?(Numeric)
       # Eliminate any commas, $'s (or other currency symbol), or _'s.
       cursym = Regexp.quote(FatTable.currency_symbol)
@@ -524,7 +527,7 @@ module FatTable
       return nil if val.blank?
       case val
       when /(\A[-+]?\d+\.\d*\z)|(\A[-+]?\d*\.\d+\z)/
-        BigDecimal.new(val.to_s.clean)
+        BigDecimal(val.to_s.clean)
       when /\A[-+]?[\d]+\z/
         val.to_i
       when %r{\A([-+]?\d+)\s*[:/]\s*([-+]?\d+)\z}

data/lib/fat_table/db_handle.rb

@@ -51,7 +51,7 @@ module FatTable
   # successfully, this establishes the database handle to use for all subsequent
   # calls to FatTable.from_sql or FatTable::Table.from_sql. You can then access
   # the handle if needed with FatTable.db.
-  def self.set_db(args)
+  def self.connect(args)
     # Set the dsn for Sequel
     begin
       self.handle = Sequel.connect(args)
@@ -67,7 +67,7 @@ module FatTable
   end
 
   # Directly set the db handle to a Sequel connection formed without
-  # FatTable.set_db.
+  # FatTable.connect.
   def self.db=(db)
     self.handle = db
   end

data/lib/fat_table/evaluator.rb

@@ -20,23 +20,25 @@ module FatTable
     def initialize(ivars: {}, before: nil, after: nil)
       @before = before
       @after = after
-      set_instance_vars(ivars)
+      instance_vars(ivars)
     end
 
     # Set the @group instance variable to the given value.
     def update_ivars(ivars)
-      set_instance_vars(ivars)
+      instance_vars(ivars)
     end
 
     # Run any before hook in the context of the given local variables.
     def eval_before_hook(locals: {})
       return if @before.blank?
+
       evaluate(@before, locals: locals)
     end
 
     # Run any after hook in the context of the given local variables.
     def eval_after_hook(locals: {})
       return if @after.blank?
+
       evaluate(@after, locals: locals)
     end
 
@@ -44,19 +46,21 @@ module FatTable
     # instance variables set in Evaluator.new and any local variables set in the
     # Hash parameter +locals+ are available to the expression.
     def evaluate(expr = '', locals: {})
-      eval(expr, set_local_vars(binding, locals))
+      eval(expr, local_vars(binding, locals))
     end
 
     private
 
-    def set_instance_vars(vars = {})
+    # Set the instance variables according to Hash vars.
+    def instance_vars(vars = {})
       vars.each_pair do |name, val|
         name = "@#{name}" unless name.to_s.start_with?('@')
         instance_variable_set(name, val)
       end
     end
 
-    def set_local_vars(bnd, vars = {})
+    # Set the local variables within the binding bnd according to Hash vars.
+    def local_vars(bnd, vars = {})
       vars.each_pair do |name, val|
         bnd.local_variable_set(name, val)
       end

data/lib/fat_table/formatters/aoa_formatter.rb

@@ -30,20 +30,20 @@ module FatTable
       '['
     end
 
-    def pre_cell(_h)
+    def pre_cell(_val)
       "'"
     end
 
     # Because the cell, after conversion to a single-quoted string will be
     # eval'ed, we need to escape any single-quotes (') that appear in the
     # string.
-    def quote_cell(v)
-      if v.match?(/'/)
+    def quote_cell(val)
+      if val.match?(/'/)
         # Use a negative look-behind to only quote single-quotes that are not
         # already preceded by a backslash
-        v.gsub(/(?<!\\)'/, "'" => "\\'")
+        val.gsub(/(?<!\\)'/, "'" => "\\'")
       else
-        v
+        val
       end
     end
 

data/lib/fat_table/formatters/aoh_formatter.rb

@@ -30,20 +30,20 @@ module FatTable
       '{'
     end
 
-    def pre_cell(h)
-      ":#{h.as_sym} => '"
+    def pre_cell(head)
+      ":#{head.as_sym} => '"
     end
 
     # Because the cell, after conversion to a single-quoted string will be
     # eval'ed, we need to escape any single-quotes (') that appear in the
     # string.
-    def quote_cell(v)
-      if v.match?(/'/)
+    def quote_cell(val)
+      if val.match?(/'/)
         # Use a negative look-behind to only quote single-quotes that are not
         # already preceded by a backslash
-        v.gsub(/(?<!\\)'/, "'" => "\\'")
+        val.gsub(/(?<!\\)'/, "'" => "\\'")
       else
-        v
+        val
       end
     end
 

data/lib/fat_table/formatters/formatter.rb

@@ -92,9 +92,10 @@ module FatTable
     # Formatter is yielded to the block so that methods for formatting and
     # adding footers can be called on it.
     def initialize(table = Table.new, **options)
-      unless table && table.is_a?(Table)
+      unless table&.is_a?(Table)
         raise UserError, 'must initialize Formatter with a Table'
       end
+
       @table = table
       @options = options
       @footers = {}
@@ -170,12 +171,14 @@ module FatTable
         unless table.headers.include?(h)
           raise UserError, "No '#{h}' column in table to sum in the footer"
         end
+
         foot[h] = :sum
       end
       agg_cols.each do |h, agg|
         unless table.headers.include?(h)
           raise UserError, "No '#{h}' column in table to #{agg} in the footer"
         end
+
         foot[h] = agg
       end
       @footers[label] = foot
@@ -208,12 +211,14 @@ module FatTable
         unless table.headers.include?(h)
           raise UserError, "No '#{h}' column in table for group sum footer"
         end
+
         foot[h] = :sum
       end
       agg_cols.each do |h, agg|
         unless table.headers.include?(h)
           raise UserError, "No '#{h}' column in table for #{agg} group footer"
         end
+
         foot[h] = agg
       end
       @gfooters[label] = foot
@@ -466,6 +471,7 @@ module FatTable
       unless LOCATIONS.include?(location)
         raise UserError, "unknown format location '#{location}'"
       end
+
       valid_keys = table.headers + %i[string numeric datetime boolean nil]
       invalid_keys = (fmts.keys - valid_keys).uniq
       unless invalid_keys.empty?
@@ -487,18 +493,18 @@ module FatTable
           # Merge in string and nil formatting, but not in header.  Header is
           # always typed a string, so it will get formatted in type-based
           # formatting below. And headers are never nil.
-          if fmts.keys.include?(:string)
+          if fmts.key?(:string)
             typ_fmt = parse_string_fmt(fmts[:string])
             format_h = format_h.merge(typ_fmt)
           end
-          if fmts.keys.include?(:nil)
+          if fmts.key?(:nil)
             typ_fmt = parse_nil_fmt(fmts[:nil]).first
             format_h = format_h.merge(typ_fmt)
           end
         end
         typ = location == :header ? :string : table.type(h).as_sym
         parse_typ_method_name = 'parse_' + typ.to_s + '_fmt'
-        if fmts.keys.include?(typ)
+        if fmts.key?(typ)
           # Merge in type-based formatting
           typ_fmt = send(parse_typ_method_name, fmts[typ])
           format_h = format_h.merge(typ_fmt)
@@ -547,7 +553,7 @@ module FatTable
     private
 
     # Re to match a color name
-    CLR_RE = /(?:[-_a-zA-Z0-9 ]*)/
+    CLR_RE = /(?:[-_a-zA-Z0-9 ]*)/.freeze
 
     # Return a hash that reflects the formatting instructions given in the
     # string fmt. Raise an error if it contains invalid formatting instructions.
@@ -558,6 +564,7 @@ module FatTable
       unless fmt.blank? || !strict
         raise UserError, "unrecognized string formatting instructions '#{fmt}'"
       end
+
       format
     end
 
@@ -668,6 +675,7 @@ module FatTable
       unless fmt.blank? || !strict
         raise UserError, "unrecognized numeric formatting instructions '#{fmt}'"
       end
+
       fmt_hash
     end
 
@@ -739,6 +747,7 @@ module FatTable
       unless fmt.blank? || !strict
         raise UserError, "unrecognized boolean formatting instructions '#{fmt}'"
       end
+
       fmt_hash
     end
 
@@ -810,6 +819,7 @@ module FatTable
     # specializing this method.
     def format_boolean(val, istruct)
       return istruct.nil_text if val.nil?
+
       val ? istruct.true_text : istruct.false_text
     end
 
@@ -820,6 +830,7 @@ module FatTable
     # specializing this method.
     def format_datetime(val, istruct)
       return istruct.nil_text if val.nil?
+
       if val.to_date == val
         # It is a Date, with no time component.
         val.strftime(istruct.date_fmt)
@@ -835,6 +846,7 @@ module FatTable
     # specializing this method.
     def format_numeric(val, istruct)
       return istruct.nil_text if val.nil?
+
       val = val.round(istruct.post_digits) if istruct.post_digits >= 0
       if istruct.hms
         result = val.secs_to_hms
@@ -998,6 +1010,7 @@ module FatTable
       new_rows.each do |loc_row|
         result += hline(widths) if loc_row.nil?
         next if loc_row.nil?
+
         _loc, row = *loc_row
         result += pre_row
         cells = []
@@ -1140,6 +1153,7 @@ module FatTable
       end
       rows.each do |loc_row|
         next if loc_row.nil?
+
         _loc, row = *loc_row
         row.each_pair do |h, (_v, fmt_v)|
           widths[h] ||= 0
@@ -1222,12 +1236,12 @@ module FatTable
       ''
     end
 
-    def pre_cell(_h)
+    def pre_cell(_head)
       ''
     end
 
-    def quote_cell(v)
-      v
+    def quote_cell(val)
+      val
     end
 
     def post_cell

data/lib/fat_table/formatters/latex_formatter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module FatTable
   # A subclass of Formatter for rendering the table as a LaTeX table. It allows
   # foreground colors through LaTeX's xcolor package but ignores background
@@ -17,7 +19,6 @@ module FatTable
     #   LaTeX tabular-like environment to use for the table. The default is good
     #   for tables that might continue over multiple pages since it repeats the
     #   header at the top of each continuation page.
-
     def initialize(table = Table.new, **options)
       super
       @options[:document] = options.fetch(:document, false)
@@ -115,7 +116,8 @@ module FatTable
       result = ''
       result += '\\bfseries{}' if istruct.bold
       result += '\\itshape{}' if istruct.italic
-      result += "\\color{#{istruct.color}}" if istruct.color && istruct.color != 'none'
+      result += "\\color{#{istruct.color}}" if istruct.color &&
+                                               istruct.color != 'none'
       result = "#{result}#{str}"
       unless istruct.alignment == format_at[:body][istruct._h].alignment
         ac = alignment_code(istruct.alignment)
@@ -173,14 +175,14 @@ module FatTable
       ''
     end
 
-    def pre_cell(_h)
+    def pre_cell(_head)
       ''
     end
 
     # We do quoting before applying decoration, so do not re-quote here.  We
     # will have LaTeX commands in v.
-    def quote_cell(v)
-      v
+    def quote_cell(val)
+      val
     end
 
     def post_cell

data/lib/fat_table/formatters/org_formatter.rb

@@ -30,12 +30,12 @@ module FatTable
       '|'
     end
 
-    def pre_cell(_h)
+    def pre_cell(_head)
       ''
     end
 
-    def quote_cell(v)
-      v
+    def quote_cell(val)
+      val
     end
 
     def post_cell

data/lib/fat_table/formatters/term_formatter.rb

@@ -27,6 +27,7 @@ module FatTable
       @options[:unicode] = options.fetch(:unicode, true)
       @options[:framecolor] = options.fetch(:framecolor, 'none.none')
       return unless @options[:framecolor] =~ /([-_a-zA-Z]*)(\.([-_a-zA-Z]*))/
+
       @options[:frame_fg] = $1.downcase unless $1.blank?
       @options[:frame_bg] = $3.downcase unless $3.blank?
     end
@@ -59,6 +60,7 @@ module FatTable
 
     def strip_ansi(str)
       return '' unless str
+
       str.gsub(/\e\[[0-9;]+m/, '')
     end
 
@@ -73,18 +75,19 @@ module FatTable
       result
     end
 
-    def colorize(str, fg, bg)
-      fg = nil if fg == 'none'
-      bg = nil if bg == 'none'
-      return str unless fg || bg
+    def colorize(str, fg_color, bg_color)
+      fg_color = nil if fg_color == 'none'
+      bg_color = nil if bg_color == 'none'
+      return str unless fg_color || bg_color
+
       result = Rainbow(str)
-      if fg
-        fg = fg.tr(' ', '').downcase.as_sym
-        result = result.color(fg) if fg
+      if fg_color
+        fg_color = fg_color.tr(' ', '').downcase.as_sym
+        result = result.color(fg_color) if fg_color
       end
-      if bg
-        bg = bg.tr(' ', '').downcase.as_sym
-        result = result.bg(bg) if bg
+      if bg_color
+        bg_color = bg_color.tr(' ', '').downcase.as_sym
+        result = result.bg(bg_color) if bg_color
       end
       result
     end
@@ -229,12 +232,12 @@ module FatTable
       frame_colorize(vertical_rule)
     end
 
-    def pre_cell(_h)
+    def pre_cell(_head)
       ''
     end
 
-    def quote_cell(v)
-      v
+    def quote_cell(val)
+      val
     end
 
     def post_cell

data/lib/fat_table/formatters/text_formatter.rb

@@ -26,12 +26,12 @@ module FatTable
       '|'
     end
 
-    def pre_cell(_h)
+    def pre_cell(_head)
       ''
     end
 
-    def quote_cell(v)
-      v
+    def quote_cell(val)
+      val
     end
 
     def post_cell

data/lib/fat_table/patches.rb

@@ -19,8 +19,8 @@ end
 unless ''.respond_to?(:match?)
   # Add String#match? to pre-2.4 ruby
   class String
-    def match?(re)
-      self =~ re
+    def match?(regexp)
+      self =~ regexp
     end
   end
 end
@@ -35,6 +35,7 @@ unless //.respond_to?(:match?)
 end
 
 unless ''.respond_to?(:strip_heredoc)
+  # Patch String to provide heredocs with whitespace stripped
   class String
     def strip_heredoc
       indent = chomp.scan(/^\s*/).min.size

data/lib/fat_table/table.rb

@@ -106,18 +106,19 @@ module FatTable
     # :category: Constructors
 
     # Construct a new table from an Array of Arrays +aoa+. By default, with
-    # +hlines+ set to false, do not look for separators, i.e. +nils+, just treat
-    # the first row as headers. With +hlines+ set true, expect +nil+ separators
-    # to mark the header row and any boundaries. If the second element of the
-    # array is a +nil+, interpret the first element of the array as a row of
-    # headers. Otherwise, synthesize headers of the form +:col_1+, +:col_2+, ...
-    # and so forth. The remaining elements are taken as the body of the table,
-    # except that if an element of the outer array is a +nil+, mark the
-    # preceding row as a group boundary. Note for Emacs users: In org mode code
-    # blocks when an org-mode table is passed in as a variable it is passed in
-    # as an Array of Arrays. By default (+ HEADER: :hlines no +) org-mode strips
-    # all from the table; otherwise (+ HEADER: :hlines yes +) they are indicated
-    # with nil elements in the outer array.
+    # +hlines+ set to false, do not look for separators, i.e. +nils+, just
+    # treat the first row as headers. With +hlines+ set true, expect +nil+
+    # separators to mark the header row and any boundaries. If the second
+    # element of the array is a +nil+, interpret the first element of the
+    # array as a row of headers. Otherwise, synthesize headers of the form
+    # +:col_1+, +:col_2+, ...  and so forth. The remaining elements are taken
+    # as the body of the table, except that if an element of the outer array
+    # is a +nil+, mark the preceding row as a group boundary. Note for Emacs
+    # users: In org mode code blocks when an org-mode table is passed in as a
+    # variable it is passed in as an Array of Arrays. By default (+ HEADER:
+    # :hlines no +) org-mode strips all hrules from the table; otherwise (+
+    # HEADER: :hlines yes +) they are indicated with nil elements in the outer
+    # array.
     def self.from_aoa(aoa, hlines: false)
       from_array_of_arrays(aoa, hlines: hlines)
     end
@@ -149,10 +150,11 @@ module FatTable
     # :category: Constructors
 
     # Construct a Table by running a SQL +query+ against the database set up
-    # with FatTable.set_db, with the rows of the query result as rows.
+    # with FatTable.connect, with the rows of the query result as rows.
     def self.from_sql(query)
-      msg = 'FatTable.db must be set with FatTable.set_db'
+      msg = 'FatTable.db must be set with FatTable.connect'
       raise UserError, msg if FatTable.db.nil?
+
       result = Table.new
       FatTable.db[query].each do |h|
         result << h
@@ -257,6 +259,7 @@ module FatTable
           unless table_found
             # Skip through the file until a table is found
             next unless line.match?(table_re)
+
             unless line.match?(hrule_re)
               line = line.sub(/\A\s*\|/, '').sub(/\|\s*\z/, '')
               rows << line.split('|').map(&:clean)
@@ -265,6 +268,7 @@ module FatTable
             next
           end
           break unless line.match?(table_re)
+
           if !header_found && line =~ hrule_re
             rows << nil
             header_found = true
@@ -272,7 +276,7 @@ module FatTable
           elsif header_found && line =~ hrule_re
             # Mark the boundary with a nil
             rows << nil
-          elsif line !~ table_re
+          elsif !line.match?(table_re)
             # Stop reading at the second hline
             break
           else
@@ -316,14 +320,17 @@ module FatTable
       when Integer
         msg = "index '#{key}' out of range"
         raise UserError, msg unless (0..size - 1).cover?(key.abs)
+
         rows[key]
       when String
         msg = "header '#{key}' not in table"
         raise UserError, msg unless headers.include?(key)
+
         column(key).items
       when Symbol
         msg = "header ':#{key}' not in table"
         raise UserError, msg unless headers.include?(key)
+
         column(key).items
       else
         raise UserError, "cannot index table with a #{key.class}"
@@ -360,6 +367,7 @@ module FatTable
     # Return the number of rows in the Table.
     def size
       return 0 if columns.empty?
+
       columns.first.size
     end
 
@@ -368,6 +376,7 @@ module FatTable
     # Return the number of Columns in the Table.
     def width
       return 0 if columns.empty?
+
       columns.size
     end
 
@@ -406,6 +415,7 @@ module FatTable
       last ||= size - 1
       last = [last, 0].max
       raise UserError, 'first must be <= last' unless first <= last
+
       rows = []
       unless columns.empty?
         first.upto(last) do |rnum|
@@ -493,12 +503,12 @@ module FatTable
       self
     end
 
-    # Mark a group boundary at row +k+, and if +k+ is +nil+, mark the last row
-    # in the table as a group boundary. This is mainly used for internal
+    # Mark a group boundary at row +row+, and if +row+ is +nil+, mark the last
+    # row in the table as a group boundary. This is mainly used for internal
     # purposes.
-    def mark_boundary(k = nil) # :nodoc:
-      if k
-        boundaries.push(k)
+    def mark_boundary(row = nil) # :nodoc:
+      if row
+        boundaries.push(row)
       else
         boundaries.push(size - 1)
       end
@@ -524,20 +534,21 @@ module FatTable
       @boundaries += bounds.map { |k| k + shift }
     end
 
-    # Return the group number to which row k belongs. Groups, from the user's
-    # point of view are indexed starting at 1.
-    def row_index_to_group_index(k)
+    # Return the group number to which row ~row~ belongs. Groups, from the
+    # user's point of view are indexed starting at 1.
+    def row_index_to_group_index(row)
       boundaries.each_with_index do |b_last, g_num|
-        return (g_num + 1) if k <= b_last
+        return (g_num + 1) if row <= b_last
       end
       1
     end
 
-    def group_rows(k) # :nodoc:
+    def group_rows(row) # :nodoc:
       normalize_boundaries
-      return [] unless k < boundaries.size
-      first = k.zero? ? 0 : boundaries[k - 1] + 1
-      last = boundaries[k]
+      return [] unless row < boundaries.size
+
+      first = row.zero? ? 0 : boundaries[row - 1] + 1
+      last = boundaries[row]
       rows_range(first, last)
     end
 
@@ -702,6 +713,7 @@ module FatTable
           h = k.as_sym
           msg = "Column '#{h}' in select does not exist"
           raise UserError, msg unless column?(h)
+
           new_row[h] = old_row[h]
         end
         new_cols.each_pair do |key, expr|
@@ -710,7 +722,8 @@ module FatTable
           case expr
           when Symbol
             msg = "Column '#{expr}' in select does not exist"
-            raise UserError, msg unless vars.keys.include?(expr)
+            raise UserError, msg unless vars.key?(expr)
+
             new_row[key] = vars[expr]
           when String
             new_row[key] = ev.evaluate(expr, locals: vars)
@@ -864,10 +877,10 @@ module FatTable
 
     private
 
-    # Apply the set operation given by op between this table and the other table
-    # given in the first argument.  If distinct is true, eliminate duplicates
-    # from the result.
-    def set_operation(other, op = :+,
+    # Apply the set operation given by ~oper~ between this table and the other
+    # table given in the first argument.  If distinct is true, eliminate
+    # duplicates from the result.
+    def set_operation(other, oper = :+,
                       distinct: true,
                       add_boundaries: true,
                       inherit_boundaries: false)
@@ -881,7 +894,7 @@ module FatTable
       end
       other_rows = other.rows.map { |r| r.replace_keys(headers) }
       result = Table.new
-      new_rows = rows.send(op, other_rows)
+      new_rows = rows.send(oper, other_rows)
       new_rows.each_with_index do |row, k|
         result << row
         result.mark_boundary if k == size - 1 && add_boundaries
@@ -975,6 +988,7 @@ module FatTable
       unless JOIN_TYPES.include?(join_type)
         raise UserError, "join_type may only be: #{JOIN_TYPES.join(', ')}"
       end
+
       # These may be needed for outer joins.
       self_row_nils = headers.map { |h| [h, nil] }.to_h
       other_row_nils = other.headers.map { |h| [h, nil] }.to_h
@@ -992,6 +1006,7 @@ module FatTable
           locals = build_locals_hash(row_a: self_row, row_b: other_row)
           matches = ev.evaluate(join_exp, locals: locals)
           next unless matches
+
           self_row_matched = other_row_matches[k] = true
           out_row = build_out_row(row_a: self_row, row_b: other_row,
                                   common_heads: other_common_heads,
@@ -1000,6 +1015,7 @@ module FatTable
         end
         next unless %i[left full].include?(join_type)
         next if self_row_matched
+
         result << build_out_row(row_a: self_row,
                                 row_b: other_row_nils,
                                 type: join_type)
@@ -1007,6 +1023,7 @@ module FatTable
       if %i[right full].include?(join_type)
         other_rows.each_with_index do |other_row, k|
           next if other_row_matches[k]
+
           result << build_out_row(row_a: self_row_nils,
                                   row_b: other_row,
                                   type: join_type)
@@ -1090,6 +1107,7 @@ module FatTable
     # and all the headers in the other table with '_b' appended.
     def build_join_expression(exps, other, type)
       return ['true', []] if type == :cross
+
       a_heads = headers
       b_heads = other.headers
       common_heads = a_heads & b_heads
@@ -1120,6 +1138,7 @@ module FatTable
               unless a_heads.include?(a_head)
                 raise UserError, "no column '#{a_head}' in table"
               end
+
               if partial_result
                 # Second of a pair
                 ensure_common_types!(self_h: a_head,
@@ -1138,6 +1157,7 @@ module FatTable
               unless b_heads.include?(b_head)
                 raise UserError, "no column '#{b_head}' in second table"
               end
+
               if partial_result
                 # Second of a pair
                 ensure_common_types!(self_h: last_sym,
@@ -1281,6 +1301,7 @@ module FatTable
     def add_column(col)
       msg = "Table already has a column with header '#{col.header}'"
       raise msg if column?(col.header)
+
       columns << col
       self
     end
@@ -1329,6 +1350,7 @@ module FatTable
       fmt = fmt_type.as_sym
       msg = "unknown format '#{fmt}'"
       raise UserError, msg unless FatTable::FORMATS.include?(fmt)
+
       method = "to_#{fmt}"
       if block_given?
         send method, options, &Proc.new

data/lib/fat_table/version.rb

@@ -1,4 +1,4 @@
 module FatTable
   # The current version of FatTable
-  VERSION = '0.2.8'.freeze
+  VERSION = '0.2.9'.freeze
 end

data/md/README.md

@@ -597,7 +597,7 @@ database parameters to be used for the queries.
 
     # This automatically requires sequel.
     require 'fat_table'
-    FatTable.set_db(driver: 'Pg',
+    FatTable.connect(driver: 'Pg',
                     database: 'XXX_development',
                     user: 'dtd',
                     password: 'slflpowert',
@@ -605,15 +605,15 @@ database parameters to be used for the queries.
                     socket: '/tmp/.s.PGSQL.5432')
     tab = FatTable.from_sql('select * from trades;')
 
-Some of the parameters to the `.set_db` function have defaults. The driver
+Some of the parameters to the `.connect` function have defaults. The driver
 defaults to `'Pg'` for postgresql and the socket defaults to
 `/tmp/.s.PGSQL.5432` if the host is ’localhost’, which it is by default. If the
 host is not `'localhost'`, the dsn uses a port rather than a socket and defaults
 to port `'5432'`. While user and password default to nil, the database parameter
 is required.
 
-The `.set_db` function need only be called once, and the database handle it
-creates will be used for all subsequent `.from_sql` calls until `.set_db` is
+The `.connect` function need only be called once, and the database handle it
+creates will be used for all subsequent `.from_sql` calls until `.connect` is
 called again.
 
 Alternatively, you can build the `Sequel` connection with `Sequel.connect` or

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fat_table
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Daniel E. Doherty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-28 00:00:00.000000000 Z
+date: 2019-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -338,8 +338,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Provides tools for working with tables as a data type.