dataflow-rb 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ccef7eb0d8bf531e4e19c62562763dff31f85f4
-  data.tar.gz: 9c5e496748df17dcc3fd41ea90c4c3b5dd4df43a
+  metadata.gz: 414f1c416fbd86a60fbc37db119f2c34a511486a
+  data.tar.gz: 2c63094740e4fcde2dddfdd7344c3fd90b1893b5
 SHA512:
-  metadata.gz: 2c62ef0c24df46a551d5a90bd8d7cf4b6b4ece57bbfd3dad720c7399b4b325ae949d10f3f644403413f2534f1ae08ae797dcaf8d925bea28d2da8b23c7ca0b3a
-  data.tar.gz: 95f0b3764d07d39cb15ef06a5fcea00e71942d02560b0b4e3475adf3a83b8b70d719f42d260decb496ad44668cdc3947fc32567b84b7eb0fd5a35b0e356e97a0
+  metadata.gz: '028244e631dd52380ebbe9fc4a3b2c9709ee97e883becbadf07d1cd0142a34de4aacb6e497f5572e04bd41ba9f7b4131134039c8a5c428f499a57690f4e72c76'
+  data.tar.gz: 3f22f68c3f703749b0b2d54bb98210081efbcca2c48dd4272f5b08f478c78d504ba97c15a52eca4129e569e03cc8a961fc6d01254dfef135a436c1d9993b5418

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "dataflow"
+require "dataflow-rb"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/lib/dataflow-rb.rb

@@ -47,7 +47,7 @@ require 'dataflow/nodes/filter/where_node'
 require 'dataflow/nodes/transformation/to_time_node'
 
 unless defined?(Rails) || Mongoid.configured?
-  env = defined?(RSpec) ? 'test' : 'default'
+  env = ENV['MONGOID_ENV'] || 'default'
   # setup mongoid for stand-alone usage
   config_file_path = File.join(File.dirname(__FILE__), 'config', 'mongoid.yml')
   Mongoid.load!(config_file_path, env)

data/lib/dataflow/adapters/sql_adapter.rb

@@ -320,6 +320,8 @@ module Dataflow
           index['unique'] = true if idx[:unique]
           index
         end.compact
+      rescue Sequel::DatabaseError
+        []
       end
 
       def logger

data/lib/dataflow/nodes/compute_node.rb

@@ -16,7 +16,7 @@ module Dataflow
 
       delegate :find, :all, :all_paginated, :count, :ordered_system_id_queries,
                :db_backend, :db_name, :use_symbols?,
-               :schema, :read_dataset_name, :write_dataset_name,
+               :read_dataset_name, :write_dataset_name,
                to: :data_node
 
       #############################################
@@ -300,6 +300,11 @@ module Dataflow
         release_computing_lock!
       end
 
+      # Keep a compatible interface with the data node
+      def schema
+        required_schema
+      end
+
       private
 
       # Compute implementation:
@@ -390,7 +395,7 @@ module Dataflow
 
       # Override to define a required schema.
       def required_schema
-        schema
+        data_node&.schema
       end
 
       def send_heartbeat

data/lib/dataflow/nodes/join_node.rb

@@ -35,9 +35,9 @@ module Dataflow
 
         # merge both dependencies schemas
         sch1 = dependencies.first.schema || {}
-        sch1 = sch1.select { |k,v| select_keys1.include?(k) } if select_keys1.present?
+        sch1 = sch1.select { |k,v| select_keys1.include?(k.to_s) } if select_keys1.present?
         sch2 = dependencies.second.schema || {}
-        sch2 = sch2.select { |k,v| select_keys2.include?(k) } if select_keys2.present?
+        sch2 = sch2.select { |k,v| select_keys2.include?(k.to_s) } if select_keys2.present?
         sch = sch1.merge(sch2)
 
         sch

data/lib/dataflow/nodes/select_keys_node.rb

@@ -15,16 +15,15 @@ module Dataflow
       private
 
       def compute_batch(records:)
-        k = keys
-        k = k.map(&:to_sym) if dependencies.first.use_symbols?
-        select_keys(records: records, keys: k)
+        keys_tokens = keys.map { |k| [k, record_dig_tokens(key: k, use_sym: dependencies.first.use_symbols?)] }
+        select_keys(records: records, keys_tokens: keys_tokens)
       end
 
-      def select_keys(records:, keys:)
+      def select_keys(records:, keys_tokens:)
         records.map do |base_record|
           new_record = {}
-          keys.each do |key|
-            value = record_value(record: base_record, key: key)
+          keys_tokens.each do |key, tokens|
+            value = base_record.dig(*tokens)
             next unless value.present?
 
             add_value_to_record(record: new_record, key: key, value: value)

data/lib/dataflow/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Dataflow
-  VERSION = '0.10.0'
+  VERSION = '0.10.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dataflow-rb
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Eurico Doirado
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-03 00:00:00.000000000 Z
+date: 2017-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler