gd_bam 0.1.9 → 0.1.10

data/lib/bam/version.rb

@@ -1,3 +1,3 @@
 module Bam
-  VERSION = '0.1.9'
+  VERSION = '0.1.10'
 end

data/lib/generators/downloaders.rb

@@ -364,30 +364,25 @@ HEREDOC
                 timestamp_field = Tap.find_output_field(tap, "Timestamp")
                 id_field = Tap.find_output_field(tap, "Id")
                 tap = Tap.prepare_for_sf_downloader(tap)
-                builder.Phase(:number => phase += 1) do
-                  # Core::build_node2(builder, Nodes.es_truncate2({:guiName => dataset, :store => store, :entity => dataset, :timestamp => "${#{dataset}_TRUNCATE_DATE}", :name => "#{module_name} es truncate", :id => "#{module_name}_es_truncate"}))
-                end
 
                 fields = tap[:fields]
-                
-                puts tap[:object]
+
+                # puts tap[:object]
                 sf_object = tap[:object]
                 id_field = Tap.find_output_field(tap, "Id")
                 timestamp_field = Tap.find_output_field(tap, "Timestamp")
-                
-                
+
                 objects_to_get = Helpers.objects_for_history(client, tap)
-                
+
                 (tap[:fields] - [id_field, timestamp_field]).each_with_index do |field, i|
                   builder.Phase(:number => phase += 1) do
-                    
-                    f = field[:name]
 
+                    f = field[:name]
                     selects = objects_to_get.reduce([]) do |memo, o|
                       fields = client.fields(o)
-                      generic_field_history = ["NewValue", "OldValue", "ParentId"].all? {|f| fields.include?(f)}
-                      specific_field_history = ["NewValue", "OldValue", "#{sf_object}Id"].all? {|f| fields.include?(f)}
-                      specific_history = ["SystemModstamp", "#{sf_object}Id"].all? {|f| fields.include?(f)}
+                      generic_field_history = ["NewValue", "OldValue", "ParentId"].all? {|fl| fields.include?(fl)}
+                      specific_field_history = ["NewValue", "OldValue", "#{sf_object}Id"].all? {|fl| fields.include?(fl)}
+                      specific_history = ["SystemModstamp", "#{sf_object}Id"].all? {|fl| fields.include?(fl)}
 
                       select, mapping, mandatory = if generic_field_history
                         [
@@ -401,7 +396,6 @@ HEREDOC
                         ]
                       elsif specific_field_history
                         [
-                          
                           "SELECT NewValue, CreatedDate, #{sf_object}Id FROM #{o} WHERE Field = '#{f}'",
                           "{\"xmlFieldsMapping\":{\"xmlFields\":[
                           {\"xmlFieldMapping\":{\"name\":\"NewValue\",\"label\":\"NewValue\",\"xmlPath\":\"NewValue\",\"metadataField\":\"Value\"}},
@@ -452,14 +446,14 @@ HEREDOC
                         :mandatory => ["Id", f, "SystemModstamp"]
                       }])
                       selects.each_with_index do |obj, i|
-                      
+
                         o = obj[:object]
                         mapping = obj[:mapping]
                         select = obj[:query]
                         mandatory = obj[:mandatory]
+                        # puts "#{f}_#{o}_reader:0 -> #{f}_#{sf_object}_gather:#{i}"
 
                         Core::build_node2(builder, Nodes.sfdc_reader2({:name => "#{o} SF Reader #{i}", :id => "#{f}_#{o}_reader", :soql => select, :sfdcConnection => "SFDC", :fieldsMapping => mapping, :mandatoryFields => mandatory.join(';')}))
-                        puts "#{f}_#{o}_reader:0 -> #{f}_#{sf_object}_gather:#{i}"
                         Core::build_node2(builder, Nodes.edge2({:toNode => "#{f}_#{sf_object}_gather:#{i}", :fromNode => "#{f}_#{o}_reader:0", :metadata => "data_metadata"}))
                       end
                       Core::build_node2(builder, Nodes.gather2({:name => "#{f} Gather", :id => "#{f}_#{sf_object}_gather"}))
@@ -488,10 +482,10 @@ HEREDOC
                 end
               end
               taps_with_history.each do |tap|
-                puts "#{tap[:id]}_LAST_RUN"
+                # puts "#{tap[:id]}_LAST_RUN"
                 builder.Phase(:number => phase += 1) do
-                              generate_func = <<HEREDOC
-  function integer generate() {
+                generate_func = <<HEREDOC
+function integer generate() {
 date time_end = jodaStr2date("${#{tap[:id]}_END}",["yyyy-MM-dd'T'HH:mm:ss.SSSZZ"], 'en_US', 'UTC', 'UTC');
 $out.0.key = "#{tap[:id]}_LAST_RUN";
 $out.0.value = jodaDate2str(time_end,"yyyy-MM-dd'T'HH:mm:ss.SSSZZ", 'en_US', 'UTC');

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gd_bam
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
   prerelease: 
 platform: ruby
 authors: