gooddata 0.6.0.pre9 → 0.6.0.pre10

data/lib/gooddata/models/metadata.rb

@@ -119,7 +119,7 @@ module GoodData
     end
 
     def tags=(list_of_tags)
-      data["meta"]["tags"] = tags
+      data["meta"]["tags"] = list_of_tags
     end
 
     def meta

data/lib/gooddata/models/metric.rb

@@ -1,7 +1,8 @@
 require 'gooddata/goodzilla/goodzilla'
 
 module GoodData
-  class Metric < GoodData::MdObject 
+  # Metric representation
+  class Metric < GoodData::MdObject
 
     root_key :metric
 

data/lib/gooddata/models/project.rb

@@ -49,7 +49,7 @@ module GoodData
       def create(attributes, &block)
         GoodData.logger.info "Creating project #{attributes[:title]}"
 
-        auth_token = attributes.delete(:auth_token) || GoodData.connection.auth_token
+        auth_token = attributes[:auth_token] || GoodData.connection.auth_token
 
         json = {:project =>
           {

data/lib/gooddata/models/report.rb

@@ -35,24 +35,6 @@ module GoodData
       end
     end
 
-# ----
-
-    def title=(a_title)
-      @json["report"]["meta"]["title"] = a_title
-    end
-
-    def summary=(a_summary)
-      @json[:report][:meta][:summary] = a_summary
-    end
-
-    def add_definition(a_definition)
-      @json[:report][:content][:definitions] << a_definition
-    end
-    
-# ----
-
-
-
     def results
       content["results"]
     end

data/lib/gooddata/version.rb

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

data/spec/blueprint_spec.rb

@@ -4,46 +4,85 @@ require 'pry'
 describe GoodData::Model::ProjectBlueprint do
 
   before(:each) do
-    @valid_blueprint = blueprint = GoodData::Model::ProjectBlueprint.new(
-    {
-      :title => "x",
-      :datasets => [
+    @valid_blueprint = GoodData::Model::ProjectBlueprint.new(
         {
-          :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"},
-            ]
-        },
+            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 = GoodData::Model::ProjectBlueprint.new(
         {
-          :name=>"users",
-          :columns => [
-            {:type=>:attribute, :name=>"user_id"},
-            {:type=>:fact, :name=>"amount"}]
-        }
-      ]})
-    
+            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'
+                        }
+                    ]
+                }
+            ]})
+
+    # @valid_blueprint = blueprint = BlueprintHelper.blueprint_from_file(File.join(File.dirname(__FILE__), 'data', 'blueprint_valid.json'))
+
+    # @invalid_blueprint = BlueprintHelper.blueprint_from_file(File.join(File.dirname(__FILE__), 'data', 'blueprint_valid.json'))
   end
 
   it "valid blueprint should be marked as valid" do
@@ -61,10 +100,12 @@ describe GoodData::Model::ProjectBlueprint do
   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"}
+    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
@@ -87,6 +128,5 @@ describe GoodData::Model::ProjectBlueprint do
     ds.has_anchor?.should == false
   end
 
-  
 
 end

data/spec/data/additional_dataset_module.json

@@ -0,0 +1,18 @@
+{
+  "title": "Region module",
+  "datasets": [
+    {
+      "name": "regions",
+      "columns": [
+        {
+          "type": "anchor",
+          "name": "id"
+        },
+        {
+          "type": "attribute",
+          "name": "name"
+        }
+      ]
+    }
+  ]
+}

data/spec/data/blueprint_invalid.json

@@ -0,0 +1,36 @@
+{
+    "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"
+                }
+            ]
+        }
+    ]}

data/spec/data/blueprint_valid.json

@@ -0,0 +1,37 @@
+{
+    "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"
+                }
+            ]
+        }
+    ]
+}

data/spec/data/model_module.json

@@ -0,0 +1,18 @@
+{
+  "title": "Devs module",
+  "datasets": [
+    {
+      "name": "devs",
+      "columns": [
+        {
+          "type": "anchor",
+          "name": "id"
+        },
+        {
+          "type": "attribute",
+          "name": "region"
+        }
+      ]
+    }
+  ]
+}

data/spec/{test_project_model_spec.json → data/test_project_model_spec.json}

@@ -12,6 +12,10 @@
           "type": "label",
           "name": "name",
           "reference": "id"
+        },
+        {
+          "type": "attribute",
+          "name": "department"
         }
       ]
     },

data/spec/full_project_spec.rb

@@ -2,12 +2,13 @@ require 'gooddata'
 
 describe "Spin a project", :constraint => 'slow' do
 
+  GD_PROJECT_TOKEN = ENV["GD_PROJECT_TOKEN"]
+
   before(:all) do
-    spec = JSON.parse(File.read("./spec/test_project_model_spec.json"), :symbolize_names => true)
+    spec = JSON.parse(File.read("./spec/data/test_project_model_spec.json"), :symbolize_names => true)
     GoodData.connect("svarovsky+gem_tester@gooddata.com", "jindrisska")
-    GoodData.logging_on
 
-    @project = GoodData::Model::ProjectCreator.migrate({:spec => spec, :token => "INTNA000000GDPM"})
+    @project = GoodData::Model::ProjectCreator.migrate({:spec => spec, :token => GD_PROJECT_TOKEN})
   end
 
   after(:all) do

data/spec/helpers/blueprint_helper.rb

@@ -0,0 +1,17 @@
+# Global requires
+require 'json'
+
+# Local requires
+require 'gooddata/model'
+
+module BlueprintHelper
+  def blueprint_from_file(bp)
+    # Try to load as full path
+    raw = IO.read(bp)
+
+    # TODO: Try to load as relative path if failed
+
+    parsed = JSON.parse(raw, :symbolize_names => true)
+    return GoodData::Model::ProjectBlueprint.new(parsed)
+  end
+end

data/spec/merging_blueprints_spec.rb

@@ -4,46 +4,17 @@ 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"}
-          ]
-        }
-      ]})
+    @base_blueprint = GoodData::Model::ProjectBlueprint.from_json("./spec/data/test_project_model_spec.json")
+    @additional_blueprint = GoodData::Model::ProjectBlueprint.from_json("./spec/data/model_module.json")
 
     @blueprint_with_duplicate = GoodData::Model::ProjectBlueprint.new(
     {
       :title => "x",
       :datasets => [
         {
-          :name=>"users",
+          :name=>"commits",
           :columns => [
-            {:type=>:fact, :name=>"amount"}
+            {:type=>"fact", :name=>"lines_changed"}
           ]
         }
       ]})
@@ -53,37 +24,41 @@ describe GoodData::Model::ProjectBlueprint do
       :title => "x",
       :datasets => [
         {
-          :name=>"users",
+          :name=>"commits",
           :columns => [
-            {:type=>:attribute, :name=>"amount"}
+            {:type=>"attribute", :name=>"lines_changed"}
           ]
         }
       ]})
   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
+    first_dataset = @base_blueprint.get_dataset("devs").to_hash
+    additional_blueprint = @additional_blueprint.get_dataset("devs").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
+    stuff[:columns].include?({:type=>"attribute", :name=>"region"}).should == true
+    stuff[:columns].include?({:type=>"anchor", :name=>"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 = @blueprint_with_duplicate.get_dataset("users").to_hash
+  it "should pass when merging 2 columns with the same name if both columns are identical" do
+    first_dataset = @base_blueprint.get_dataset("commits").to_hash
+    additional_blueprint = @blueprint_with_duplicate.get_dataset("commits").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
+    stuff[:columns].count.should == 4
+    stuff[:columns].include?({:type=>"fact", :name=>"lines_changed"}).should == true
+    stuff[:columns].group_by {|col| col[:name]}["lines_changed"].count.should == 1
   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
+    first_dataset = @base_blueprint.get_dataset("commits").to_hash
+    additional_blueprint = @conflicting_blueprint.get_dataset("commits").to_hash
 
     expect{GoodData::Model.merge_dataset_columns(first_dataset, additional_blueprint)}.to raise_error
   end
 
+  it "should be possible to merge directly whole bleuprints. Blueprint is changed in place when merge! is used" do
+    @base_blueprint.merge!(@additional_blueprint)
+    @base_blueprint.get_dataset("repos").attributes.include?({:type => "attribute", :name => "department"})
+  end
+
 end