gooddata 0.6.8 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29f28bd583f3a4da577456a03cc225ac23bf2c06
-  data.tar.gz: bfd619c784559c60daca2b02c63e1d019e04635c
+  metadata.gz: d7d013ba0b03cf22fd29f0ef4c266a06ecad756e
+  data.tar.gz: dac86a92b7e82af815df7f4900a329012d468437
 SHA512:
-  metadata.gz: ce8b6231b9104d8b2b05ef0e8ba141be3da6af516d26e804fa97bb779a28e80a1a6f646502dcd526171ea0ea5608812c341ffa696b4e3d39feedfba538576808
-  data.tar.gz: 612ac6eb1daf13fc91e66b07a666a0d3359e7d183ba11bebe8f13c29352ec3ac8e0517d4f7530cfba9a65603d838a914a94f13cb71faaa5b09a6c7f29dc57509
+  metadata.gz: 936dba585e13b83dc3a0592bf0cf068b3d4d8e23306c3ebdf0554810b7062486407d8a3ad95beaa6d86d09ca1bd8aec160080407c96d12f79dfe690ff9f40e03
+  data.tar.gz: b9664e85e0558d130ac3ac5452f20220d833d321d9aa9c59a53b22c126ae27f0156bce5944974645c1bf741cf604e4cd7c14dac42bf684e8f5e5a48dde0d39c0

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # GoodData Ruby SDK Changelog
 
+## 0.6.9
+- Fixing issues with creating models.
+- Adding couple more helpers for report/metric computation
+- Rewriting several full_* specs to use the new syntax
+
 ## 0.6.8
 
 - REST Factory - See [PR #224](https://github.com/gooddata/gooddata-ruby/pull/224)

data/lib/gooddata/models/metadata.rb

@@ -54,7 +54,7 @@ module GoodData
     alias_method :refresh, :reload!
 
     def browser_uri
-      GoodData.connection.url + meta['uri']
+      client.connection.server_url + meta['uri']
     end
 
     def deprecated=(flag)

data/lib/gooddata/models/project.rb

@@ -131,7 +131,7 @@ module GoodData
       end
 
       def create_from_blueprint(blueprint, options = {})
-        GoodData::Model::ProjectCreator.migrate(:spec => blueprint, :token => options[:auth_token])
+        GoodData::Model::ProjectCreator.migrate(options.merge(spec: blueprint, token: options[:auth_token], client: GoodData.connection))
       end
 
       # Takes one CSV line and creates hash from data extracted
@@ -255,6 +255,14 @@ module GoodData
       new_project
     end
 
+    def compute_report(spec = {})
+      GoodData::ReportDefinition.execute(spec.merge(:client => client, :project => self))
+    end
+
+    def compute_metric(expression)
+      GoodData::Metric.xexecute(expression, :client => client, :project => self)
+    end
+
     def create_schedule(process, date, executable, options = {})
       GoodData::Schedule.create(process, date, executable, options.merge(:client => client, :project => self))
     end

data/lib/gooddata/models/project_blueprint.rb

@@ -339,11 +339,10 @@ module GoodData
       # @return [Array<Hash>]
       def can_break(dataset)
         dataset = find_dataset(dataset) if dataset.is_a?(String)
-        referenced_by(dataset).reduce([]) do |a, e|
-          e.attributes_and_anchors.each do |attr|
-            a.push([e, attr])
+        (referenced_by(dataset) + [dataset]).mapcat do |ds|
+          ds.attributes_and_anchors.map do |attr|
+            [ds, attr]
           end
-          a
         end
       end
 

data/lib/gooddata/rest/client.rb

@@ -126,6 +126,14 @@ module GoodData
         @factory = ObjectFactory.new(self)
       end
 
+      def create_project(options = {})
+        GoodData::Project.create(title: 'Project for schedule testing', auth_token: ConnectionHelper::GD_PROJECT_TOKEN, client: self)
+      end
+
+      def create_project_from_blueprint(blueprint, options = {})
+        GoodData::Model::ProjectCreator.migrate(spec: blueprint, token: options[:auth_token], client: self)
+      end
+
       def domain(domain_name)
         GoodData::Domain[domain_name, :client => self]
       end

data/lib/gooddata/version.rb

@@ -2,7 +2,7 @@
 
 # GoodData Module
 module GoodData
-  VERSION = '0.6.8'
+  VERSION = '0.6.9'
 
   class << self
     # Version

data/spec/integration/full_process_schedule_spec.rb

@@ -3,7 +3,7 @@ require 'gooddata'
 describe "Full process and schedule exercise", :constraint => 'slow' do
   before(:all) do
     @client = ConnectionHelper::create_default_connection
-    @project = GoodData::Project.create(title: 'Project for schedule testing', auth_token: ConnectionHelper::GD_PROJECT_TOKEN, :client => @client)
+    @project = @client.create_project(title: 'Project for schedule testing', auth_token: ConnectionHelper::GD_PROJECT_TOKEN)
     @process = @project.deploy_process('./spec/data/ruby_process',
                                   type: 'RUBY',
                                   name: 'Test ETL Process')

data/spec/integration/full_project_spec.rb

@@ -5,7 +5,7 @@ describe "Full project implementation", :constraint => 'slow' do
     @spec = JSON.parse(File.read("./spec/data/test_project_model_spec.json"), :symbolize_names => true)
     @invalid_spec = JSON.parse(File.read("./spec/data/blueprint_invalid.json"), :symbolize_names => true)
     @client = ConnectionHelper::create_default_connection
-    @project = GoodData::Model::ProjectCreator.migrate({:spec => @spec, :token => ConnectionHelper::GD_PROJECT_TOKEN, :client => @client})
+    @project = @client.create_project_from_blueprint(@spec, auth_token: ConnectionHelper::GD_PROJECT_TOKEN)
   end
 
   after(:all) do
@@ -16,7 +16,7 @@ describe "Full project implementation", :constraint => 'slow' do
 
   it "should not build an invalid model" do
     expect {
-      GoodData::Model::ProjectCreator.migrate({:spec => @invalid_spec, :token => ConnectionHelper::GD_PROJECT_TOKEN, :client => @client})
+      @client.create_project_from_blueprint(@invalid_spec, auth_token: ConnectionHelper::GD_PROJECT_TOKEN)
     }.to raise_error(GoodData::ValidationError)
   end
 
@@ -51,7 +51,7 @@ describe "Full project implementation", :constraint => 'slow' do
     @project.delete_all_data(force: true)
     f = @project.fact_by_title('Lines Changed')
     metric = @project.create_metric("SELECT SUM(#\"#{f.title}\")")
-    res = GoodData::ReportDefinition.execute(:left => [metric], :client => @client, :project => @project);
+    res = @project.compute_report(:left => [metric])
     expect(res).to be_empty
   end
 
@@ -99,11 +99,11 @@ describe "Full project implementation", :constraint => 'slow' do
     # TODO: Here we create metric which is not deleted and is used by another test - "should exercise the object relations and getting them in various ways"
     metric = @project.create_metric("SELECT SUM(#\"#{f.title}\")", :title => "My metric")
     metric.save
-    result = GoodData::ReportDefinition.execute(:title => "My report", :top => [metric], :left => ['label.devs.dev_id.email'], :client => @client, :project => @project)
+    result = @project.compute_report(:top => [metric], :left => ['label.devs.dev_id.email'])
     expect(result[1][1]).to eq 3
     expect(result.include_row?(["jirka@gooddata.com", 5])).to be true
 
-    result2 = GoodData::ReportDefinition.create(:title => "My report", :top => [metric], :left => ['label.devs.dev_id.email'], :client => @client, :project => @project).execute
+    result2 = @project.compute_report(:top => [metric], :left => ['label.devs.dev_id.email'])
     expect(result2[1][1]).to eq 3
     expect(result2.include_row?(["jirka@gooddata.com", 5])).to eq true
     expect(result2).to eq result
@@ -176,10 +176,10 @@ describe "Full project implementation", :constraint => 'slow' do
     expect(fact1).not_to eq fact3
 
     metric.using(nil)
-    expect(metric.using('fact', :client => @client, :project => @project).count).to eq 1
+    expect(metric.using('fact').count).to eq 1
 
     fact1.used_by(nil)
-    expect(fact1.used_by('metric', :client => @client, :project => @project).count).to eq 1
+    expect(fact1.used_by('metric').count).to eq 1
 
     res = metric.using?(fact1)
     expect(res).to be(true)
@@ -211,16 +211,16 @@ describe "Full project implementation", :constraint => 'slow' do
   end
 
   it "should be able to interpolate metric based on" do
-    res = GoodData::Metric.xexecute "SELECT SUM(![fact.commits.lines_changed])", :client => @client, :project => @project
+    res = @project.compute_metric "SELECT SUM(![fact.commits.lines_changed])"
     expect(res).to eq 9
 
-    res = GoodData::Metric.xexecute( "SELECT SUM(![fact.commits.lines_changed])", :client => @client, :project => @project)
+    res = @project.compute_metric "SELECT SUM(![fact.commits.lines_changed])"
     expect(res).to eq 9
 
-    res = GoodData::Metric.execute("SELECT SUM(![fact.commits.lines_changed])", :extended_notation => true, :client => @client, :project => @project)
+    res = @project.compute_metric "SELECT SUM(![fact.commits.lines_changed])"
     expect(res).to eq 9
 
-    res = GoodData::Metric.execute("SELECT SUM(![fact.commits.lines_changed])", :extended_notation => true, :client => @client, :project => @project)
+    res = @project.compute_metric "SELECT SUM(![fact.commits.lines_changed])"
     expect(res).to eq 9
 
     fact = @project.fact_by_title('Lines Changed')

data/spec/integration/partial_md_export_import_spec.rb

@@ -1,13 +1,13 @@
 require 'gooddata'
 
-describe "Spin a project", :constraint => 'slow' do
+describe "Object export between projects", :constraint => 'slow' do
   before(:all) do
     @client = ConnectionHelper.create_default_connection
 
     spec = MultiJson.load(File.read("./spec/data/test_project_model_spec.json"), :symbolize_keys => true)
 
-    @source_project = GoodData::Model::ProjectCreator.migrate({:spec => spec, :token => ConnectionHelper::GD_PROJECT_TOKEN, :client => @client})
-    @target_project = GoodData::Model::ProjectCreator.migrate({:spec => spec, :token => ConnectionHelper::GD_PROJECT_TOKEN, :client => @client})
+    @source_project = @client.create_project_from_blueprint(spec, auth_token: ConnectionHelper::GD_PROJECT_TOKEN)
+    @target_project = @client.create_project_from_blueprint(spec, auth_token: ConnectionHelper::GD_PROJECT_TOKEN)
   end
 
   after(:all) do
@@ -20,18 +20,17 @@ describe "Spin a project", :constraint => 'slow' do
   it "should transfer a metric" do
     f = GoodData::Fact.find_first_by_title('Lines Changed', :client => @client, :project => @source_project)
     metric_title = "Testing metric to be exported"
-    metric = GoodData::Metric.xcreate("SELECT SUM(#\"#{f.title}\")", :title => metric_title, :client => @client, :project => @source_project)
+    metric = @source_project.create_metric("SELECT SUM(#\"#{f.title}\")", :title => metric_title)
     metric.save
 
-    GoodData.with_project(@target_project) { |p| GoodData::Metric[:all, :client => @client, :project => @target_project].count.should == 0 }
+    @target_project.metrics.count.should == 0
 
-    @source_project.partial_md_export(metric, :client => @client, :project => @target_project)
-    GoodData.with_project(@target_project) do |_p|
-      GoodData::Metric[:all, :client => @client, :project => @target_project].count.should == 1
-      metric = GoodData::Metric.find_first_by_title(metric_title, :client => @client, :project => @target_project)
-      metric.should_not be_nil
-      metric.title.should == metric_title
-    end
+    @source_project.partial_md_export(metric, :project => @target_project)
+
+    expect(@target_project.metrics.count).to eq 1
+    metric = GoodData::Metric.find_first_by_title(metric_title, :client => @client, :project => @target_project)
+    expect(metric).not_to be_nil
+    expect(metric.title).to eq metric_title
   end
 
 end

data/spec/unit/core/project_spec.rb

@@ -19,29 +19,24 @@ describe 'GoodData - project' do
     end
 
     it 'Assigns project using project ID' do
-      pending 'GoodData::project= is disabled for now'
-      GoodData.project = ProjectHelper::PROJECT_ID
+      GoodData.use(ProjectHelper::PROJECT_ID, client: @client)
     end
 
     it 'Assigns project using project URL' do
-      pending 'GoodData::project= is disabled for now'
-      GoodData.project = ProjectHelper::PROJECT_URL
+      GoodData.use ProjectHelper::PROJECT_URL, client: @client
     end
 
     it 'Assigns project directly' do
-      pending 'GoodData::project= is disabled for now'
-      GoodData.project = GoodData::Project[ProjectHelper::PROJECT_ID]
+      GoodData.project = GoodData::Project[ProjectHelper::PROJECT_ID, client: @client]
     end
   end
 
   describe '#project' do
     it 'Returns project assigned' do
-      pending 'GoodData.project= is disabled for now'
-
       GoodData.project = nil
       GoodData.project.should == nil
 
-      GoodData.project = ProjectHelper::PROJECT_ID
+      GoodData.use ProjectHelper::PROJECT_ID, client: @client
       GoodData.project.should_not == nil
     end
   end

data/spec/unit/models/project_blueprint_spec.rb

@@ -213,7 +213,6 @@ describe GoodData::Model::ProjectBlueprint do
     attrs = @blueprint.can_break('commits')
     attrs.count.should == 3
 
-    pending("At least those from the same dataset should be able to break")
     attrs = @blueprint.can_break('devs')
     attrs.count.should == 1
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gooddata
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
 platform: ruby
 authors:
 - Pavel Kolesnikov
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-16 00:00:00.000000000 Z
+date: 2014-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase