fat_table 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c16c57274c9f0f67abf924eeae6bce192f82844366199361ac68a7d9e1fdcf4
-  data.tar.gz: 42ea485003f76a56f66988a2bf4df159580dbbed022b1f637260ff8e1cd5888b
+  metadata.gz: 6511a69dea56479777956084ceae10b33d6769b4e9e8fcbb87d50140fa5475d4
+  data.tar.gz: b41a1e1a578f1c9f4f4f82ac7fba1413343ec75d8febda7ebb1f12737b9fb6b2
 SHA512:
-  metadata.gz: 32a6d03a5effa045ef6db54654aef86d96e90846cd0002ada80eaf8218c573f8a430067119562b8369226f11bc45d1bd0c144ddb8c1947c7fc9256fca55389b0
-  data.tar.gz: f0a033ff19d04160b4137f1204df322174926be2a0d7f2c442388a358a8ddc4321f5edcc1670346b9b366aa8a55acbe6a23b6b44f0fa9a69bb038e9eee7d24ac
+  metadata.gz: fe1da822b9d2ef6995dbfe665f570a3474d955892e062cba559162a07ef43013e9c1f649040fa47529c780aec213a9d74c4ac0684217a608960ebedac9479843
+  data.tar.gz: b4ab503c3f992a471bd72a70822455ac6a50a6a72558242841656d514e2c60c9b51bf7a1d052c66a35ecb1ba4cbce30ac6351d30919aa85f3284f0d9cfad1821

data/lib/fat_table/column.rb

@@ -29,6 +29,8 @@ module FatTable
     # perhaps after removing nils with +.items.compact+.
     attr_reader :items
 
+    attr_accessor :tolerant
+
     # Valid Column types as strings.
     TYPES = %w[NilClass Boolean DateTime Numeric String].freeze
 

data/lib/fat_table/table.rb

@@ -53,6 +53,7 @@ module FatTable
   class Table
     # An Array of FatTable::Columns that constitute the table.
     attr_reader :columns
+    attr_reader :heads
 
     # Headers of columns that are to be tolerant when they are built.
     attr_accessor :tolerant_cols
@@ -95,9 +96,10 @@ module FatTable
     # starts with  'num', 'dat', 'bool', or 'str' to specify Numeric,
     # DateTime, Boolean, or String types respectively.
     def initialize(*heads, **types)
+      @heads = heads.flatten.map(&:as_sym)
+      @types = types
       @columns = []
       @tolerant_cols = []
-      @headers = []
       # Check for the special 'omni' key
       @omni_type = 'NilClass'
       @omni_tol = false
@@ -110,9 +112,14 @@ module FatTable
         types.delete(:omni)
         types.delete('omni')
       end
-      heads += types.keys
-      heads.uniq.each do |h|
-        typ, tol = Table.typ_tol(types[h])
+      # heads += types.keys
+      (heads.flatten + types.keys).uniq.each do |h|
+        if types[h]
+          typ, tol = Table.typ_tol(types[h])
+        else
+          typ = @omni_type
+          tol = @omni_tol
+        end
         @tolerant_cols << h.to_s.as_sym if tol
         @columns << Column.new(header: h.to_s.sub(/~\s*\z/, ''), type: typ,
                                tolerant: tol)
@@ -122,18 +129,23 @@ module FatTable
 
     # :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
-      dup.__empty!
-    end
-
-    def __empty!
-      @columns = []
-      @explicit_boundaries = []
-      self
+    # Return an new table based on this Table but with empty columns named by
+    # the result_cols parameter, by default the this Table's columns.  If any
+    # of the result_cols have the same name as an existing column, inherit
+    # that column's type and tolerance.  Also, set any instance variables that
+    # might have been set by a subclass instance.
+    def empty_dup(result_cols = nil)
+      result_cols ||= heads
+      result_types = types.select { |k,_v| result_cols.include?(k) }
+      result = Table.new(result_cols, **result_types)
+      tolerant_cols.each do |h|
+        result.tolerant_cols << h
+        result.column(h).tolerant = true
+      end
+      (instance_variables - result.instance_variables).each do |v|
+        result.instance_variable_set(instance_variable_get(v))
+      end
+      result
     end
 
     # :category: Constructors
@@ -264,7 +276,8 @@ module FatTable
       # can respond to #to_h. If an array element is a nil, mark it as a group
       # boundary in the Table.
       def from_array_of_hashes(hashes, hlines: false, **types)
-        result = new(**types)
+        heads = hashes.first.keys
+        result = new(*heads, **types)
         hashes.each do |hsh|
           if hsh.nil?
             unless hlines
@@ -293,7 +306,6 @@ module FatTable
       # indicated with nil elements in the outer array as expected by this
       # method when hlines is set true.
       def from_array_of_arrays(rows, hlines: false, **types)
-        result = new(**types)
         headers = []
         if !hlines
           # Take the first row as headers
@@ -312,6 +324,7 @@ module FatTable
           headers = (1..rows[0].size).to_a.map { |k| "col_#{k}".as_sym }
           first_data_row = 0
         end
+        result = new(*headers, **types)
         rows[first_data_row..-1].each do |row|
           if row.nil?
             unless hlines
@@ -419,6 +432,7 @@ module FatTable
     def force_string!(*keys)
       keys.each do |h|
         raise UserError, "force_string!: #{h} not a column in table" unless column(h)
+
         column(h).force_string!
       end
       self
@@ -845,6 +859,7 @@ module FatTable
       unless expr.is_a?(String)
         raise "must call FatTable::Table\#order_with with a single string expression"
       end
+
       rev = false
       if expr.match?(/\s*!\s*\z/)
         rev = true
@@ -957,8 +972,15 @@ module FatTable
                          before: before_hook,
                          after: after_hook)
       # Compute the new Table from this Table
-      result = empty_dup
+      result_cols =
+        if cols.include?(:omni)
+          (headers + new_cols.keys - [:omni])
+        else
+          (cols + new_cols.keys)
+        end
+      result = empty_dup(result_cols)
       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
         # local variables set to the row before the new row is evaluated.
@@ -1028,15 +1050,6 @@ module FatTable
     def where(expr)
       expr = expr.to_s
       result = empty_dup
-      headers.each do |h|
-        col =
-          if tolerant_col?(h)
-            Column.new(header: h, tolerant: true)
-          else
-            Column.new(header: h)
-          end
-        result.add_column(col)
-      end
       ev = Evaluator.new(ivars: { row: 0, group: 0 })
       rows.each_with_index do |row, k|
         grp = row_index_to_group_index(k)
@@ -1094,10 +1107,13 @@ module FatTable
     # boundaries of the constituent tables. Preserves and adjusts the group
     # boundaries of the constituent table.
     def union_all(other)
-      set_operation(other, :+,
-                    distinct: false,
-                    add_boundaries: true,
-                    inherit_boundaries: true)
+      set_operation(
+        other,
+        :+,
+        distinct: false,
+        add_boundaries: true,
+        inherit_boundaries: true
+      )
     end
 
     # :category: Operators
@@ -1489,7 +1505,8 @@ module FatTable
       groups = sorted_tab.rows.group_by do |r|
         group_cols.map { |k| r[k] }
       end
-      result = empty_dup
+      grp_types = types.select { |k, _v| group_cols.include?(k) }
+      result = Table.new(*group_cols, **grp_types)
       groups.each_pair do |_vals, grp_rows|
         result << row_from_group(grp_rows, group_cols, agg_cols)
       end

data/lib/fat_table/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fat_table
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Daniel E. Doherty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-20 00:00:00.000000000 Z
+date: 2023-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler