fat_core 1.2.7 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7c14451e2d5f7edfd5f371cb27d40b0d2660150
-  data.tar.gz: 4c50850958423f3e2b35a544c89e6621e92984db
+  metadata.gz: b584803e27f06145ac112e534d19283bb680c525
+  data.tar.gz: 03f00dfaca603a3487db9b5f702aa188510151cb
 SHA512:
-  metadata.gz: eb202c94dbe14cdcd58383f3ed56a57864b927c89196418672f3de5111dfc5feba82b5cbb610e150e49b9596f78c2a93243b5f3fc206c53838e3141bf5848fa6
-  data.tar.gz: 105eef5f77140aaab7775c5d47ad6b92c3ad4beb54cf230ce207993376459559373a85c190364e52c3bb6f9eb643ae3e4072da0e4fc6d3c3642e8b2fab4c29aa
+  metadata.gz: 71655e984f1019ce9a7c3ae3fc6f180b317061a892dc37315070aca2c5ffc0765ba35fc4e227924bebf9145fc13b3ebe6a70dfc080a364b6d3327b1071a253b0
+  data.tar.gz: 7b7a975597653fa34761a7e075bb8f1f5bdd17d3018c29538bced08b47332972f208d4017d1a990a87e53f674606a61d558194a281e484e0e0838ca3ee5b2cc9

data/.ruby-version

@@ -1 +1 @@
-2.2.2
+2.3.0

data/lib/fat_core/table.rb

@@ -165,58 +165,47 @@ module FatCore
     # hash arguments. Each expression results in a column in the resulting Table
     # in the order given. The expressions are evaluated in order as well.
     def select(*exps)
+      result = Table.new
       new_cols = {}
-      new_heads = []
-      exps.each do |exp|
-        case exp
-        when Symbol, String
-          h = exp.as_sym
-          raise "Column '#{h}' in select does not exist" unless column?(h)
-          new_heads << h
-          new_cols[h] = Column.new(header: h,
-                                   items: column(h).items)
-        when Hash
-          exp.each_pair do |key, xp|
-            case xp
-            when Symbol
-              h = xp.as_sym
-              raise "Column '#{key}' in select does not exist" unless column?(key)
-              new_heads << h
-              new_cols[h] = Column.new(header: h,
-                                       items: column(key).items)
-            when String
-              # Evaluate xp in the context of a binding including a local
-              # variable for each original column with the name as the head and
-              # the value for the current row as the value and a local variable
-              # for each new column with the new name and the new value.
-              h = key.as_sym
-              new_heads << h
-              new_cols[h] = Column.new(header: h)
-              ev = Evaluator.new(vars: { row: 0 }, before: '@row += 1')
-              rows.each_with_index do |old_row, row_num|
-                new_row ||= {}
-                # Gather the new values computed so far for this row
-                new_vars = new_heads.zip(new_cols.keys
-                                           .map { |k| new_cols[k] }
-                                           .map { |c| c[row_num] })
-                vars = old_row.merge(Hash[new_vars])
+      ev = Evaluator.new(vars: { row: 0 }, before: '@row += 1')
+      rows.each do |old_row|
+        new_heads = []
+        new_row ||= {}
+        exps.each do |exp|
+          case exp
+          when Symbol, String
+            h = exp.as_sym
+            raise "Column '#{h}' in select does not exist" unless column?(h)
+            new_row[h] = old_row[h]
+          when Hash
+            # Note that when one of the exps is a Hash, it will contain an
+            # output expression for each member of the Hash, so we have to loop
+            # through them here.
+            exp.each_pair do |key, val|
+              # Gather the new values computed so far for this row
+              vars = old_row.merge(new_row)
+              case val
+              when Symbol
+                h = val.as_sym
+                raise "Column '#{h}' in select does not exist" unless vars.keys.include?(h)
+                new_row[key] = vars[h]
+              when String
                 # Now we have a hash, vars, of all local variables we want to be
                 # defined while evaluating expression xp as the value of column
                 # key in the new column.
-                new_row[h] = ev.evaluate(xp, vars: vars)
-                new_cols[h] << new_row[h]
+                h = key.as_sym
+                new_row[h] = ev.evaluate(val, vars: vars)
+                # Don't add this column to new_heads until after the eval so it
+                # does not shadow the existing value of row[h].
+              else
+                raise 'Hash parameters to select must be a symbol or string'
               end
-            else
-              raise 'Hash parameters to select must be a symbol or string'
             end
+          else
+            raise 'Parameters to select must be a symbol, string, or hash'
           end
-        else
-          raise 'Parameters to select must be a symbol, string, or hash'
         end
-      end
-      result = Table.new
-      new_heads.each do |h|
-        result.add_column(new_cols[h])
+        result.add_row(new_row)
       end
       result
     end

data/lib/fat_core/version.rb

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

data/spec/lib/table_spec.rb

@@ -593,7 +593,7 @@ EOS
           { a: '7', 'Two words' => '8',  s: '$1821', c: '$1888' }
         ]
         tab1 = Table.new(aoh)
-        tab2 = tab1.select(s: :former_s, a: :new_a, c: :renew_c)
+        tab2 = tab1.select(former_s: :s, new_a: :a, renew_c: :c)
         expect(tab2.headers).to eq [:former_s, :new_a, :renew_c]
       end
 
@@ -608,6 +608,19 @@ EOS
                            arb: 's_squared / (a + c).to_d')
         expect(tab2.headers).to eq [:two_words, :row, :s_squared, :arb]
       end
+
+      it 'should be able to use old value of current column to compute new value' 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: '$1821', c: '$1_888' }
+        ]
+        tab1 = Table.new(aoh)
+        tab2 = tab1.select(:two_words, s: 's * s', nc: 'c + c', c: 'nc+nc')
+        expect(tab2.headers).to eq [:two_words, :s, :nc, :c]
+        expect(tab2[:s].items).to eq([26450449, 169744, 3316041])
+        expect(tab2[:c].items).to eq([12492, 25648, 7552])
+      end
     end
 
     describe 'where' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fat_core
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.8
 platform: ruby
 authors:
 - Daniel E. Doherty
@@ -256,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: fat_core provides some useful core extensions