gooddata 0.6.0.pre8 → 0.6.0.pre9

data/bin/gooddata

@@ -55,11 +55,11 @@ arg_name 'logger'
 switch [:l,:logger]
 
 
-desc 'Describe list here'
+desc 'Work with deployed processes'
 arg_name 'Describe arguments to list here'
 command :process do |c|
 
-  c.desc 'Use when you need to redeploy a process'
+  c.desc 'Use when you need to redeploy a specific process'
   c.default_value nil
   c.flag :process_id
 
@@ -75,6 +75,7 @@ command :process do |c|
   c.default_value nil
   c.flag :name
 
+  c.desc "Lists all user's processes deployed on the plaform"
   c.command :list do |list|
     list.action do |global_options,options,args|
       opts = options.merge(global_options)
@@ -83,6 +84,7 @@ command :process do |c|
     end
   end
 
+  c.desc "Gives you some basic info about the process"
   c.command :get do |get|
     get.action do |global_options,options,args|
       opts = options.merge(global_options)
@@ -91,6 +93,7 @@ command :process do |c|
     end
   end
 
+  c.desc "Deploys provided directory to the server"
   c.command :deploy do |deploy|
     deploy.action do |global_options,options,args|
       opts = options.merge(global_options)
@@ -105,6 +108,7 @@ desc 'Some basic API stuff directly from CLI'
 arg_name 'info|test|get|delete'
 command :api do |c|
 
+  c.desc "Info about the API version etc"
   c.command :info do |info|
     info.action do |global_options,options,args|
       opts = options.merge(global_options)
@@ -113,6 +117,7 @@ command :api do |c|
     end
   end
 
+  c.desc "GET request on our API"
   c.command :get do |get|
     get.action do |global_options,options,args|
       opts = options.merge(global_options)
@@ -128,6 +133,7 @@ desc 'Describe add here'
 arg_name 'show'
 command :profile do |c|
   
+  c.desc "Show your profile"
   c.command :show do |show|
     show.action do |global_options,options,args|
       opts = options.merge(global_options)
@@ -142,6 +148,7 @@ desc 'Scaffold things'
 arg_name 'show'
 command :scaffold do |c|
 
+  c.desc "Scaffold a gooddata project blueprint"
   c.command :project do |project|
     project.action do |global_options, options, args|
       name = args.first
@@ -150,6 +157,7 @@ command :scaffold do |c|
     end
   end
 
+  c.desc "Scaffold a gooddata ruby brick. This is a piece of code that you can run on our platform"
   c.command :brick do |brick|
     # brick.arg_name 'name'
     brick.action do |global_options, options, args|
@@ -164,6 +172,7 @@ desc 'Manage your projects'
 arg_name 'project_command'
 command :project do |c|
 
+  c.desc "Lists user's projects"
   c.command :list do |list|
     list.action do |global_options,options,args|
       opts = options.merge(global_options)
@@ -173,6 +182,7 @@ command :project do |c|
     end
   end
 
+  c.desc "If you are in a gooddata project blueprint or if you provide a project id it will start an interactive session inside that project"
   c.command :jack_in do |jack|
     jack.action do |global_options,options,args|
       goodfile_path = GoodData::Helpers.find_goodfile(Pathname('.'))
@@ -202,6 +212,7 @@ command :project do |c|
     end
   end
 
+  c.desc "Create a gooddata project"
   c.command :create do |create|
     create.action do |global_options,options,args|
       title = ask "Project name"
@@ -221,6 +232,7 @@ command :project do |c|
     end
   end
 
+  c.desc "Delete a project. Be careful this is impossible to revert"
   c.command :delete do |delete|
     delete.action do |global_options,options,args|
       id = global_options[:project_id]
@@ -230,6 +242,7 @@ command :project do |c|
     end
   end
 
+  c.desc "Clones a project. Useful for testing"
   c.command :clone do |clone|
     clone.desc 'Name of the new project'
     clone.default_value nil
@@ -246,6 +259,7 @@ command :project do |c|
     end
   end
 
+  c.desc "Shows basic info about a project"
   c.command :show do |show|
     show.action do |global_options,options,args|
       id = global_options[:project_id]
@@ -256,6 +270,7 @@ command :project do |c|
     end
   end
 
+  c.desc "If you are in a gooddata project blueprint it will apply the changes. If you do not provide a project id it will build it from scratch and create a project for you."
   c.command :build do |show|
     show.action do |global_options,options,args|
       goodfile = JSON.parse(File.read(GoodData::Helpers.find_goodfile(Pathname('.'))), :symbolize_names => true)
@@ -279,9 +294,10 @@ command :project do |c|
 
 end
 
-desc 'Work with your credentials'
+desc 'Work with your locally stored credentials'
 command :auth do |c|
 
+  c.desc "Store your credentials to ~/.gooddata so client does not have to ask you every single time"
   c.command :store do |store|
     store.action do |global_options,options,args|
       GoodData::Command::Auth.store
@@ -290,7 +306,7 @@ command :auth do |c|
 
 end
 
-desc 'Run ruby bricks'
+desc 'Run ruby bricks either locally or remotely deployed on our server'
 # arg_name 'show'
 command :run_ruby do |c|
 
@@ -313,7 +329,6 @@ command :run_ruby do |c|
   c.default_value nil
   c.flag [:n, :name]
   
-
   c.action do |global_options, options, args|
     options[:expanded_params] = if (options[:params])
       JSON.parse(File.read(options[:params]), :symbolize_names => true)
@@ -322,10 +337,10 @@ command :run_ruby do |c|
     end
     
     opts = options.merge(global_options).merge({:type => "RUBY"})
+    GoodData.connect(opts)
     if options[:remote]
       fail "You have to specify name of the deploy when deploying remotely" if options[:name].nil? || options[:name].empty?
       require 'gooddata/commands/process'
-      GoodData.connect(opts)
       GoodData::Command::Process.run(options[:dir], opts) do
         puts "would run"
       end

data/lib/gooddata/goodzilla/goodzilla.rb

@@ -25,9 +25,14 @@ module GoodData::SmallGoodZilla
   end
 
   def self.interpolate_ids(*ids)
-    res = GoodData::MdObject.identifier_to_uri(*ids.flatten)
-    fail "Not all of the identifiers were resolved" if (Array(res).size != ids.flatten.size)
-    res
+    ids = ids.flatten
+    if ids.empty?
+      []
+    else
+      res = GoodData::MdObject.identifier_to_uri(*ids)
+      fail "Not all of the identifiers were resolved" if (Array(res).size != ids.size)
+      res
+    end
   end
 
   def self.interpolate_values(keys, values)

data/lib/gooddata/model.rb

@@ -95,6 +95,15 @@ module GoodData
         puts "Done loading"
       end
 
+      def merge_dataset_columns(a_schema_blueprint, b_schema_blueprint)
+         d = Marshal.load(Marshal.dump(a_schema_blueprint))
+         d[:columns] = d[:columns] + b_schema_blueprint[:columns]
+         d[:columns].uniq!
+         columns_that_failed_to_merge = d[:columns].group_by {|x| x[:name]}.map {|k, v| [k, v.count]}.find_all {|x| x[1] > 1}
+         fail "Columns #{columns_that_failed_to_merge} failed to merge. When merging columns with the same name they have to be identical." unless columns_that_failed_to_merge.empty?
+         d
+      end
+
     end
 
     class ProjectBlueprint
@@ -122,6 +131,28 @@ module GoodData
         @data = init_data
       end
 
+      def model_validate
+        if datasets.count == 1
+          []
+        else
+          x = datasets.reduce([]) {|memo, schema| schema.has_anchor? ? memo << [schema.name, schema.anchor[:name]] : memo }          
+          refs = datasets.reduce([]) do |memo, dataset|
+            memo.concat(dataset.references)
+          end
+          refs.reduce([]) do |memo, ref|
+            x.include?([ref[:dataset], ref[:reference]]) ? memo : memo.concat([ref])
+          end
+        end
+      end
+
+      def model_valid?
+        errors = model_validate
+        errors.empty? ? true :false
+      end
+
+      def title
+        data[:title]
+      end
     end
 
     class SchemaBlueprint
@@ -162,6 +193,34 @@ module GoodData
         data[:columns]
       end
 
+      def has_anchor?
+        columns.any? {|c| c[:type] == :anchor}
+      end
+
+      def anchor
+        find_column_by_type(:anchor, :first)
+      end
+
+      def references
+        find_column_by_type(:reference)
+      end
+
+      def find_column_by_type(type, all=:all)
+        if all == :all
+          columns.find_all {|c| c[:type] == type}
+        else
+          columns.find {|c| c[:type] == type}
+        end
+      end
+
+      def find_column_by_name(type, all=:all)
+        if all == :all
+          columns.find_all {|c| c[:name] == type}
+        else
+          columns.find {|c| c[:name] == type}
+        end
+      end
+
       def to_schema
         Schema.new(to_hash)
       end
@@ -177,6 +236,11 @@ module GoodData
         printer.text columns.map {|c| "  #{c[:name]}: #{c[:type]}"}.join("\n")
       end
 
+      def dup
+        deep_copy = Marshal.load(Marshal.dump(data))
+        SchemaBlueprint.new(deep_copy)
+      end
+
     end
 
     class ProjectBuilder
@@ -218,7 +282,15 @@ module GoodData
       def add_dataset(name, &block)
         builder = GoodData::Model::SchemaBuilder.new(name)
         block.call(builder)
-        @datasets << builder.to_hash
+        if @datasets.any? {|item| item[:name] == name}
+          ds = @datasets.find {|item| item[:name] == name}
+          index = @datasets.index(ds)
+          stuff = GoodData::Model.merge_dataset_columns(ds, builder.to_hash)
+          @datasets.delete_at(index)
+          @datasets.insert(index, stuff)
+        else
+          @datasets << builder.to_hash
+        end
       end
 
       def add_report(title, options={})

data/lib/gooddata/models/metric.rb

@@ -25,13 +25,13 @@ module GoodData
       def create(options={})
         if options.is_a?(String)
           expression = options
-          extended_notation = true
+          extended_notation = false
           title = nil
         else
           title = options[:title]
           summary = options[:summary]
           expression = options[:expression] || fail("Metric has to have its expression defined")
-          extended_notation = options[:extended_notation]
+          extended_notation = options[:extended_notation] || false
         end
 
         expression = if extended_notation
@@ -62,12 +62,20 @@ module GoodData
       end
 
       def execute(expression, options={})
-        m = GoodData::Metric.create({:title => "Temporary metric to be deleted", :expression => expression}.merge(options))
+        m = if expression.is_a?(String)
+          GoodData::Metric.create({:title => "Temporary metric to be deleted", :expression => expression}.merge(options))
+        else
+          GoodData::Metric.create({:title => "Temporary metric to be deleted"}.merge(expression))
+        end
         m.execute
       end
 
       def xexecute(expression)
-        execute(expression, {:extended_notation => true})
+        if expression.is_a?(String)
+          execute({:expression => expression, :extended_notation => true})
+        else
+          execute(expression.merge({:extended_notation => true}))
+        end
       end
 
     end

data/lib/gooddata/version.rb

@@ -1,3 +1,3 @@
 module GoodData
-  VERSION = "0.6.0.pre8"
+  VERSION = "0.6.0.pre9"
 end

data/spec/blueprint_spec.rb

@@ -0,0 +1,92 @@
+require 'gooddata/model'
+require 'pry'
+
+describe GoodData::Model::ProjectBlueprint do
+
+  before(:each) do
+    @valid_blueprint = blueprint = GoodData::Model::ProjectBlueprint.new(
+    {
+      :title => "x",
+      :datasets => [
+        {
+          :name=>"payments",
+          :columns => [
+            {:type=>:attribute, :name=>"id"},
+            {:type=>:fact, :name=>"amount"},
+            {:type=>:reference, :name=>"user_id", :dataset => "users", :reference => "user_id"},
+            ]
+        },
+        {
+          :name=>"users",
+          :columns => [
+            {:type=>:anchor, :name=>"user_id"},
+            {:type=>:fact, :name=>"amount"}]
+        }
+      ]})
+      
+    @invalid_blueprint = blueprint = GoodData::Model::ProjectBlueprint.new(
+    {
+      :title => "x",
+      :datasets => [
+        {
+          :name=>"payments",
+          :columns => [
+            {:type=>:attribute, :name=>"id"},
+            {:type=>:fact, :name=>"amount"},
+            {:type=>:reference, :name=>"user_id", :dataset => "users", :reference => "user_id"},
+            ]
+        },
+        {
+          :name=>"users",
+          :columns => [
+            {:type=>:attribute, :name=>"user_id"},
+            {:type=>:fact, :name=>"amount"}]
+        }
+      ]})
+    
+  end
+
+  it "valid blueprint should be marked as valid" do
+    @valid_blueprint.model_valid?.should == true
+  end
+
+  it "valid blueprint should give you empty array of errors" do
+    expect(@valid_blueprint.model_validate).to be_empty
+  end
+
+  it "invalid blueprint should be marked as invalid" do
+    @invalid_blueprint.model_valid?.should == false
+  end
+
+  it "invalid blueprint should give you list of violating references" do
+    errors = @invalid_blueprint.model_validate
+    errors.size.should == 1
+    errors.first.should == {:type=>:reference,
+      :name=>"user_id",
+      :dataset=>"users",
+      :reference=>"user_id"}
+  end
+
+  it "references return empty array if there is no reference" do
+    refs = @valid_blueprint.get_dataset("users").references
+    expect(refs).to be_empty
+  end
+
+  it "should be able to get dataset by name" do
+    ds = @valid_blueprint.get_dataset("users")
+    ds.name.should == "users"
+  end
+
+  it "should tell you it has anchor when it does" do
+    ds = @valid_blueprint.get_dataset("users")
+    ds.has_anchor?.should == true
+  end
+
+  it "should tell you it does not have anchor when it does not" do
+    ds = @invalid_blueprint.get_dataset("users")
+    ds.has_anchor?.should == false
+  end
+
+  
+
+end

data/spec/full_project_spec.rb

@@ -51,4 +51,21 @@ describe "Spin a project", :constraint => 'slow' do
       k.should include("manifest_devs")
     end
   end
+
+  it "should be able to interpolate metric based on" do
+    GoodData.with_project(@project) do |p|
+      res = GoodData::Metric.xexecute "SELECT SUM(![fact.commits.lines_changed])"
+      res.should == 9
+
+      res = GoodData::Metric.xexecute({:expression => "SELECT SUM(![fact.commits.lines_changed])"})
+      res.should == 9
+
+      res = GoodData::Metric.execute({:expression => "SELECT SUM(![fact.commits.lines_changed])", :extended_notation => true})
+      res.should == 9
+
+      res = GoodData::Metric.execute("SELECT SUM(![fact.commits.lines_changed])", :extended_notation => true)
+      res.should == 9
+    end
+  end
+
 end

data/spec/merging_blueprints_spec.rb

@@ -0,0 +1,89 @@
+require 'gooddata/model'
+require 'pry'
+
+describe GoodData::Model::ProjectBlueprint do
+
+  before(:each) do
+    @base_blueprint = blueprint = GoodData::Model::ProjectBlueprint.new(
+    {
+      :title => "x",
+      :datasets => [
+        {
+          :name=>"payments",
+          :columns => [
+            {:type=>:attribute, :name=>"id"},
+            {:type=>:fact, :name=>"amount"},
+            {:type=>:reference, :name=>"user_id", :dataset => "users", :reference => "user_id"},
+            ]
+        },
+        {
+          :name=>"users",
+          :columns => [
+            {:type=>:anchor, :name=>"user_id"},
+            {:type=>:fact, :name=>"amount"}]
+        }
+      ]})
+      
+    @additional_blueprint = GoodData::Model::ProjectBlueprint.new(
+    {
+      :title => "x",
+      :datasets => [
+        {
+          :name=>"users",
+          :columns => [
+            {:type=>:attribute, :name=>"region"}
+          ]
+        }
+      ]})
+
+    @blueprint_with_duplicate = GoodData::Model::ProjectBlueprint.new(
+    {
+      :title => "x",
+      :datasets => [
+        {
+          :name=>"users",
+          :columns => [
+            {:type=>:fact, :name=>"amount"}
+          ]
+        }
+      ]})
+
+    @conflicting_blueprint = GoodData::Model::ProjectBlueprint.new(
+    {
+      :title => "x",
+      :datasets => [
+        {
+          :name=>"users",
+          :columns => [
+            {:type=>:attribute, :name=>"amount"}
+          ]
+        }
+      ]})
+  end
+
+  it "should be possible to merge Schema blueprints" do
+    first_dataset = @base_blueprint.get_dataset("users").to_hash
+    additional_blueprint = @additional_blueprint.get_dataset("users").to_hash
+    stuff = GoodData::Model.merge_dataset_columns(first_dataset, additional_blueprint)
+    stuff[:columns].include?({:type=>:attribute, :name=>"region"}).should == true
+    stuff[:columns].include?({:type=>:fact, :name=>"amount"}).should == true
+  end
+
+  it "should pass when merging 2 columns with the same name if all attributes are identical" do
+    first_dataset = @base_blueprint.get_dataset("users").to_hash
+    additional_blueprint = @blueprint_with_duplicate.get_dataset("users").to_hash
+    stuff = GoodData::Model.merge_dataset_columns(first_dataset, additional_blueprint)
+
+    stuff[:columns].count.should == 2
+    stuff[:columns].include?({:type=>:fact, :name=>"amount"}).should == true
+    stuff[:columns].include?({:type=>:anchor, :name=>"user_id"}).should == true
+  end
+  
+  it "should pass when merging 2 columns with the same name if all attributes are identical" do
+    first_dataset = @base_blueprint.get_dataset("users").to_hash
+    additional_blueprint = @conflicting_blueprint.get_dataset("users").to_hash
+
+    expect{GoodData::Model.merge_dataset_columns(first_dataset, additional_blueprint)}.to raise_error
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gooddata
 version: !ruby/object:Gem::Version
-  version: 0.6.0.pre8
+  version: 0.6.0.pre9
   prerelease: 6
 platform: ruby
 authors:
@@ -321,8 +321,10 @@ files:
 - lib/templates/project/data/devs.csv
 - lib/templates/project/data/repos.csv
 - lib/templates/project/model/model.rb.erb
+- spec/blueprint_spec.rb
 - spec/full_project_spec.rb
 - spec/goodzilla_spec.rb
+- spec/merging_blueprints_spec.rb
 - spec/model_dsl_spec.rb
 - spec/test_project_model_spec.json
 - test/test_commands.rb