sub_job.rb in remi-0.3.1

- old
+ new

@@ -9,11 +9,12 @@
     end
 
     attr_accessor :sub_job, :data_subject
 
     def extract
-      sub_job.job.send(data_subject).df
+      sub_job.execute unless sub_job.sub_job.send(data_subject).is_a? Remi::DataSource
+      sub_job.sub_job.send(data_subject).df
     end
 
     private
 
     def init_sub_job_extractor(*args, sub_job:, data_subject:, **kargs, &block)
@@ -24,27 +25,35 @@
   end
 
   class Loader::SubJob < Loader
     # @param sub_job [Object] The name (relative to parent job) of the subjob to use
     # @param data_subject [Symbol] The name (relatvie to the sub job) of the sub job's data frame
+    # @param merge_fields [True,False] Indicates whether fields from the calling data subject
+    #   should be merged with those defined in the sub job.
     def initialize(*args, **kargs, &block)
       super
       init_sub_job_loader(*args, **kargs, &block)
     end
 
-    attr_accessor :sub_job, :data_subject
+    attr_accessor :sub_job, :data_subject, :merge_fields
 
     # @param data_frame [Object] Data frame to load to target sub job data subject
     # @return [true] On success
     def load(data_frame)
-      sub_job.job.send(data_subject).df = data_frame
+      sub_job.sub_job.send(data_subject).df = data_frame
+      sub_job.sub_job.send(data_subject).fields.merge! fields if merge_fields
       true
     end
 
+    def autoload
+      true
+    end
+
     private
 
-    def init_sub_job_loader(*args, sub_job:, data_subject:, **kargs, &block)
+    def init_sub_job_loader(*args, sub_job:, data_subject:, merge_fields: true, **kargs, &block)
       @sub_job = sub_job
       @data_subject = data_subject
+      @merge_fields = merge_fields
     end
   end
 end