fat_table 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dea0adf5d428fa875a7dda51538a79e514b9095b167d392ef06eae849e563a9f
-  data.tar.gz: d5ac2784c1f569fc1677f596278af3c6a00b1b5736ea1a080667f8a0f0acdd16
+  metadata.gz: a0f33bfa7f3d9d9c21cbc214a64c5d4f89d917dc9e704e6f7dae710630ff0907
+  data.tar.gz: 9bd6f3ed31da1fd4a120be80e47b1a262c846efefee24e4ed6aee47ccc5d8107
 SHA512:
-  metadata.gz: 7ea35509645ae4c11c8f7fd61157fe5057cf5d11237d888b9e5cfcbab437ff5fd90a3d3cffa9bd6d53038406138b12a890c65a72a59ac0b9542c1a90a979158c
-  data.tar.gz: 04eaf2e05b452efc8f25c14ab51b069d09dd9c548983481731562883d8866beac555a4a48a85b3352d408736c1b22d90881c0a23fab273fd78b459f31f704988
+  metadata.gz: 4bb8871cce72b3a70dbdf4ed114395f86d48003f0a6e590e8e3c691913625c085a4e64f067a28b278723804a5fd19deb6f5d8cc0c8ef658958163835168f2a89
+  data.tar.gz: efce3072c71e2231fc3768cfae9ad81d0af45a8403e0e17677c3a99b1f5dfdb57e9e69d8bbb27024db17c343e364f34e89bc982abf8d318e29c5b97acad0f5be

data/.rspec

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

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

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
@@ -597,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
@@ -713,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
@@ -770,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)
@@ -792,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
@@ -904,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
@@ -1011,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|
@@ -1259,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

data/lib/fat_table/version.rb

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

metadata

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