fat_table 0.3.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cff489c9e921eff2138fb44b260b96d548819b7ee1479f9bf89675f2199c9ea
-  data.tar.gz: 7ad900e458b8d95baaf8044a4d25e742b1796ae9677d9f667180f034760e8a55
+  metadata.gz: a0f33bfa7f3d9d9c21cbc214a64c5d4f89d917dc9e704e6f7dae710630ff0907
+  data.tar.gz: 9bd6f3ed31da1fd4a120be80e47b1a262c846efefee24e4ed6aee47ccc5d8107
 SHA512:
-  metadata.gz: 061ddacf0132d62f7d428f513c7a14277a4668c5a37148f80ef87dc484163ee4c001164e20a854d61761f21d6df025a700171e85c33e4f53c548014d7804b4e2
-  data.tar.gz: 11351e7a9c73624c4395960c226733b2c1ccaa126f0a0f1c2eee042b83f5adacbcea52e303b8566d5746c16648e202441d5df2216cc818799864600c7ee3bf69
+  metadata.gz: 4bb8871cce72b3a70dbdf4ed114395f86d48003f0a6e590e8e3c691913625c085a4e64f067a28b278723804a5fd19deb6f5d8cc0c8ef658958163835168f2a89
+  data.tar.gz: efce3072c71e2231fc3768cfae9ad81d0af45a8403e0e17677c3a99b1f5dfdb57e9e69d8bbb27024db17c343e364f34e89bc982abf8d318e29c5b97acad0f5be

data/.rspec

@@ -1,2 +1,3 @@
---format documentation
 --color
+--require spec_helper
+--format documentation

data/.rubocop.yml

@@ -1,10 +1,7 @@
-inherit_gem:
-    rubocop-shopify: rubocop.yml
-require: rubocop-rspec
-require: rubocop-performance
+inherit_from:
+  - ~/.rubocop.yml
 
 AllCops:
-  TargetRubyVersion: 2.7
   Exclude:
     - 'test/tmp/**/*'
     - 'vendor/bundle/**/*'
@@ -12,6 +9,7 @@ AllCops:
 Style/MethodCallWithArgsParentheses:
   Exclude:
     - '**/Gemfile'
+    - '*_spec.rb'
 
 Style/ClassAndModuleChildren:
   Exclude:

data/.travis.yml

@@ -18,5 +18,5 @@ rvm:
   - 2.5
   - 2.6
   - 2.7
-  - ruby-head
+  - 3.0
   - truffleruby

data/fat_table.gemspec

@@ -64,20 +64,19 @@ Gem::Specification.new do |spec|
   spec.metadata['yard.run'] = 'yri' # use "yard" to build full HTML docs.
 
   spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'byebug'
+  spec.add_development_dependency 'debug', '>= 1.0.0'
   spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'pry-doc'
-  spec.add_development_dependency 'ruby_jard'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'redcarpet'
+  spec.add_development_dependency 'pg'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop-rspec'
   spec.add_development_dependency 'rubocop-performance'
   spec.add_development_dependency 'simplecov'
 
   spec.add_runtime_dependency 'activesupport', '>3.0'
-  spec.add_runtime_dependency 'fat_core', '>= 4.1'
+  spec.add_runtime_dependency 'fat_core', '>= 4.9.0'
   spec.add_runtime_dependency 'rainbow'
   spec.add_runtime_dependency 'sequel'
   spec.add_runtime_dependency 'gem-path'

data/lib/fat_table/column.rb

@@ -83,7 +83,7 @@ module FatTable
     #   col.type #=> 'Numeric'
     #   col.header #=> :prices
     #   col.sum #=> 18376.75
-    def initialize(header:, items: [])
+    def initialize(header:, items: [], type: 'NilClass')
       @raw_header = header
       @header =
         if @raw_header.is_a?(Symbol)
@@ -91,7 +91,7 @@ module FatTable
         else
           @raw_header.to_s.as_sym
         end
-      @type = 'NilClass'
+      @type = type
       msg = "unknown column type '#{type}"
       raise UserError, msg unless TYPES.include?(@type.to_s)
 
@@ -139,6 +139,19 @@ module FatTable
       size - 1
     end
 
+    # :category: Attributes
+
+    # Force the column to have String type and then convert all items to
+    # strings.
+    def force_to_string_type
+      # msg = "Can only force an empty column to String type"
+      # raise UserError, msg unless empty?
+      @type = 'String'
+      unless empty?
+        @items = items.map(&:to_s)
+      end
+    end
+
     ##########################################################################
     # Enumerable
     ##########################################################################
@@ -494,6 +507,15 @@ module FatTable
     AMR_DATE_RE = %r{(?<dy>\d\d?)[-/](?<mo>\d\d?)[-/](?<yr>\d\d\d\d)\s*
                      (?<tm>T\d\d:\d\d:\d\d(\+\d\d:\d\d)?)?}x
 
+    # A Date like 'Tue, 01 Nov 2016' or 'Tue 01 Nov 2016' or '01 Nov 2016'.
+    # These are emitted by Postgresql, so it makes from_sql constructor
+    # possible without special formatting of the dates.
+    INV_DATE_RE = %r{((mon|tue|wed|thu|fri|sat|sun)[a-zA-z]*,?)?\s+  # looks like dow
+    (?<dy>\d\d?)\s+  # one or two-digit day
+    (?<mo_name>[jfmasondJFMASOND][A-Za-z]{2,})\s+  # looks like a month name
+    (?<yr>\d\d\d\d) # and a 4-digit year
+    }xi
+
     # Convert the val to a DateTime if it is either a DateTime, a Date, a Time, or a
     # String that can be parsed as a DateTime, otherwise return nil. It only
     # recognizes strings that contain a something like '2016-01-14' or '2/12/1985'
@@ -503,6 +525,7 @@ module FatTable
     def convert_to_date_time(val)
       return val if val.is_a?(DateTime)
       return val if val.is_a?(Date)
+      return val.to_datetime if val.is_a?(Time)
       begin
         str = val.to_s.clean
         return nil if str.blank?
@@ -513,6 +536,10 @@ module FatTable
           date = DateTime.new(Regexp.last_match[:yr].to_i,
                          Regexp.last_match[:mo].to_i,
                          Regexp.last_match[:dy].to_i)
+        elsif str =~ INV_DATE_RE
+          mo = Date.mo_name_to_num(last_match[:mo_name])
+          date = DateTime.new(Regexp.last_match[:yr].to_i, mo,
+                              Regexp.last_match[:dy].to_i)
         else
           return nil
         end

data/lib/fat_table/formatters/formatter.rb

@@ -500,7 +500,7 @@ module FatTable
             format_h = format_h.merge(typ_fmt)
           end
           if fmts.key?(:nil)
-            typ_fmt = parse_nil_fmt(fmts[:nil]).first
+            typ_fmt = parse_nilclass_fmt(fmts[:nil]).first
             format_h = format_h.merge(typ_fmt)
           end
         end
@@ -587,7 +587,7 @@ module FatTable
         fmt = fmt.sub($&, '')
       end
       # Nil formatting can apply to strings as well
-      nil_hash, fmt = parse_nil_fmt(fmt)
+      nil_hash, fmt = parse_nilclass_fmt(fmt)
       fmt_hash = fmt_hash.merge(nil_hash)
       if fmt =~ /u/
         fmt_hash[:case] = :lower
@@ -636,7 +636,7 @@ module FatTable
     # instructions and the unconsumed part of the instruction string. This is
     # called to cull nil-based instructions from a formatting string intended
     # for other types, such as numeric, etc.
-    def parse_nil_fmt(fmt, _strict: true)
+    def parse_nilclass_fmt(fmt, _strict: true)
       # We parse the more complex formatting constructs first, and after each
       # parse, we remove the matched construct from fmt.  At the end, any
       # remaining characters in fmt should be invalid.
@@ -855,11 +855,16 @@ module FatTable
         result = val.secs_to_hms
         istruct.commas = false
       elsif istruct.currency
-        prec = istruct.post_digits.zero? ? 2 : istruct.post_digits
         delim = istruct.commas ? ',' : ''
-        result = val.to_s(:currency, precision: prec, delimiter: delim,
+        result =
+        if istruct.post_digits < 0
+          val.to_s(:currency, delimiter: delim,
                           unit: FatTable.currency_symbol)
-        istruct.commas = false
+        else
+          val.to_s(:currency, precision: istruct.post_digits, delimiter: delim,
+                          unit: FatTable.currency_symbol)
+        end
+        # istruct.commas = false
       elsif istruct.pre_digits.positive?
         if val.whole?
           # No fractional part, ignore post_digits
@@ -1075,7 +1080,10 @@ module FatTable
               :body
             end
           table.headers.each do |h|
-            grp_col[h] ||= Column.new(header: h)
+            # We set the column type here in case the column type was forced
+            # to String.
+            # grp_col[h] ||= Column.new(header: h)
+            grp_col[h] ||= Column.new(header: h, type: table.type(h))
             grp_col[h] << row[h]
             istruct = format_at[location][h]
             new_row[h] = [row[h], format_cell(row[h], istruct,

data/lib/fat_table/table.rb

@@ -67,6 +67,23 @@ module FatTable
       @boundaries = []
     end
 
+    # :category: Constructors
+
+    # Return an empty duplicate of self.  This allows the library to create an
+    # empty table that preserves all the instance variables from self.  Even
+    # though FatTable::Table objects have no instance variables, a class that
+    # inherits from it might.
+    def empty_dup
+      self.dup.__empty!
+    end
+
+    def __empty!
+      @columns = []
+      @boundaries = []
+      self
+    end
+
+
     # :category: Constructors
 
     # Construct a Table from the contents of a CSV file named +fname+. Headers
@@ -158,7 +175,8 @@ module FatTable
       raise UserError, msg if FatTable.db.nil?
 
       result = Table.new
-      FatTable.db[query].each do |h|
+      rows = FatTable.db[query]
+      rows.each do |h|
         result << h
       end
       result
@@ -297,6 +315,8 @@ module FatTable
     # :category: Attributes
 
     # Return the table's Column with the given +key+ as its header.
+    # @param key [Symbol] symbol for header of column to return
+    # @return [FatTable::Column]
     def column(key)
       columns.detect { |c| c.header == key.as_sym }
     end
@@ -311,6 +331,15 @@ module FatTable
 
     # :category: Attributes
 
+    # Set the column type for Column with the given +key+ as a String type,
+    # but only if empty.  Otherwise, we would have to worry about converting
+    # existing items in the column to String.  Perhaps that's a TODO.
+    def set_column_to_string_type(key)
+      column(key).force_to_string_type
+    end
+
+    # :category: Attributes
+
     # Return the array of items of the column with the given header symbol
     # +key+, or if +key+ is an Integer, return that row at that index. So a
     # table's rows can be accessed by number, and its columns can be accessed by
@@ -585,8 +614,12 @@ module FatTable
         key1 <=> key2
       end
       # Add the new rows to the table, but mark a group boundary at the points
-      # where the sort key changes value.
-      new_tab = Table.new
+      # where the sort key changes value.  NB: I use self.class.new here
+      # rather than Table.new because if this class is inherited, I want the
+      # new_tab to be an instance of the subclass.  With Table.new, this
+      # method's result will be an instance of FatTable::Table rather than of
+      # the subclass.
+      new_tab = empty_dup
       last_key = nil
       new_rows.each_with_index do |nrow, k|
         new_tab << nrow
@@ -701,7 +734,7 @@ module FatTable
                          before: before_hook,
                          after: after_hook)
       # Compute the new Table from this Table
-      result = Table.new
+      result = empty_dup
       normalize_boundaries
       rows.each_with_index do |old_row, old_k|
         # Set the group number in the before hook and run the hook with the
@@ -758,7 +791,7 @@ module FatTable
     #   tab.where('@row.even? && shares > 500') => even rows with lots of shares
     def where(expr)
       expr = expr.to_s
-      result = Table.new
+      result = empty_dup
       headers.each do |h|
         col = Column.new(header: h)
         result.add_column(col)
@@ -780,7 +813,7 @@ module FatTable
     # Return a new table with all duplicate rows eliminated. Resets groups. Same
     # as #uniq.
     def distinct
-      result = Table.new
+      result = empty_dup
       uniq_rows = rows.uniq
       uniq_rows.each do |row|
         result << row
@@ -892,7 +925,7 @@ module FatTable
         raise UserError, msg
       end
       other_rows = other.rows.map { |r| r.replace_keys(headers) }
-      result = Table.new
+      result = empty_dup
       new_rows = rows.send(oper, other_rows)
       new_rows.each_with_index do |row, k|
         result << row
@@ -980,6 +1013,11 @@ module FatTable
     #
     # Any groups present in either Table are eliminated in the output Table. See
     # the README for examples.
+    # @param other [FatTable::Table] table to join with self
+    # @param exps [Array<String>, Array<Symbol>] table to join with self
+    # @param join_type [Array<String>, Array<Symbol>] type of join :inner, :left, :right, :full, :cross
+    # @return [FatTable::Table] result of joining self to other
+    #
     def join(other, *exps, join_type: :inner)
       unless other.is_a?(Table)
         raise UserError, 'need other table as first argument to join'
@@ -994,7 +1032,7 @@ module FatTable
       join_exp, other_common_heads =
         build_join_expression(exps, other, join_type)
       ev = Evaluator.new
-      result = Table.new
+      result = empty_dup
       other_rows = other.rows
       other_row_matches = Array.new(other_rows.size, false)
       rows.each do |self_row|
@@ -1242,7 +1280,7 @@ module FatTable
       groups = sorted_tab.rows.group_by do |r|
         group_cols.map { |k| r[k] }
       end
-      result = Table.new
+      result = empty_dup
       groups.each_pair do |_vals, grp_rows|
         result << row_from_group(grp_rows, group_cols, agg_cols)
       end
@@ -1274,16 +1312,33 @@ module FatTable
 
     # :category: Constructors
 
+    # Add a group boundary mark at the given row, or at the end of the table
+    # by default.
+    def add_boundary(at_row = nil)
+      row = at_row || (size - 1)
+      @boundaries << row
+    end
+
+    # :category: Constructors
+
     # Add a +row+ represented by a Hash having the headers as keys. If +mark:+
     # is set true, mark this row as a boundary. All tables should be built
     # ultimately using this method as a primitive.
     def add_row(row, mark: false)
-      row.each_pair do |k, v|
-        key = k.as_sym
-        columns << Column.new(header: k) unless column?(k)
-        column(key) << v
+      row.transform_keys!(&:as_sym)
+      # Make sure there is a column for each known header and each new key
+      # present in row.
+      new_heads = row.keys - headers
+      new_heads.each do |h|
+        # This column is new, so it needs nil items for all prior rows lest
+        # the value be added to a prior row.
+        items = Array.new(size, nil)
+        columns << Column.new(header: h, items: items)
+      end
+      headers.each do |h|
+        # NB: This adds a nil if h is not in row.
+        column(h) << row[h]
       end
-      @boundaries << (size - 1) if mark
       self
     end
 

data/lib/fat_table/version.rb

@@ -2,5 +2,5 @@
 
 module FatTable
   # The current version of FatTable
-  VERSION = '0.3.1'
+  VERSION = '0.4.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fat_table
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Daniel E. Doherty
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-13 00:00:00.000000000 Z
+date: 2022-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: debug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: pry-doc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,21 +67,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-doc
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: ruby_jard
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,21 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -198,14 +184,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.9.0
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -320,7 +306,7 @@ licenses: []
 metadata:
   allowed_push_host: https://rubygems.org
   yard.run: yri
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -335,8 +321,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.3.3
+signing_key:
 specification_version: 4
 summary: Provides tools for working with tables as a data type.
 test_files: []