fat_table 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa339300269582eedb57d26138bd3fa2de68d526ed4cc94e4c3a369a67989ddb
-  data.tar.gz: b35cc4785b208b670d6f039de8ef12351ea0533c37d8802fbf89f57763e63330
+  metadata.gz: 0ecb8cb3fb29acb95b0fe11e65c5b587379a5a3070ab68acbc6a2c1785c8f229
+  data.tar.gz: f3cc9e7242ded9fd0970159eee8da4208faade0e6e4c37a324a45e1596c4eeae
 SHA512:
-  metadata.gz: 49fbab273c609035f9c2a179b0b97cdca067a8a30db754916e7b17d03a435b4d3a4eefb89ddb326ef07c6e5b91632f764ce101de0acbc79fcf6bd876741da4cf
-  data.tar.gz: 76f87e5b342da743ea3e0c2000273de35d081ad4835c2423d6342278ebbced67d3a34bd11526c7f32185ac19e0b225356baa02fbcb8b7b630868739a944f0ecb
+  metadata.gz: 8d404bd69ba3a1c3c9774f634e4f0935987ff4827803d59e89b9adbdc4806b25ef87e5dbcb9f22d7e3475c86dceebf097cf73e0ad1287f91d21415e5b0a5a3b3
+  data.tar.gz: 8d8df3651b9cdcdeaefa0527cd4fc1987c1ec491bca2a88651b255032eea16ee29c82285b9d7f9bae2ecb9b6d90c6fc4d766980af5362dc89045d553e66dec03

data/README.org

@@ -638,8 +638,11 @@ something that can't be parsed as a Numeric.  ~FatTable~ raises an exception
 is such cases, and that may be what you want if you can control the input.
 But, especially when you cannot do so, it can be helpful to designate one or
 more columns as "tolerant."  This means that when a conversion problem occurs,
-the column is forced to String type instead of throwing an exception, and the
-table can continue to be read.
+the column item is retained as a string type in a column that is otherwise of
+one of the types Numeric, DateTime, or Boolean.  Those string items are
+treated as nils for purposes of sorting or evaluation in a ~select~ method.
+When formatted, they participate in string formatting directive, but not those
+for other types.
 
 All of the table construction methods, allow a keyword parameter,
 ~tolerant_columns~, where you can designate what columns should be convert to
@@ -2641,9 +2644,10 @@ the table, but they can be overridden by more specific directives given in a
 ~format_for~ directive.
 
 **** Type and Column priority
-A directive based on type applies to all columns having that type unless
-overridden by a directive specific to a named column; a directive based on a
-column name applies only to cells in that column.
+A directive based the column name overrides any directive based on type.  If
+any cell has both a type-based formatting and column-based, the column
+instructions prevail.  In earlier versions the instuctions were "merged" but
+that is no longer the case.
 
 However, there is a twist.  Since the end result of formatting is to convert
 all columns to strings, the formatting directives for the ~String~ type can

data/lib/ext/array.rb

@@ -12,4 +12,21 @@ class Array
       end
     end
   end
+
+  def filter_to_type(typ)
+    if typ == 'Boolean'
+      compact.select { |i| i.is_a?(TrueClass) || i.is_a?(FalseClass) }
+    elsif typ == 'DateTime'
+      compact.select { |i| i.is_a?(Date) || i.is_a?(DateTime) || i.is_a?(Time) }
+        .map { |i| i.to_datetime }
+    elsif typ == 'Numeric'
+      compact.select { |i| i.is_a?(Numeric) }
+    elsif typ == 'String'
+      map { |i| i.to_s }
+    elsif typ == 'NilClass'
+      self
+    else
+      raise ArgumentError, "cannot filter_to_type for type '#{typ}'"
+    end
+  end
 end

data/lib/fat_table/column.rb

@@ -196,7 +196,7 @@ module FatTable
       if type == 'String'
         items.reject(&:blank?).first
       else
-        items.compact.first
+        items.filter_to_type(type).first
       end
     end
 
@@ -207,7 +207,7 @@ module FatTable
       if type == 'String'
         items.reject(&:blank?).last
       else
-        items.compact.last
+        items.filter_to_type(type).last
       end
     end
 
