gd_bam 0.1.2 → 0.1.3

data/lib/bam/version.rb

@@ -1,3 +1,3 @@
 module Bam
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/lib/compiler/compiler.rb

@@ -12,6 +12,7 @@ module GoodData
 
       def self.change_metadata(state, metadata_change_description)
         metadata = state[metadata_change_description[:id]]
+        fail "Looking for metadata \"#{metadata_change_description[:id]}\" but they could not be found." if metadata.nil?
 
         # enrich meta with everything from descriptor. There might be additional stuff so we want this to be part of metadata
         enriched_meta = metadata.merge(metadata_change_description.reject {|k,v|  [:id, :steps, :type].include?(k)})
@@ -19,7 +20,11 @@ module GoodData
         metadata_change_description[:steps].reduce(Metadata.create(enriched_meta)) do |meta_accumulator, step|
           case step[:type]
           when :field_add
-            Metadata.add_field(meta_accumulator, {:name => step[:name]})
+            if step[:field_type].nil?
+              Metadata.add_field(meta_accumulator, {:name => step[:name]})
+            else
+              Metadata.add_field(meta_accumulator, {:name => step[:name], :type => step[:field_type]})
+            end
           when :field_remove
             Metadata.remove_field(meta_accumulator, step[:name])
           end
@@ -43,8 +48,6 @@ module GoodData
           id = current_step[:id] || current_step[:flow_id]
 
           case current_step[:type]
-          when :dummy_tap
-            Flow.add_step(flow_memo, Tap.create(current_step.merge(:source => :dummy, :id => :none)))
           when :tap
             tap = Project.find_tap_by_id(project, id)
             fail "Tap \"#{id}\" which was used in flow \"#{current_step[:flow_id]}\" is not defined" if tap.nil?

data/lib/compiler/etl_visitor.rb

@@ -81,9 +81,9 @@ module GoodData
             changed_metadata = Compiler.change_metadata(state[:metadata], input)
 
             metadata_path = "./metadata/#{node[:flow_id]}/#{Step.step_name(node)}/#{j}_in.xml"
-            GoodData::CloudConnect::Helpers::save_metadata(metadata_path, state[:metadata][name])
+            GoodData::CloudConnect::Helpers::save_metadata(metadata_path, state[:metadata][name].merge(:name => "in_#{j}"))
             metadata_path = "./metadata/#{node[:flow_id]}/#{Step.step_name(node)}/#{j}_out.xml"
-            GoodData::CloudConnect::Helpers::save_metadata(metadata_path, changed_metadata)
+            GoodData::CloudConnect::Helpers::save_metadata(metadata_path, changed_metadata.merge(:name => "out_#{j}"))
             state = state.merge({:metadata => state[:metadata].merge(changed_metadata[:id] => changed_metadata)})
           end
 

data/lib/dsl/dsl.rb

@@ -24,11 +24,6 @@ module GoodData
           @steps << {:type => :tap, :flow_id => @name}.merge(data)
         end
 
-        def dummy_tap(data={})
-          fail "Params for tap need to be hash" unless data.is_a? Hash
-          @steps << {:type => :dummy_tap, :flow_id => @name}.merge(data)
-        end
-
         def sink(data={})
           fail "Params for tap need to be hash" unless data.is_a? Hash
           @steps << {:type => :sink , :flow_id => @name}.merge(data)
@@ -98,7 +93,10 @@ module GoodData
         def add(data, &bl)
           fail "Params need to be hash. This means for example remove(:name => \"value\"). " unless data.is_a? Hash
           fail "Remove field should have at least \"name\" defined. You provided \"#{data}\"." unless data.has_key?(:name)
-          @steps << {:type => :field_add}.merge(data)
+          data_copy = data.clone
+          data_copy[:field_type] = data[:type] unless data[:type].nil?
+          data_copy.delete(:type)
+          @steps << {:type => :field_add}.merge(data_copy)
         end
 
         def remove(data, &bl)

metadata

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