gooddata 0.6.43 → 0.6.44

data/spec/integration/blueprint_updates_spec.rb

@@ -49,7 +49,7 @@ describe 'Create project using GoodData client', :constraint => 'slow' do
         reference: 'attr.commits.factsof',
         name: 'anchor_label')
     end
-    @project.update_from_blueprint(bp, preference: { cascade_drops: false,  preserve_data: false})
+    @project.update_from_blueprint(bp, maql_replacements: { "PRESERVE DATA" => ""})
     data = [
       ['label.commits.factsof.id', 'fact.commits.lines_changed', 'committed_on', 'dataset.devs', 'dataset.repos'],
       ['111', 1, '01/01/2011', '1', '1'],

data/spec/integration/full_project_spec.rb

@@ -31,7 +31,7 @@ describe "Full project implementation", :constraint => 'slow' do
 
   it "should do nothing if the project is updated with the same blueprint" do
     results = GoodData::Model::ProjectCreator.migrate_datasets(@spec, project: @project, client: @client, dry_run: true)
-    expect(results).to be_nil
+    expect(results).to eq []
   end
 
   it 'should try to rename a dataset back' do
@@ -40,20 +40,19 @@ describe "Full project implementation", :constraint => 'slow' do
     dataset.save
 
     # Now the update of project using the original blueprint should offer update of the title. Nothing else.
-    results = GoodData::Model::ProjectCreator.migrate_datasets(@blueprint, project: @project, client: @client, dry_run: true)
     results = GoodData::Model::ProjectCreator.migrate_datasets(@spec, project: @project, client: @client, dry_run: true)
-    expect(results['updateScript']['maqlDdl']).to eq "ALTER DATASET {dataset.repos} VISUAL(TITLE \"Repositories\", DESCRIPTION \"\");\n"
+    expect(results.first['updateScript']['maqlDdlChunks']).to eq ["ALTER DATASET {dataset.repos} VISUAL(TITLE \"Repositories\", DESCRIPTION \"\");\n"]
 
     # Update using a freshly gained blueprint should offer no changes.
     new_blueprint = @project.blueprint
     results = GoodData::Model::ProjectCreator.migrate_datasets(new_blueprint, project: @project, client: @client, dry_run: true)
-    expect(results).to be_nil
+    expect(results).to eq []
 
     # When we change the model using the original blueprint. Basically change the title back.
     results = @project.update_from_blueprint(@spec)
     # It should offer no changes using the original blueprint
     results = GoodData::Model::ProjectCreator.migrate_datasets(@spec, project: @project, client: @client, dry_run: true)
-    expect(results).to be_nil
+    expect(results).to eq []
   end
 
   it "should contain datasets" do
@@ -470,12 +469,16 @@ describe "Full project implementation", :constraint => 'slow' do
 
   it "should be able to give you values for" do
     attribute = @project.attributes('attr.devs.dev_id')
-    expect(attribute.values_for(2)).to eq ["tomas@gooddata.com", "1"]
+    values = attribute.labels.find { |l| l.identifier == 'label.devs.dev_id.email'}.values.to_a
+    id = values.find { |v| v[:value] == 'tomas@gooddata.com' }[:uri][-1].to_i
+    expect(attribute.values_for(id)).to eq ['tomas@gooddata.com', '1']
   end
 
   it "should be able to find specific element and give you the primary label value" do
     attribute = @project.attributes('attr.devs.dev_id')
-    expect(@project.find_attribute_element_value("#{attribute.uri}/elements?id=2")).to eq 'tomas@gooddata.com'
+    values = attribute.labels.find { |l| l.identifier == 'label.devs.dev_id.email'}.values.to_a
+    uri = values.find { |v| v[:value] == 'tomas@gooddata.com' }[:uri]
+    expect(@project.find_attribute_element_value(uri)).to eq 'tomas@gooddata.com'
   end
 
   it "should be able to give you label by name" do

data/spec/integration/schedule_spec.rb

@@ -13,9 +13,7 @@ describe GoodData::Schedule do
 
   before(:all) do
     @client = ConnectionHelper.create_default_connection
-
     @project = ProjectHelper.get_default_project(:client => @client)
-
     # ScheduleHelper.remove_old_schedules(@project)
     # ProcessHelper.remove_old_processes(@project)
   end

data/spec/logging_in_logging_out_spec.rb

@@ -86,8 +86,8 @@ describe GoodData::Rest::Connection, :constraint => 'slow' do
   it "should be able to regenerate TT" do
     regular_client = ConnectionHelper::create_default_connection
     projects = regular_client.projects
-    regular_client.connection.cookies[:cookies].delete('GDCAuthTT')
+    regular_client.connection.headers.delete(:x_gdc_authtt)
     regular_client.get('/gdc/md')
-    expect(regular_client.connection.cookies[:cookies]).to have_key 'GDCAuthTT'
+    expect(regular_client.connection.headers).to have_key :x_gdc_authtt
   end
 end

data/spec/unit/models/project_creator_spec.rb

@@ -8,7 +8,7 @@ require 'gooddata/models/project_creator'
 
 describe GoodData::Model::ProjectCreator do
 
-  it 'should pick correct update chunk based on priority' do
+  before(:each) do
     # Priority is
     #
     # [cascadeDrops, preserveData],
@@ -16,112 +16,60 @@ describe GoodData::Model::ProjectCreator do
     # [false, false],
     # [true, true],
     # [true, false]
-    data = [
-      { 'updateScript' => {
-        'cascadeDrops' => false,
-        'preserveData' => true,
-        'maqlDdlChunks' => "a"
-      }},
-      { 'updateScript' => {
-        'cascadeDrops' => false,
-        'preserveData' => false,
-        'maqlDdlChunks' => "b"
-      }}
-    ]
-    chunk = GoodData::Model::ProjectCreator.pick_correct_chunks(data)
-    chunk.should == {
-      'updateScript' => {
-      'cascadeDrops' => false,
-      'preserveData' => true,
-      'maqlDdlChunks' => "a"
-    }}
+    #
+    # The data is ordered in descending priority
+    @chunk_a = {
+                'updateScript' => {
+                  'cascadeDrops' => false,
+                  'preserveData' => true,
+                  'maqlDdlChunks' => 'a'
+                }
+              }
 
+    @chunk_b = {
+                'updateScript' => {
+                  'cascadeDrops' => false,
+                  'preserveData' => false,
+                  'maqlDdlChunks' => 'b'
+                }
+              }
+    @chunk_c = {
+                'updateScript' => {
+                  'cascadeDrops' => true,
+                  'preserveData' => true,
+                  'maqlDdlChunks' => 'c'
+                }
+              }
 
-    data = [
-      { 'updateScript' => {
-        'cascadeDrops' => true,
-        'preserveData' => true,
-        'maqlDdlChunks' => "a"
-      }},
-      { 'updateScript' => {
-        'cascadeDrops' => true,
-        'preserveData' => false,
-        'maqlDdlChunks' => "b"
-      }}
-    ]
-    chunk = GoodData::Model::ProjectCreator.pick_correct_chunks(data)
-    chunk.should == {
-      'updateScript' => {
-      'cascadeDrops' => true,
-      'preserveData' => true,
-      'maqlDdlChunks' => "a"
-    }}
+    @chunk_d = {
+                'updateScript' => {
+                  'cascadeDrops' => true,
+                  'preserveData' => false,
+                  'maqlDdlChunks' => 'd'
+                }
+              }
 
+    @data = [@chunk_a, @chunk_b, @chunk_c, @chunk_d]
 
-    data = [
-      { 'updateScript' => {
-        'cascadeDrops' => true,
-        'preserveData' => false,
-        'maqlDdlChunks' => "a"
-      }},
-      { 'updateScript' => {
-        'cascadeDrops' => true,
-        'preserveData' => true,
-        'maqlDdlChunks' => "b"
-      }}
-    ]
-    chunk = GoodData::Model::ProjectCreator.pick_correct_chunks(data)
-    chunk.should == {
-      'updateScript' => {
-      'cascadeDrops' => true,
-      'preserveData' => true,
-      'maqlDdlChunks' => "b"
-    }}
   end
 
-  it 'should pick correct update chunk based on your preference if it is possible to satisfy it' do
-    data = [
-      { 'updateScript' => {
-        'cascadeDrops' => true,
-        'preserveData' => false,
-        'maqlDdlChunks' => "a"
-      }},
-      { 'updateScript' => {
-        'cascadeDrops' => true,
-        'preserveData' => true,
-        'maqlDdlChunks' => "b"
-      }}
-    ]
+  it 'should pick correct update chunk based on priority' do
+    chunk = GoodData::Model::ProjectCreator.pick_correct_chunks(@data)
+    expect(chunk).to eq [@chunk_a]
+  end
 
-    chunk = GoodData::Model::ProjectCreator.pick_correct_chunks(data, preference: { cascade_drops: true,  preserve_data: false})
-    chunk.should == {
-      'updateScript' => {
-      'cascadeDrops' => true,
-      'preserveData' => false,
-      'maqlDdlChunks' => "a"
-    }}
+  it 'should pick correct update chunk based on your preference if it is possible to satisfy it' do
+    chunk = GoodData::Model::ProjectCreator.pick_correct_chunks(@data, update_preference: { cascade_drops: true,  preserve_data: false})
+    expect(chunk).to eq [@chunk_d]
   end
 
-  it 'should pick correct update chunk based on your preference if it is not possible to satisfy it' do
-    data = [
-      { 'updateScript' => {
-        'cascadeDrops' => true,
-        'preserveData' => true,
-        'maqlDdlChunks' => "a"
-      }},
-      { 'updateScript' => {
-        'cascadeDrops' => false,
-        'preserveData' => true,
-        'maqlDdlChunks' => "b"
-      }}
-    ]
+  it 'should pick correct update chunks based on your preference if it is possible to satisfy it and the preference is ambiguous' do
+    chunk = GoodData::Model::ProjectCreator.pick_correct_chunks(@data, update_preference: { cascade_drops: true })
+    expect(chunk).to eq [@chunk_c, @chunk_d]
+  end
 
-    chunk = GoodData::Model::ProjectCreator.pick_correct_chunks(data, preference: { cascade_drops: true,  preserve_data: false})
-    chunk.should == {
-      'updateScript' => {
-      'cascadeDrops' => false,
-      'preserveData' => true,
-      'maqlDdlChunks' => "b"
-    }}
+  it 'should not pick a chunk if it is not possible to satisfy it based on your preference' do
+    chunk = GoodData::Model::ProjectCreator.pick_correct_chunks(@data, update_preference: { cascade_drops: true,  preserve_data: false, unmeetable_condition: true})
+    expect(chunk).to eq []
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gooddata
 version: !ruby/object:Gem::Version
-  version: 0.6.43
+  version: 0.6.44
 platform: ruby
 authors:
 - Pavel Kolesnikov
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-06 00:00:00.000000000 Z
+date: 2016-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -685,6 +685,7 @@ files:
 - lib/gooddata/exceptions/execution_limit_exceeded.rb
 - lib/gooddata/exceptions/filter_maqlization.rb
 - lib/gooddata/exceptions/malformed_user.rb
+- lib/gooddata/exceptions/maql_execution.rb
 - lib/gooddata/exceptions/no_project_error.rb
 - lib/gooddata/exceptions/object_migration.rb
 - lib/gooddata/exceptions/project_not_found.rb