@@ -219,7 +219,7 @@ module FatTable
       if type == 'String'
         items.reject(&:blank?).count.to_d
       else
-        items.compact.count.to_d
+        items.filter_to_type(type).count.to_d
       end
     end
 
@@ -232,7 +232,7 @@ module FatTable
       if type == 'String'
         items.reject(&:blank?).min
       else
-        items.compact.min
+        items.filter_to_type(type).min
       end
     end
 
@@ -245,7 +245,7 @@ module FatTable
       if type == 'String'
         items.reject(&:blank?).max
       else
-        items.compact.max
+        items.filter_to_type(type).max
       end
     end
 
@@ -268,7 +268,7 @@ module FatTable
       if type == 'String'
         items.reject(&:blank?).join(' ')
       else
-        items.compact.sum
+        items.filter_to_type(type).sum
       end
     end
 
@@ -280,7 +280,7 @@ module FatTable
     # average back to a DateTime.
     def avg
       only_with('avg', 'DateTime', 'Numeric')
-      itms = items.compact
+      itms = items.filter_to_type(type)
       size = itms.size.to_d
       if type == 'DateTime'
         avg_jd = itms.map(&:jd).sum / size
@@ -301,9 +301,9 @@ module FatTable
       only_with('var', 'DateTime', 'Numeric')
       all_items =
         if type == 'DateTime'
-          items.compact.map(&:jd)
+          items.filter_to_type(type).map(&:jd)
         else
-          items.compact
+          items.filter_to_type(type)
         end
       n = count
       return BigDecimal('0.0') if n <= 1
@@ -324,7 +324,7 @@ module FatTable
     # number and computes the variance of those numbers.
     def pvar
       only_with('var', 'DateTime', 'Numeric')
-      n = items.compact.size.to_d
+      n = items.filter_to_type(type).size.to_d
       return BigDecimal('0.0') if n <= 1
       var * ((n - 1) / n)
     end
@@ -361,7 +361,7 @@ module FatTable
     # false.  Works only with boolean Columns.
     def any?
       only_with('any?', 'Boolean')
-      items.compact.any?
+      items.filter_to_type(type).any?
     end
 
     # :category: Aggregates
@@ -370,7 +370,7 @@ module FatTable
     # false.  Works only with boolean Columns.
     def all?
       only_with('all?', 'Boolean')
-      items.compact.all?
+      items.filter_to_type(type).all?
     end
 
     # :category: Aggregates
@@ -379,7 +379,7 @@ module FatTable
     # false.  Works only with boolean Columns.
     def none?
       only_with('none?', 'Boolean')
-      items.compact.none?
+      items.filter_to_type(type).none?
     end
 
     # :category: Aggregates
@@ -388,7 +388,7 @@ module FatTable
     # otherwise return false.  Works only with boolean Columns.
     def one?
       only_with('one?', 'Boolean')
-      items.compact.one?
+      items.filter_to_type(type).one?
     end
 
     private
@@ -413,11 +413,10 @@ module FatTable
     # a tolerant column, respond to type errors by converting the column to a
     # String type.
     def <<(itm)
-      items << convert_to_type(itm)
+      items << convert_and_set_type(itm)
     rescue IncompatibleTypeError => ex
       if tolerant?
-        force_string!
-        retry
+        items << Convert.convert_to_string(itm)
       else
         raise ex
       end
@@ -436,9 +435,9 @@ module FatTable
 
     private
 
-    def convert_to_type(val)
-      new_val = Convert.convert_to_type(val, type)
-      if new_val && type == 'NilClass'
+    def convert_and_set_type(val)
+      new_val = Convert.convert_to_type(val, type, tolerant: tolerant?)
+      if new_val && (type == 'NilClass' || type == 'String')
         @type =
           if [true, false].include?(new_val)
             'Boolean'

data/lib/fat_table/convert.rb

@@ -10,7 +10,7 @@ module FatTable
     # determined, raise an error if the val cannot be converted to the Column
     # type. Otherwise, returns the converted val as an object of the correct
     # class.
-    def self.convert_to_type(val, type)
+    def self.convert_to_type(val, type, tolerant: false)
       case type
       when 'NilClass'
         if val != false && val.blank?
@@ -66,6 +66,19 @@ module FatTable
       when 'String'
         if val.nil?
           nil
+        elsif tolerant
+          # Allow String to upgrade to one of Numeric, DateTime, or Boolean if
+          # possible.
+          if (new_val = convert_to_numeric(val))
+            new_val
+          elsif (new_val = convert_to_date_time(val))
+            new_val
+          elsif (new_val = convert_to_boolean(val))
+            new_val
+          else
+            new_val = convert_to_string(val)
+          end
+          new_val
         else
           new_val = convert_to_string(val)
           if new_val.nil?

data/lib/fat_table/evaluator.rb

@@ -45,17 +45,15 @@ module FatTable
     end
 
     # Return the result of evaluating +expr+ as a Ruby expression in which the
-    # instance variables set in Evaluator.new and any local variables set in the
-    # Hash parameter +locals+ are available to the expression.
+    # instance variables set in Evaluator.new and any local variables set in
+    # the Hash parameter +locals+ are available to the expression.  Certain
+    # errors simply return nil as the result.  This can happen, for example,
+    # when a string gets into an otherwise numeric column because the column
+    # is set to tolerant.
     def evaluate(expr = '', locals: {})
       eval(expr, local_vars(binding, locals))
     rescue NoMethodError, TypeError => ex
-      if ex.to_s =~ /for nil:NilClass|nil can't be coerced/
-        # Likely one of the locals was nil, so let nil be the result.
-        return nil
-      else
-        raise ex
-      end
+      nil
     end
 
     private

data/lib/fat_table/formatters/formatter.rb

@@ -562,20 +562,21 @@ module FatTable
           end
         end
 
-        # Merge in formatting for column h based on the column type, or based
-        # on the string type for the header location.
+        # Merge in formatting instructions for column h based on the column
+        # name, or if there is no formatting instructions for the column by
+        # name, merge in the formatting instructions based on the column's
+        # type.  Insist on only the string type for the header location.
         typ = (location == :header ? :string : table.type(h).as_sym)
         parse_typ_method_name = 'parse_' + typ.to_s + '_fmt'
-        if fmts.key?(typ)
-          # Merge in type-based formatting
-          typ_fmt = send(parse_typ_method_name, fmts[typ]).first
-          format_h = format_h.merge(typ_fmt)
-        end
         if fmts[h]
           # Merge in column formatting
           col_fmt = send(parse_typ_method_name, fmts[h],
                          strict: location != :header).first
           format_h = format_h.merge(col_fmt)
+        elsif fmts.key?(typ)
+          # Merge in type-based formatting
+          typ_fmt = send(parse_typ_method_name, fmts[typ]).first
+          format_h = format_h.merge(typ_fmt)
         end
 
         # Copy :body formatting for column h to :bfirst and :gfirst if they

data/lib/fat_table/table.rb

@@ -779,7 +779,6 @@ module FatTable
       last_key = nil
       new_rows.each_with_index do |nrow, k|
         new_tab << nrow
-        # key = nrow.fetch_values(*sort_heads)
         key = nrow.fetch_values(*key_hash.keys)
         new_tab.mark_boundary(k - 1) if last_key && key != last_key
         last_key = key
@@ -1712,11 +1711,19 @@ module FatTable
     end
 
     # The <=> operator cannot handle nils without some help.  Treat a nil as
-    # smaller than any other value, but equal to other nils.  The two keys are assumed to be arrays of values to be
-    # compared with <=>.
+    # smaller than any other value, but equal to other nils.  The two keys are
+    # assumed to be arrays of values to be compared with <=>.  Since
+    # tolerant_columns permit strings to be mixed in with columns of type
+    # Numeric, DateTime, and Boolean, treat strings mixed with another type
+    # the same as nils.
     def compare_with_nils(key1, key2)
       result = nil
       key1.zip(key2) do |k1, k2|
+        if k1.is_a?(String) && !k2.is_a?(String)
+          k1 = nil
+        elsif !k1.is_a?(String) && k2.is_a?(String)
+          k2 = nil
+        end
         if k1.nil? && k2.nil?
           result = 0
           next

data/lib/fat_table/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fat_table
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Daniel E. Doherty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-24 00:00:00.000000000 Z
+date: 2022-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler