gd_bam 0.1.25 → 0.1.26

data/lib/bam/version.rb

@@ -1,3 +1,3 @@
 module Bam
-  VERSION = '0.1.25'
+  VERSION = '0.1.26'
 end

data/lib/base/sink.rb

@@ -21,6 +21,10 @@ module GoodData
         sink[:fields].find_all {|f| f[:type] == "date"}
       end
 
+      def self.get_fact_fields(sink)
+        sink[:fields].find_all {|f| f[:type] == "fact"}
+      end
+
       def self.add_target_type(sink)
         target = sink[:target].to_s
         path = Pathname(target)

data/lib/cloud_connect/dsl/helpers.rb

@@ -82,6 +82,14 @@ module GoodData
         metadata(builder, sf_description)
       end
 
+      # prepares a sink for sinking into GD. This means dealing with stuff like scientific notation which is handled bu uploading as a decimal and not string
+      def self.sink_out_gd_metadata(metadata, sink)
+        metadata_fields = metadata[:fields]
+        sink_facts = GoodData::Bam::Sink.get_fact_fields(sink).map {|f| f[:meta]}
+        x = metadata_fields.map {|f| sink_facts.include?(f[:name]) ? f.merge({:type => "decimal"}) : f}
+        GoodData::Bam::Metadata.create(metadata.merge({:fields => x}))
+      end
+
       def self.metadata(builder, description)
         builder.Record({
             :fieldDelimiter => description[:fieldDelimiter],

data/lib/generators/etl.rb

@@ -108,13 +108,17 @@ module GoodData
                 builder.Metadata({:id => "load_metadata"}) do |builder| 
                   Helpers::csv_metadata(builder, state[:metadata][input_name])
                 end
+                builder.Metadata({:id => "gd_sink_metadata"}) do |builder| 
+                  Helpers::csv_metadata(builder, Helpers::sink_out_gd_metadata(state[:metadata][input_name], sink))
+                end
+                
               end
 
               builder.Phase(:number => 0) do
                 gd_dataset = sink[:gd_name] || sink[:id]
                 to_svinstvo = GoodData::CloverGenerator::build_gd_dataset_loader_json(sink)
                 Core::build_node2(builder, Nodes.reader2({:name => "CSV Loader", :id => "loader", :fileURL => "${PROJECT}/data/#{input_name}.csv"}))
-                Core::build_node2(builder, Nodes.edge2({:toNode => "gd_load:0", :fromNode => "reformat:0", :metadata => "load_metadata"}))
+                Core::build_node2(builder, Nodes.edge2({:toNode => "gd_load:0", :fromNode => "reformat:0", :metadata => "gd_sink_metadata"}))
 
                 transform = <<HEREDOC
 function string gd_date_compliance(string a_date) {
@@ -127,12 +131,20 @@ function string gd_date_compliance(string a_date) {
   return a_date;
 }
 
+function decimal deal_with_scientific_notation(string a_number) {
+  return str2decimal(a_number);
+}
+
 function integer transform() {
     $out.0.* = $in.0.*;
     #{Sink.get_date_fields(sink).map do |f|
       "$out.0.#{f[:meta]} = gd_date_compliance($in.0.#{f[:meta]});"
     end.join("\n")}
 
+    #{Sink.get_fact_fields(sink).map do |f|
+      "$out.0.#{f[:meta]} = deal_with_scientific_notation($in.0.#{f[:meta]});"
+    end.join("\n")}
+
     return ALL;
 }
 HEREDOC

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gd_bam
 version: !ruby/object:Gem::Version
-  version: 0.1.25
+  version: 0.1.26
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-27 00:00:00.000000000 Z
+date: 2013-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake