gooddata 0.6.18 → 0.6.19

data/spec/integration/over_to_user_filters_spec.rb

@@ -2,48 +2,44 @@ require 'gooddata'
 
 describe "Variables implementation", :constraint => 'slow' do
   before(:all) do
-    @spec = JSON.parse(File.read("./spec/data/m_n_model/blueprint.json"), :symbolize_names => true)
+    @spec = JSON.parse(File.read("./spec/data/blueprints/m_n_model.json"), :symbolize_names => true)
     @client = ConnectionHelper::create_default_connection
-    @project = @client.create_project_from_blueprint(@spec, :auth_token => ConnectionHelper::GD_PROJECT_TOKEN)
+    @blueprint = GoodData::Model::ProjectBlueprint.new(@spec)
+    @project = @client.create_project_from_blueprint(@blueprint, :token => ConnectionHelper::GD_PROJECT_TOKEN, environment: ProjectHelper::ENVIRONMENT)
     @domain = @client.domain(ConnectionHelper::DEFAULT_DOMAIN)
+    @label = @project.attributes('attr.permission.id').label_by_name('label.permission.id.email')
 
-    @label = GoodData::Attribute.find_first_by_title('Perm User', client: @client, project: @project).label_by_name('email')
-
-    @blueprint = GoodData::Model::ProjectBlueprint.new(@spec)
-    commits_data = [
-      ['commit_id', 'lines_changed', 'user_id'],
+    data = [
+      ['label.commits.id', 'fact.commits.lines_changed', 'dataset.users'],
       [1, 1, 1],
       [2, 3, 2],
       [3, 5, 3]]
-    GoodData::Model.upload_data(commits_data, @blueprint, 'commits', :client => @client, :project => @project)
-    # blueprint.find_dataset('commits').upload(commits_data)
-
-    devs_data = [
-      ["user_id", "email"],
+    @project.upload(data, @blueprint, 'dataset.commits')
+    
+    data = [
+      ["label.users.id", "label.users.id.email"],
       [1, "tomas@gooddata.com"],
       [2, "petr@gooddata.com"],
       [3, "jirka@gooddata.com"]]
-    GoodData::Model.upload_data(devs_data, @blueprint, 'users', :client => @client, :project => @project)
+    @project.upload(data, @blueprint, 'dataset.users')
 
-    devs_data = [
-      ["perm_user_id", "email"],
+    data = [
+      ["label.permission.id", "label.permission.id.email"],
       [1, "tomas@gooddata.com"],
       [2, "petr@gooddata.com"],
       [3, "jirka@gooddata.com"]]
-    GoodData::Model.upload_data(devs_data, @blueprint, 'permission_users', :client => @client, :project => @project)
-    # blueprint.find_dataset('devs').upload(devs_data)
+    @project.upload(data, @blueprint, 'dataset.permission_users')
 
-    devs_data = [
-      ['visibility_id', 'perm_user_id', 'commit_id'],
+    data = [
+      ['label.visibility.id', 'dataset.permission_users', 'dataset.commits'],
       [1, 1, 1],
-      # [2, 1, 2],
       [3, 1, 3]]
-    GoodData::Model.upload_data(devs_data, @blueprint, 'visibility', :client => @client, :project => @project)
+    @project.upload(data, @blueprint, 'dataset.visibility')
 
     @variable = @project.create_variable(title: 'uaaa', attribute: @label.attribute).save
 
-    @attr1 = GoodData::Attribute.find_first_by_title('Visibility', client: @client, project: @project)
-    @attr2 = GoodData::Attribute.find_first_by_title('Commit', client: @client, project: @project)
+    @attr1 = @project.attributes('attr.visibility.id')
+    @attr2 = @project.attributes('attr.commits.id')
 
     @filters = [
       {
@@ -70,21 +66,21 @@ describe "Variables implementation", :constraint => 'slow' do
   end
 
   it "should create an over to filter transparently" do    
-    metric = @project.create_metric("SELECT SUM(#\"Lines Changed\")", :title => 'x')
+    metric = @project.create_metric("SELECT SUM(#\"Fact.Commits.Lines Changed\")", :title => 'x')
     expect(metric.execute).to eq 9
     @project.add_data_permissions(@filters)
     expect(metric.execute).to eq 6
 
-    r = @project.compute_report(left: [metric], top: @project.attributes('attr.users.user_id'))
+    r = @project.compute_report(left: [metric], top: ['label.users.id.email'])
     expect(r.include_column?(['tomas@gooddata.com', 1])).to eq true
     expect(r.include_column?(['jirka@gooddata.com', 5])).to eq true
     expect(r.include_column?(['petr@gooddata.com', 3])).to eq false
 
-    devs_data = [['visibility_id', 'perm_user_id', 'commit_id'], [1, 1, 1]]
-    GoodData::Model.upload_data(devs_data, @blueprint, 'visibility', :client => @client, :project => @project)
+    data = [['label.visibility.id', 'dataset.permission_users', 'dataset.commits'], [1, 1, 1]]
+    @project.upload(data, @blueprint, 'dataset.visibility')
 
     expect(metric.execute).to eq 1
-    r = @project.compute_report(left: [metric], top: @project.attributes('attr.users.user_id'))
+    r = @project.compute_report(left: [metric], top: ['label.users.id.email'])
     expect(r.include_column?(['tomas@gooddata.com', 1])).to eq true
     expect(r.include_column?(['jirka@gooddata.com', 5])).to eq false
     expect(r.include_column?(['petr@gooddata.com', 3])).to eq false

data/spec/integration/partial_md_export_import_spec.rb

@@ -4,10 +4,10 @@ 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 = @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)
+    spec = MultiJson.load(File.read("./spec/data/blueprints/test_project_model_spec.json"), :symbolize_keys => true)
+    
+    @source_project = @client.create_project_from_blueprint(spec, token: ConnectionHelper::GD_PROJECT_TOKEN, environment: ProjectHelper::ENVIRONMENT)
+    @target_project = @client.create_project_from_blueprint(spec, token: ConnectionHelper::GD_PROJECT_TOKEN, environment: ProjectHelper::ENVIRONMENT)
   end
 
   after(:all) do

data/spec/integration/project_spec.rb

@@ -6,7 +6,7 @@ require 'gooddata'
 describe GoodData::Project, :constraint => 'slow' do
   before(:all) do
     @client = ConnectionHelper::create_default_connection
-    @project = @client.create_project(title: ProjectHelper::PROJECT_TITLE, auth_token: ConnectionHelper::GD_PROJECT_TOKEN)
+    @project = @client.create_project(title: ProjectHelper::PROJECT_TITLE, auth_token: ConnectionHelper::GD_PROJECT_TOKEN, environment: ProjectHelper::ENVIRONMENT)
     @domain = @client.domain(ConnectionHelper::DEFAULT_DOMAIN)
   end
 

data/spec/integration/rest_spec.rb

@@ -7,7 +7,7 @@ describe GoodData do
   before(:each) do
     @client = ConnectionHelper.create_default_connection
     # @project = ProjectHelper.get_default_project(:client => @client)
-    @project = @client.create_project(title: 'Project for schedule testing', auth_token: ConnectionHelper::GD_PROJECT_TOKEN)
+    @project = @client.create_project(title: 'Project for schedule testing', auth_token: ConnectionHelper::GD_PROJECT_TOKEN, environment: ProjectHelper::ENVIRONMENT)
   end
 
   after(:each) do

data/spec/integration/user_filters_spec.rb

@@ -2,32 +2,27 @@ require 'gooddata'
 
 describe "User filters implementation", :constraint => 'slow' do
   before(:all) do
-    @spec = JSON.parse(File.read("./spec/data/test_project_model_spec.json"), :symbolize_names => true)
+    @spec = JSON.parse(File.read("./spec/data/blueprints/test_project_model_spec.json"), :symbolize_names => true)
     @client = ConnectionHelper::create_default_connection
-    @project = @client.create_project_from_blueprint(@spec, :auth_token => ConnectionHelper::GD_PROJECT_TOKEN)
+    blueprint = GoodData::Model::ProjectBlueprint.new(@spec)
+    @project = @client.create_project_from_blueprint(blueprint, :token => ConnectionHelper::GD_PROJECT_TOKEN, environment: ProjectHelper::ENVIRONMENT)
     @domain = @client.domain(ConnectionHelper::DEFAULT_DOMAIN)
 
-    GoodData.with_project(@project) do |p|
-      @label = GoodData::Attribute.find_first_by_title('Dev', client: @client, project: @project).label_by_name('email')
-      
-      blueprint = GoodData::Model::ProjectBlueprint.new(@spec)
-      commits_data = [
-        ["lines_changed","committed_on","dev_id","repo_id"],
-        [1,"01/01/2014",1,1],
-        [3,"01/02/2014",2,2],
-        [5,"05/02/2014",3,1]]
-      GoodData::Model.upload_data(commits_data, blueprint, 'commits', :client => @client, :project => @project)
-      # blueprint.find_dataset('commits').upload(commits_data)
-
-      devs_data = [
-        ["dev_id", "email"],
-        [1, "tomas@gooddata.com"],
-        [2, "petr@gooddata.com"],
-        [3, "jirka@gooddata.com"]]
-      GoodData::Model.upload_data(devs_data, blueprint, 'devs', :client => @client, :project => @project)
-      # blueprint.find_dataset('devs').upload(devs_data)
-    end
-
+    @label = GoodData::Attribute.find_first_by_title('Dev', client: @client, project: @project).label_by_name('email')
+
+    commits_data = [
+      ["lines_changed","committed_on","dev_id","repo_id"],
+      [1,"01/01/2014",1,1],
+      [3,"01/02/2014",2,2],
+      [5,"05/02/2014",3,1]]
+    @project.upload(commits_data, blueprint, 'dataset.commits')
+
+    devs_data = [
+      ["dev_id", "email"],
+      [1, "tomas@gooddata.com"],
+      [2, "petr@gooddata.com"],
+      [3, "jirka@gooddata.com"]]
+    @project.upload(devs_data, blueprint, 'dataset.devs')
   end
 
   after(:all) do
@@ -124,7 +119,7 @@ describe "User filters implementation", :constraint => 'slow' do
     perms = @project.data_permissions
     pretty = perms.pmap {|f| [f.related.login, f.pretty_expression]}
     expect(perms.first.related).to eq @client.user
-    expect(pretty).to eq [["svarovsky+gem_tester@gooddata.com", "[Dev] IN ([tomas@gooddata.com])"]]
+    expect(pretty).to eq [[ConnectionHelper::DEFAULT_USERNAME, "[Dev] IN ([tomas@gooddata.com])"]]
   end
 
   it "sets up mandatory users based on the state given as an end state by default." do

data/spec/integration/variables_spec.rb

@@ -2,29 +2,27 @@ require 'gooddata'
 
 describe "Variables implementation", :constraint => 'slow' do
   before(:all) do
-    @spec = JSON.parse(File.read("./spec/data/test_project_model_spec.json"), :symbolize_names => true)
+    @spec = JSON.parse(File.read("./spec/data/blueprints/test_project_model_spec.json"), :symbolize_names => true)
     @client = ConnectionHelper::create_default_connection
-    @project = @client.create_project_from_blueprint(@spec, :auth_token => ConnectionHelper::GD_PROJECT_TOKEN)
+    blueprint = GoodData::Model::ProjectBlueprint.new(@spec)
+    @project = @client.create_project_from_blueprint(blueprint, :token => ConnectionHelper::GD_PROJECT_TOKEN, environment: ProjectHelper::ENVIRONMENT)
     @domain = @client.domain(ConnectionHelper::DEFAULT_DOMAIN)
 
     @label = GoodData::Attribute.find_first_by_title('Dev', client: @client, project: @project).label_by_name('email')
-    
-    blueprint = GoodData::Model::ProjectBlueprint.new(@spec)
+
     commits_data = [
       ["lines_changed","committed_on","dev_id","repo_id"],
       [1,"01/01/2014",1,1],
       [3,"01/02/2014",2,2],
       [5,"05/02/2014",3,1]]
-    GoodData::Model.upload_data(commits_data, blueprint, 'commits', :client => @client, :project => @project)
-    # blueprint.find_dataset('commits').upload(commits_data)
+    @project.upload(commits_data, blueprint, 'dataset.commits')
     
     devs_data = [
       ["dev_id", "email"],
       [1, "tomas@gooddata.com"],
       [2, "petr@gooddata.com"],
       [3, "jirka@gooddata.com"]]
-    GoodData::Model.upload_data(devs_data, blueprint, 'devs', :client => @client, :project => @project)
-    # blueprint.find_dataset('devs').upload(devs_data)
+    @project.upload(devs_data, blueprint, 'dataset.devs')
     
     @variable = @project.create_variable(title: 'uaaa', attribute: @label.attribute).save
 
@@ -122,7 +120,7 @@ describe "Variables implementation", :constraint => 'slow' do
     perms = @variable.user_values
     pretty = perms.pmap {|f| [f.related.login, f.pretty_expression]}
     expect(perms.first.related).to eq @client.user
-    expect(pretty).to eq [["svarovsky+gem_tester@gooddata.com", "[Dev] IN ([tomas@gooddata.com])"]]
+    expect(pretty).to eq [[ConnectionHelper::DEFAULT_USERNAME, "[Dev] IN ([tomas@gooddata.com])"]]
   end
 
   it "sets up mandatory users based on the state given as an end state by default." do

data/spec/logging_in_logging_out_spec.rb

@@ -18,7 +18,7 @@ describe GoodData::Rest::Connection, :constraint => 'slow' do
     regular_client = ConnectionHelper::create_default_connection
     sst = regular_client.connection.sst_token
 
-    sst_client = GoodData.connect(sst_token: sst)
+    sst_client = GoodData.connect(sst_token: sst, verify_ssl: false)
     expect(sst_client.projects.count).to be > 0
     sst_client.disconnect
 

data/spec/spec_helper.rb

@@ -5,16 +5,24 @@ require 'pmap'
 require 'rspec'
 require 'coveralls'
 require 'pathname'
+require 'webmock/rspec'
 
+WebMock.disable!
 Coveralls.wear_merged!
 
 # Automagically include all helpers/*_helper.rb
 
+require_relative 'environment/environment'
+
+GoodData::Environment.load
+
 base = Pathname(__FILE__).dirname.expand_path
 Dir.glob(base + 'helpers/*_helper.rb').each do |file|
   require file
 end
 
+include GoodData::Helpers
+
 RSpec.configure do |config|
   config.include BlueprintHelper
   config.include CliHelper
@@ -28,7 +36,7 @@ RSpec.configure do |config|
 
   config.filter_run_excluding :broken => true
 
-  config.fail_fast = true
+  config.fail_fast = false
 
   config.before(:all) do
     # TODO: Move this to some method.
@@ -49,6 +57,7 @@ RSpec.configure do |config|
 
   config.before(:suite) do
     # TODO: Setup test project
+    GoodData.logging_on
   end
 
   config.after(:suite) do

data/spec/unit/bricks/middleware/aws_middelware_spec.rb

@@ -0,0 +1,47 @@
+# encoding: UTF-8
+
+require 'gooddata/bricks/brick'
+require 'gooddata/bricks/bricks'
+require 'gooddata/bricks/middleware/aws_middleware'
+
+describe GoodData::Bricks::AWSMiddleware do
+  it 'should do nothing if the key "aws_client" is not there at all' do
+    middleware = GoodData::Bricks::AWSMiddleware.new(app: lambda {|params| 'Doing nothing'})
+    middleware.call({})
+  end
+
+  it 'should fail gracefully if value aws_client param not present even though the key is' do
+    middleware = GoodData::Bricks::AWSMiddleware.new(app: lambda {|params| 'Doing nothing'})
+    expect do
+      middleware.call('aws_client' => nil)
+    end.to raise_exception 'Unable to connect to AWS. Parameter "aws_client" seems to be empty'
+  end
+
+  it 'should fail gracefully if value secret_access_key is missing' do
+    middleware = GoodData::Bricks::AWSMiddleware.new(app: lambda {|params| 'Doing nothing'})
+    expect do
+      middleware.call('aws_client' => {
+        'access_key_id' => 'something'
+      })
+    end.to raise_exception 'Unable to connect to AWS. Parameter "secret_access_key" is missing'
+  end
+
+  it 'should fail gracefully if value access_key_id is missing' do
+    middleware = GoodData::Bricks::AWSMiddleware.new(app: lambda {|params| 'Doing nothing'})
+    expect do
+      middleware.call('aws_client' => {
+        'secret_access_key' => 'something'
+      })
+    end.to raise_exception 'Unable to connect to AWS. Parameter "access_key_id" is missing'
+  end
+
+  it "should preapre aws middleware for aws_client param" do
+    middleware = GoodData::Bricks::AWSMiddleware.new(app: lambda do |params|
+      expect(params['aws_client']['s3_client']).to be_kind_of(AWS::S3)
+    end)
+    middleware.call('aws_client' => {
+      'secret_access_key' => 'something',
+      'access_key_id' => 'something'
+    })
+  end
+end

data/spec/unit/core/connection_spec.rb

@@ -20,7 +20,7 @@ describe GoodData::Rest::Connection do
 
   describe '#connect' do
     it "Connects using username and password" do
-      c = GoodData.connect(ConnectionHelper::DEFAULT_USERNAME, ConnectionHelper::DEFAULT_PASSWORD)
+      c = GoodData.connect(ConnectionHelper::DEFAULT_USERNAME, ConnectionHelper::DEFAULT_PASSWORD, :verify_ssl => 0)
       c.should be_a(GoodData::Rest::Client)
       c.disconnect
     end
@@ -28,7 +28,7 @@ describe GoodData::Rest::Connection do
 
   describe '#disconnect' do
     it "Connects using username and password" do
-      c = GoodData.connect(ConnectionHelper::DEFAULT_USERNAME, ConnectionHelper::DEFAULT_PASSWORD)
+      c = GoodData.connect(ConnectionHelper::DEFAULT_USERNAME, ConnectionHelper::DEFAULT_PASSWORD, :verify_ssl => 0)
       c.disconnect
     end
   end

data/spec/unit/core/logging_spec.rb

@@ -7,19 +7,19 @@ require 'logger'
 class TestLogger < Logger
   attr_reader :last_message
   def debug(*args)
-    @last_message = args[0]
+    @last_message = args[0] if level == Logger::DEBUG
     super(*args)
   end
   def info(*args)
-    @last_message = args[0]
+    @last_message = args[0] if level == Logger::INFO
     super(*args)
   end
   def warn(*args)
-    @last_message = args[0]
+    @last_message = args[0] if level == Logger::WARN
     super(*args)
   end
   def error(*args)
-    @last_message = args[0]
+    @last_message = args[0] if level == Logger::ERROR
     super(*args)
   end
 end
@@ -80,6 +80,14 @@ describe 'GoodData - logging' do
       id = test_request_id_logging
       expect(GoodData.logger.last_message).to include(id)
     end
+    it 'client logs when given custom message' do
+      GoodData.logger = TestLogger.new(STDOUT)
+      GoodData.logger.level = Logger::INFO
+      c = ConnectionHelper.create_default_connection
+      message = "Getting all projects."
+      c.get('/gdc/md', :info_message => message)
+      expect(GoodData.logger.last_message).to include(message)
+    end
   end
 
 

data/spec/unit/helpers/data_helper_spec.rb

@@ -0,0 +1,60 @@
+# encoding: UTF-8
+
+require 'gooddata/helpers/data_helper'
+
+describe GoodData::Helpers::DataSource do
+  before :each do
+    @s3_client = double('s3_client')
+    @buckets = double('buckets')
+    @bucket = double('bucket')
+    @objects = double('objects')
+
+    allow(@s3_client).to receive(:buckets) { @buckets }
+    allow(@buckets).to receive(:[]) { @bucket }
+    allow(@bucket).to receive(:objects) { @objects }
+    allow(@objects).to receive(:[]) { StringIO.new('aaa') }
+
+    @ds = GoodData::Helpers::DataSource.new({
+      type: :s3,
+      bucket: 'some_bucket',
+      key: 'some_key'
+    })
+  end
+
+  it 'should be able to handle AWS' do
+    expect(@ds.realized?).to be_falsey
+    params = { 'aws_client' => { 's3_client' => @s3_client } }
+    expect(@ds.realize(params)).to eq '2bdc6c8a02b2bd1d7997cf17f0848ecfcbceba25ca184e2676f19c054db7139b'
+    expect(@ds.realized?).to be_truthy
+  end
+
+  it 'should gracefully handle missing aws client' do
+    expect do
+      @ds.realize({
+        'aws_client' => nil
+      })
+    end.to raise_exception "AWS client not present. Perhaps S3Middleware is missing in the brick definition?"
+  end
+
+  it 'should gracefully handle missing data source params - bucket' do
+    ds = GoodData::Helpers::DataSource.new({
+      type: :s3,
+      key: 'some_key'
+    })
+    params = { 'aws_client' => { 's3_client' => @s3_client } }
+    expect do
+      ds.realize(params)
+    end.to raise_exception 'Key "bucket" is missing in S3 datasource'
+  end
+
+  it 'should gracefully handle missing data source params - key' do
+    ds = GoodData::Helpers::DataSource.new({
+      type: :s3,
+      bucket: 'some_bucket'
+    })
+    params = { 'aws_client' => { 's3_client' => @s3_client } }
+    expect do
+      ds.realize(params)
+    end.to raise_exception 'Key "key" is missing in S3 datasource'
+  end
+end