active_data_frame 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32b9b56e2515e43f2a30a10a35fd3c86d8de0bdf
-  data.tar.gz: 875f4e3f4cd9f19d4b0141b4c34a9420a36a06cd
+  metadata.gz: 5abd3830f2bf5e0f595989c683cffa60824b5d9f
+  data.tar.gz: 0eb17250b5757d7b3c22d360ef51b03940bf94ad
 SHA512:
-  metadata.gz: a4558730591012b79e19b19588a925e54b6678fdc279dc457bbad11c08ffdd3b2d4fd55c5d5668e90ed19c1ada58cd9ec73614fbfdbb72765f904ddd5c0509d1
-  data.tar.gz: f9b7852d03b01c23144c12780b87953e8d89fa039635e3bd2a7eb3029ad9ce0df6ee882c8bc1a2b902b7500a74d861aa8ace3720eb9d4b62b79abc5f40e8f9cc
+  metadata.gz: c7d82826bdb6bcf86ff7a9121eaba7ef67639d28a92b275f4c2e194ddebf295b6844cc803bf88eabed3e1c9b800355720f29848657a69a967195eb6ac100230c
+  data.tar.gz: e819eb7ff555c71e83fc5a99531276b21bc0d1b36d59cdbd1e616d71cf42212da436db177faef2111502045a8ec7ed85b2d28a1794965912de9f4ee3bde08859

data/active_data_frame.gemspec

@@ -31,5 +31,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest-reporters', '~> 1.1', '>= 1.1.0'
   spec.add_development_dependency 'minitest-around', '0.4.1'
   spec.add_runtime_dependency     'activerecord', '~> 5.0'
-  spec.add_runtime_dependency     'rmatrix', '~> 0.1.17', '>=0.1.17'
+  spec.add_runtime_dependency     'rmatrix', '~> 0.1.19', '>=0.1.19'
 end

data/lib/active_data_frame/data_frame_proxy.rb

@@ -22,18 +22,21 @@ module ActiveDataFrame
     def [](*ranges)
       result = get(extract_ranges(ranges))
       if @value_map
-        result.map{|row| reverse_value_map[row]}
+        result.to_type(M::Typecode::OBJECT).mmap{|row| reverse_value_map[row]}.tap do |mapped|
+          mapped.row_map = result.row_map
+        end
       else
         result
       end
     end
 
     def []=(from, values)
-      values = Array(values).flatten.map(&@value_map.method(:[])) if @value_map
+
       from = column_map[from] if column_map && column_map[from]
       if values.kind_of?(Hash)
         values = verify_and_cleanse_hash_values(values)
       else
+        values = Array(values).flatten.map(&@value_map.method(:[])) if @value_map
         values = M[values, typecode: block_type::TYPECODE].to_a.flatten
       end
       set(from, values)
@@ -42,6 +45,7 @@ module ActiveDataFrame
     def verify_and_cleanse_hash_values(map)
       length = nil
       map.transform_values do |values|
+        values = Array(values).flatten.map(&@value_map.method(:[])) if @value_map
         cleansed = M[values, typecode: block_type::TYPECODE].to_a.flatten
         raise "All streams provided via a hash must be of the same length" if length && length != cleansed.length
         length ||= cleansed.length
@@ -51,7 +55,7 @@ module ActiveDataFrame
 
     def clear(*ranges)
       extract_ranges(ranges).each do |r|
-        set(r.first, M.blank(columns: r.last - r.first, typecode: block_type::TYPECODE), trim: true)
+        set(r.first, V.blank(columns: r.last - r.first, typecode: block_type::TYPECODE).to_a, trim: true)
       end
     end
 

data/lib/active_data_frame/database.rb

@@ -129,7 +129,7 @@ module ActiveDataFrame
           #
           ids = existing_slice.map {|_, (_, id)| id}
           updates = columns.map.with_index do |column, column_idx|
-            [column, "CASE period_index\n#{existing_slice.map{|period_index, (values, _)| "WHEN #{period_index} then #{values[column_idx]}"}.join("\n")} \nEND\n"]
+            [column, "CASE \n#{existing_slice.map{|period_index, (values, df_id)| "WHEN period_index=#{period_index} AND data_frame_id=#{df_id} then #{values[column_idx]}" }.join("\n")} \nEND\n"]
           end.to_h
           update_statement = updates.map{|cl, up| "#{cl} = #{up}" }.join(', ')
           Database.execute(<<-SQL

data/lib/active_data_frame/row.rb

@@ -14,8 +14,11 @@ module ActiveDataFrame
 
     def self.set_all(scope, block_type, data_frame_type, from, values, trim: false)
       if trim || ActiveRecord::Base.connection_config[:adapter] === 'mysql2'
-        scope.each do |instance|
-          Row.new(block_type, data_frame_type, instance).patch(from, values.kind_of?(Hash) ? values[instance.id] : values)
+        case values
+        when Hash then scope.where(id: values.keys)
+                            .each{|instance| Row.new(block_type, data_frame_type, instance)
+                            .patch(from, values[instance.id]) }
+        else           scope.each{|instance| Row.new(block_type, data_frame_type, instance).patch(from, values) }
         end
       else
         upsert_all(scope, block_type, data_frame_type, from, values)
@@ -111,7 +114,7 @@ module ActiveDataFrame
       existing = self.class.suppress_logs{
         blocks_between(all_bounds).pluck(:period_index, *block_type::COLUMNS).map{|pi, *values| [pi, values]}.to_h
       }
-      result   = M.blank(typecode: block_type::TYPECODE, columns: all_bounds.map(&:length).sum)
+      result = V.blank(typecode: block_type::TYPECODE, columns: all_bounds.map(&:length).sum)
 
       iterate_bounds(all_bounds) do |index, left, right, cursor, size|
         if block = existing[index]

data/lib/active_data_frame/table.rb

@@ -220,7 +220,7 @@ module ActiveDataFrame
           M[values, typecode: block_type::TYPECODE].mask{|x|
             index += 1
             !all_bounds.any?{|b| (b.from.position..b.to.position).include?(index) } || filter[x, args.values.first ]
-          }.where.to_a.map{|v| block_type::BLOCK_SIZE * period_index + v}.to_a
+          }.where.to_a.flatten.map{|v| block_type::BLOCK_SIZE * period_index + v}.to_a
         end
 
         if column_map
@@ -238,7 +238,7 @@ module ActiveDataFrame
         case_map  = build_case_map(all_bounds)
         existing  = blocks_between(all_bounds).group(:period_index).pluck(:period_index, *column_cases(case_map, agg))
                     .map{|pi, *values| [pi, values]}.to_h
-        result = M.blank(columns: all_bounds.map(&:length).sum, typecode: block_type::TYPECODE)
+        result = V.blank(columns: all_bounds.map(&:length).sum, typecode: block_type::TYPECODE)
 
         iterate_bounds(all_bounds) do |index, left, right, cursor, size|
           if block = existing[index]

data/lib/active_data_frame/version.rb

@@ -1,3 +1,3 @@
 module ActiveDataFrame
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_data_frame
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Wouter Coppieters
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-19 00:00:00.000000000 Z
+date: 2018-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -188,20 +188,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.17
+        version: 0.1.19
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.17
+        version: 0.1.19
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.17
+        version: 0.1.19
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.17
+        version: 0.1.19
 description: An active data frame helper
 email:
 - wc@pico.net.nz