fat_core 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4617dd301a8a4f6ea796c27cfff91364f72b79f2
-  data.tar.gz: e6eb1b4057994c9672712b28189066af2ebc56d8
+  metadata.gz: 2d398b7ceb368a1c99d20a78b6b223b7d6d0fee1
+  data.tar.gz: 3107bfa35da91b30a2001b56f85daef907ce9789
 SHA512:
-  metadata.gz: 478b2f046e8cfc211eaed97bcd20ddf80b9cbb7c38e022931ceaeade08ba91d39f94e4ad085145426b7789a3795648112149cc0e53256bce17c0cc6241fbee2c
-  data.tar.gz: 32a4dbf0406779b323a76f61319f9553b9442d8a5ebce0c8567720b3134c9894087b6f22d38720d08f0070884f11eb74d8655ec771b51c4ac8f8e47f6442975a
+  metadata.gz: 6c982073829b3209c0a03dfb9f16e30b0d6aaa321fc7720de5dac5a9c6bb36db7c9560087a53cee6a4fefa06273f317d8df25e7ac0a90d60efca87ee876e5ab1
+  data.tar.gz: 090803a0545f56bb24d7fdda0d27c5c21ff27b9eaa73ef69e3190ac5b74d60a02ffac6a2bf16b649e64547f19edabfa9ce44d4ab6172167e1814de3b272855b1

data/lib/fat_core/table.rb

@@ -183,7 +183,8 @@ module FatCore
     ##  preceding the hline.
     ##
     ##  The #order_by method resets the boundaries then adds boundaries at the
-    ##  last row of each group as a boundary.
+    ##  last row of each group of rows on which the sort keys were equal as a
+    ##  boundary.
     ##
     ##  The #union_all (but not #union since it deletes duplicates) method adds
     ##  a boundary between the constituent tables. #union_all also preserves any
@@ -195,10 +196,15 @@ module FatCore
     ##  without change, since it only selects columns for the output and deletes
     ##  no rows.
     ##
+    ##  Perhaps surprisingly, the #group_by method does /not/ result in any
+    ##  groups in the output table since the result of #group_by is to reduce
+    ##  all groups it finds into a single row, and having a group for each row
+    ##  of the output table would have no use.
+    ##
     ##  All the other table-transforming methods reset the boundaries in the new
-    ##  table. For example, #order_by and #where re-arrange and delete rows, so
-    ##  the old boundaries would make no sense anyway. Likewise, #union,
-    ##  #intersection, #except, and #join reset the boundaries to their default.
+    ##  table. For example, #where re-arranges and deletes rows, so the old
+    ##  boundaries would make no sense anyway. Likewise, #union, #intersection,
+    ##  #except, and #join reset the boundaries to their default.
     ##  ###########################################################################
 
     public
@@ -251,6 +257,15 @@ module FatCore
       @boundaries += bounds.map { |k| k + shift }
     end
 
+    # Return the group number to which row k belongs. Groups, from the user's
+    # point of view are indexed starting at 1.
+    def row_index_to_group_index(k)
+      boundaries.each_with_index do |b_last, g_num|
+        return (g_num + 1) if k <= b_last
+      end
+      1
+    end
+
     def group_rows(k)
       normalize_boundaries
       return [] unless k < boundaries.size
@@ -289,6 +304,7 @@ module FatCore
         new_tab.mark_boundary(k - 1) if last_key && key != last_key
         last_key = key
       end
+      new_tab.normalize_boundaries
       new_tab
     end
 
@@ -306,8 +322,10 @@ module FatCore
     # well.  The output table preserves any groups present in the input table.
     def select(*cols, **new_cols)
       result = Table.new
-      ev = Evaluator.new(vars: { row: 0 }, before: '@row += 1')
-      rows.each do |old_row|
+      normalize_boundaries
+      ev = Evaluator.new(vars: { row: 0, group: 1 },
+                         before: '@row = __row; @group = __group')
+      rows.each_with_index do |old_row, old_k|
         new_row = {}
         cols.each do |k|
           h = k.as_sym
@@ -317,6 +335,8 @@ module FatCore
         new_cols.each_pair do |key, val|
           key = key.as_sym
           vars = old_row.merge(new_row)
+          vars[:__row] = old_k + 1
+          vars[:__group] = row_index_to_group_index(old_k)
           case val
           when Symbol
             raise "Column '#{val}' in select does not exist" unless vars.keys.include?(val)
@@ -330,6 +350,7 @@ module FatCore
         result << new_row
       end
       result.boundaries = boundaries
+      result.normalize_boundaries
       result
     end
 
@@ -338,10 +359,15 @@ module FatCore
     def where(expr)
       expr = expr.to_s
       result = Table.new
-      ev = Evaluator.new(vars: { row: 0 }, before: '@row += 1')
-      rows.each do |row|
+      ev = Evaluator.new(vars: { row: 0 },
+                         before: '@row = __row; @group = __group')
+      rows.each_with_index do |row, k|
+        vars = row
+        vars[:__row] = k + 1
+        vars[:__group] = row_index_to_group_index(k)
         result << row if ev.evaluate(expr, vars: row)
       end
+      result.normalize_boundaries
       result
     end
 
@@ -452,6 +478,7 @@ module FatCore
         other.normalize_boundaries
         result.append_boundaries(other.boundaries, shift: size)
       end
+      result.normalize_boundaries
       distinct ? result.distinct : result
     end
 
@@ -563,6 +590,7 @@ module FatCore
           end
         end
       end
+      result.normalize_boundaries
       result
     end
 
@@ -621,6 +649,7 @@ module FatCore
       groups.each_pair do |_vals, grp_rows|
         result << row_from_group(grp_rows, group_cols, agg_cols)
       end
+      result.normalize_boundaries
       result
     end
 

data/lib/fat_core/version.rb

@@ -1,7 +1,7 @@
 module FatCore
   MAJOR = 1
   MINOR = 5
-  PATCH = 2
+  PATCH = 3
 
   VERSION = [MAJOR, MINOR, PATCH].compact.join('.')
 end

data/spec/lib/table_spec.rb

@@ -671,6 +671,25 @@ EOS
         expect(tab2[:s].items).to eq([26450449, 169744, 3316041])
         expect(tab2[:c].items).to eq([12492, 25648, 7552])
       end
+
+      it 'should have access to @row and @group vars in evaluating' do
+        aoh = [
+          { a: '5', 'Two words' => '20', s: '5_143', c: '3123' },
+          { a: '4', 'Two words' => '5',  s: 412,     c: 6412 },
+          { a: '7', 'Two words' => '8',  s: '$1721', c: '$1_888' },
+          { a: '5', 'Two words' => '20', s: '4_143', c: '4123' },
+          { a: '4', 'Two words' => '5',  s: 512,     c: 5412 },
+          { a: '7', 'Two words' => '8',  s: '$1621', c: '$2_888' },
+          { a: '5', 'Two words' => '20', s: '3_143', c: '5123' },
+          { a: '4', 'Two words' => '5',  s: 412,     c: 4412 },
+          { a: '7', 'Two words' => '8',  s: '$1521', c: '$3_888' }
+        ]
+        tab = Table.new(aoh).order_by(:a, :two_words)
+        tab2 = tab.select(:a, :two_words, number: '@row', group: '@group')
+        expect(tab2.headers).to eq [:a, :two_words, :number, :group]
+        expect(tab2[:number].items).to eq([1, 2, 3, 4, 5, 6, 7, 8, 9])
+        expect(tab2[:group].items).to eq([1, 1, 1, 2, 2, 2, 3, 3, 3])
+      end
     end
 
     describe 'where' do
@@ -680,7 +699,7 @@ EOS
         expect(tab2[:date].max).to be < Date.parse('2006-06-01')
       end
 
-      it 'should select by boolean columns' do
+      it 'should where by boolean columns' do
         tab =
           [['Ref', 'Date', 'Code', 'Raw', 'Shares', 'Price', 'Info', 'Bool'],
            nil,
@@ -708,6 +727,29 @@ EOS
         tab2 = tab.where('info =~ /xxxx/')
         expect(tab2.rows.size).to eq(0)
       end
+
+      it 'where select by row and group' do
+        tab =
+          [['Ref', 'Date', 'Code', 'Raw', 'Shares', 'Price', 'Info', 'Bool'],
+           nil,
+           [1, '2013-05-02', 'P', 795_546.20, 795_546.2, 1.1850, 'ZMPEF1', 'T'],
+           [2, '2013-05-02', 'P', 118_186.40, 118_186.4, 11.8500, 'ZMPEF1', 'T'],
+           [7, '2013-05-20', 'S', 12_000.00, 5046.00, 28.2804, 'ZMEAC', 'F'],
+           [8, '2013-05-20', 'S', 85_000.00, 35_742.50, 28.3224, 'ZMEAC', 'T'],
+           [9, '2013-05-20', 'S', 33_302.00, 14_003.49, 28.6383, 'ZMEAC', 'T'],
+           [10, '2013-05-23', 'S', 8000.00, 3364.00, 27.1083, 'ZMEAC', 'T'],
+           [11, '2013-05-23', 'S', 23_054.00, 9694.21, 26.8015, 'ZMEAC', 'F'],
+           [12, '2013-05-23', 'S', 39_906.00, 16_780.47, 25.1749, 'ZMEAC', 'T'],
+           [13, '2013-05-29', 'S', 13_459.00, 5659.51, 24.7464, 'ZMEAC', 'T'],
+           [14, '2013-05-29', 'S', 15_700.00, 6601.85, 24.7790, 'ZMEAC', 'F'],
+           [15, '2013-05-29', 'S', 15_900.00, 6685.95, 24.5802, 'ZMEAC', 'T'],
+           [16, '2013-05-30', 'S', 6_679.00, 2808.52, 25.0471, 'ZMEAC', 'T']]
+        tab = Table.new(tab).order_by(:date, :code)
+        tab2 = tab.where('@row > 10')
+        expect(tab2.rows.size).to eq(2)
+        tab2 = tab.where('@group == 3')
+        expect(tab2.rows.size).to eq(3)
+      end
     end
 
     describe 'group_by' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fat_core
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Daniel E. Doherty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-07 00:00:00.000000000 Z
+date: 2017-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov