fat_table 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cff489c9e921eff2138fb44b260b96d548819b7ee1479f9bf89675f2199c9ea
-  data.tar.gz: 7ad900e458b8d95baaf8044a4d25e742b1796ae9677d9f667180f034760e8a55
+  metadata.gz: d95bf4d370e8c501b679aba77975ee9404940383a0058718d4c906b491ef195d
+  data.tar.gz: fc39721ae44a5e656bfb8d6225164aa74cf0bdf21246b1eec4c247572b73bf30
 SHA512:
-  metadata.gz: 061ddacf0132d62f7d428f513c7a14277a4668c5a37148f80ef87dc484163ee4c001164e20a854d61761f21d6df025a700171e85c33e4f53c548014d7804b4e2
-  data.tar.gz: 11351e7a9c73624c4395960c226733b2c1ccaa126f0a0f1c2eee042b83f5adacbcea52e303b8566d5746c16648e202441d5df2216cc818799864600c7ee3bf69
+  metadata.gz: a532d371acf8e0a8fe36e83410c646a12125af501638749bf69f6c85fedcabf7eabf6b6edd5579eb0b32df42220cdac2f7ce018447b2734749e735815ac53ff2
+  data.tar.gz: 555e412df95d31e035debb960c5dc86bfba4ec5b4c9827ea7ec19ef2458a18b01f54d4c620e69c621800ddb31bde7ab9e4d7034c9c53380ee301322260647c49

data/.travis.yml

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

data/fat_table.gemspec

@@ -68,16 +68,16 @@ Gem::Specification.new do |spec|
   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

@@ -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/table.rb

@@ -158,7 +158,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 +298,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 +314,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
@@ -980,6 +992,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'
@@ -1274,6 +1291,15 @@ 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.
@@ -1283,7 +1309,7 @@ module FatTable
         columns << Column.new(header: k) unless column?(k)
         column(key) << v
       end
-      @boundaries << (size - 1) if mark
+      add_boundary 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.3.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fat_table
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Daniel E. Doherty
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-13 00:00:00.000000000 Z
+date: 2022-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,35 +81,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby_jard
+  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: rake
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -198,14 +198,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 +320,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 +335,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: []