gooddata 0.6.49 → 0.6.50

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

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 #
-# Copyright (c) 2010-2015 GoodData Corporation. All rights reserved.
+# Copyright (c) 2010-2017 GoodData Corporation. All rights reserved.
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
@@ -8,8 +8,8 @@ require 'gooddata/bricks/brick'
 require 'gooddata/bricks/bricks'
 require 'gooddata/bricks/middleware/restforce_middleware'
 
-  describe GoodData::Bricks::RestForceMiddleware do
+describe GoodData::Bricks::RestForceMiddleware do
   it "Has GoodData::Bricks::RestForceMiddleware class" do
-    GoodData::Bricks::RestForceMiddleware.should_not == nil
+    GoodData::Bricks::RestForceMiddleware.should_not be(nil)
   end
 end

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

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 #
-# Copyright (c) 2010-2015 GoodData Corporation. All rights reserved.
+# Copyright (c) 2010-2017 GoodData Corporation. All rights reserved.
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
@@ -8,8 +8,8 @@ require 'gooddata/bricks/brick'
 require 'gooddata/bricks/bricks'
 require 'gooddata/bricks/middleware/stdout_middleware'
 
-  describe GoodData::Bricks::STDOUTLoggingMiddleware do
+describe GoodData::Bricks::STDOUTLoggingMiddleware do
   it "Has GoodData::Bricks::STDOUTLoggingMiddleware class" do
-    GoodData::Bricks::STDOUTLoggingMiddleware.should_not == nil
+    GoodData::Bricks::STDOUTLoggingMiddleware.should_not be(nil)
   end
 end

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

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 #
-# Copyright (c) 2010-2015 GoodData Corporation. All rights reserved.
+# Copyright (c) 2010-2017 GoodData Corporation. All rights reserved.
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
@@ -8,8 +8,8 @@ require 'gooddata/bricks/brick'
 require 'gooddata/bricks/bricks'
 require 'gooddata/bricks/middleware/twitter_middleware'
 
-  describe GoodData::Bricks::TwitterMiddleware do
+describe GoodData::Bricks::TwitterMiddleware do
   it "Has GoodData::Bricks::TwitterMiddleware class" do
-    GoodData::Bricks::TwitterMiddleware.should_not == nil
+    GoodData::Bricks::TwitterMiddleware.should_not be(nil)
   end
 end

data/spec/unit/cli/cli_spec.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 #
-# Copyright (c) 2010-2015 GoodData Corporation. All rights reserved.
+# Copyright (c) 2010-2017 GoodData Corporation. All rights reserved.
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
@@ -8,10 +8,10 @@ require 'gooddata/cli/cli'
 
 describe GoodData::CLI do
   it 'Has GoodData::CLI class' do
-    GoodData::CLI.should_not == nil
+    expect(GoodData::CLI).not_to be_nil
   end
 
   it 'Has GoodData::CLI::main() working' do
     run_cli
   end
-end
+end

data/spec/unit/cli/commands/cmd_auth_spec.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 #
-# Copyright (c) 2010-2015 GoodData Corporation. All rights reserved.
+# Copyright (c) 2010-2017 GoodData Corporation. All rights reserved.
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
@@ -14,4 +14,4 @@ describe 'GoodData::CLI - auth', :broken => true do
       run_cli(args)
     end
   end
-end
+end

data/spec/unit/commands/command_projects_spec.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 #
-# Copyright (c) 2010-2015 GoodData Corporation. All rights reserved.
+# Copyright (c) 2010-2017 GoodData Corporation. All rights reserved.
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
@@ -16,7 +16,7 @@ describe GoodData::Command::Project do
   end
 
   it "Is Possible to create GoodData::Command::Project instance" do
-    cmd = GoodData::Command::Project.new()
+    cmd = GoodData::Command::Project.new
     cmd.should be_a(GoodData::Command::Project)
   end
-end
+end

data/spec/unit/core/connection_spec.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 #
-# Copyright (c) 2010-2015 GoodData Corporation. All rights reserved.
+# Copyright (c) 2010-2017 GoodData Corporation. All rights reserved.
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
@@ -45,7 +45,7 @@ describe GoodData::Rest::Connection do
 
       # generate a request id, and pass it to a request
       id = c.generate_request_id
-      resp = c.get('/gdc/md', :request_id => id)
+      c.get('/gdc/md', :request_id => id)
 
       id.should be_a(String)
       id.should_not be_empty
@@ -53,5 +53,4 @@ describe GoodData::Rest::Connection do
       c.disconnect
     end
   end
-
-end
+end

data/spec/unit/core/logging_spec.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 #
-# Copyright (c) 2010-2015 GoodData Corporation. All rights reserved.
+# Copyright (c) 2010-2017 GoodData Corporation. All rights reserved.
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
@@ -36,8 +36,6 @@ class TestLogger < Logger
   end
 end
 
-
-
 describe 'GoodData - logging' do
   TEST_MESSAGE = 'Hello World!'
 
@@ -102,7 +100,6 @@ describe 'GoodData - logging' do
     end
   end
 
-
   describe '#logging_on' do
     it 'Enables logging' do
       GoodData.logging_on
@@ -130,4 +127,4 @@ describe 'GoodData - logging' do
       test_warn
     end
   end
-end
+end

data/spec/unit/core/nil_logger_spec.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 #
-# Copyright (c) 2010-2015 GoodData Corporation. All rights reserved.
+# Copyright (c) 2010-2017 GoodData Corporation. All rights reserved.
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
@@ -10,4 +10,4 @@ describe GoodData::NilLogger do
   it "Has GoodData::NilLogger class" do
     GoodData::NilLogger.should_not be(nil)
   end
-end
+end

data/spec/unit/core/project_spec.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 #
-# Copyright (c) 2010-2015 GoodData Corporation. All rights reserved.
+# Copyright (c) 2010-2017 GoodData Corporation. All rights reserved.
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
@@ -38,10 +38,10 @@ describe 'GoodData - project' do
   describe '#project' do
     it 'Returns project assigned' do
       GoodData.project = nil
-      GoodData.project.should == nil
+      expect(GoodData.project).to be_nil
 
       GoodData.use ProjectHelper::PROJECT_ID, client: @client
-      GoodData.project.should_not == nil
+      expect(GoodData.project).not_to be_nil
     end
   end
 
@@ -51,4 +51,4 @@ describe 'GoodData - project' do
       end
     end
   end
-end
+end

data/spec/unit/extensions/hash_spec.rb

@@ -1,11 +1,10 @@
 # encoding: UTF-8
 #
-# Copyright (c) 2010-2015 GoodData Corporation. All rights reserved.
+# Copyright (c) 2010-2017 GoodData Corporation. All rights reserved.
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
 describe Hash do
-
   describe '#deep_dup' do
     it 'should crete a deep copy' do
       x = {
@@ -16,8 +15,8 @@ describe Hash do
       y = x.dup
       deep_y = GoodData::Helpers.deep_dup(x)
 
-      y[:a].object_id.should === x[:a].object_id
-      deep_y[:a].object_id.should_not === x[:a].object_id
+      expect(y[:a].object_id).to be == x[:a].object_id
+      expect(deep_y[:a].object_id).not_to be == x[:a].object_id
     end
   end
 end

data/spec/unit/godzilla/goodzilla_spec.rb

@@ -1,13 +1,12 @@
 # encoding: UTF-8
 #
-# Copyright (c) 2010-2015 GoodData Corporation. All rights reserved.
+# Copyright (c) 2010-2017 GoodData Corporation. All rights reserved.
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
 require 'gooddata'
 
 describe GoodData::SmallGoodZilla do
-  
   MAQL_EXAMPLE = 'SELECT SUM(#"Amount") WHERE @"Date"=#"X" AND ?"Snapshot EOP"=1'
   FACTS = {
     "Amount" => "a",
@@ -22,42 +21,40 @@ describe GoodData::SmallGoodZilla do
   DICT = {
     :facts => FACTS,
     :attributes => ATTRIBUTES,
-    :metrics => METRICS,
+    :metrics => METRICS
   }
-  
+
   it "should parse metrics out of the string" do
-    x = GoodData::SmallGoodZilla.get_facts(MAQL_EXAMPLE)
-    x.should == ["Amount", "X"]
+    expect(GoodData::SmallGoodZilla.get_facts(MAQL_EXAMPLE)).to eq %w(Amount X)
   end
 
   it "should parse attributes out of the string" do
-    x = GoodData::SmallGoodZilla.get_attributes(MAQL_EXAMPLE)
-    x.should == ["Date"]
+    expect(GoodData::SmallGoodZilla.get_attributes(MAQL_EXAMPLE)).to eq %w(Date)
   end
 
   it "should parse metrics out of the string" do
-    x = GoodData::SmallGoodZilla.get_metrics(MAQL_EXAMPLE)
-    x.should == ["Snapshot EOP"]
+    expect(GoodData::SmallGoodZilla.get_metrics(MAQL_EXAMPLE)).to eq ["Snapshot EOP"]
   end
 
   it "should interpolate the values" do
-    
-    interpolated = GoodData::SmallGoodZilla.interpolate({
-      :facts => ["Amount", "X"],
-      :attributes => ["Date"],
-      :metrics => ["Snapshot EOP"]
-    }, DICT)
-    
-    interpolated.should == {
-      :facts => [["Amount", "a"], ["X", "x"]],
-      :attributes => [["Date", "d"]],
+    interpolated = GoodData::SmallGoodZilla.interpolate(
+      {
+        :facts => %w(Amount X),
+        :attributes => ["Date"],
+        :metrics => ["Snapshot EOP"]
+      },
+      DICT
+    )
+
+    expect(interpolated).to eq(
+      :facts => [%w(Amount a), %w(X x)],
+      :attributes => [%w(Date d)],
       :metrics => [["Snapshot EOP", "snap"]]
-    }
+    )
   end
 
   it "should return interpolated metric" do
-    interpolated = GoodData::SmallGoodZilla.interpolate_metric(MAQL_EXAMPLE, DICT)
-    interpolated.should == "SELECT SUM([a]) WHERE [d]=[x] AND [snap]=1"
+    expect(GoodData::SmallGoodZilla.interpolate_metric(MAQL_EXAMPLE, DICT)).to eq "SELECT SUM([a]) WHERE [d]=[x] AND [snap]=1"
   end
 
   it "should be able to parse several ids correctly." do
@@ -67,12 +64,11 @@ describe GoodData::SmallGoodZilla do
           WHEN ![attr.customer_profiles.profile_id] = [/gdc/md/pxa3aic06undadkc5s7t5lxpne11vgyt/obj/257/elements?id=50] THEN ![fact.perfomance_by_campaign_id.general_score_5]
           WHEN ![attr.customer_profiles.profile_id] = [/gdc/md/pxa3aic06undadkc5s7t5lxpne11vgyt/obj/257/elements?id=20]  THEN ![fact.perfomance_by_campaign_id.general_score_12]
         END)"
-    GoodData::SmallGoodZilla.get_ids(metric).should == [
+    expect(GoodData::SmallGoodZilla.get_ids(metric)).to eq [
       "attr.customer_profiles.profile_id",
       "fact.perfomance_by_campaign_id.general_score_1",
       "fact.perfomance_by_campaign_id.general_score_5",
       "fact.perfomance_by_campaign_id.general_score_12"
     ]
   end
-
-end
+end

data/spec/unit/helpers/csv_helper_spec.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 #
-# Copyright (c) 2010-2015 GoodData Corporation. All rights reserved.
+# Copyright (c) 2010-2017 GoodData Corporation. All rights reserved.
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
@@ -9,7 +9,7 @@ require 'gooddata/helpers/csv_helper'
 describe GoodData::Helpers::Csv do
   describe '#read' do
     it 'Reads data from CSV file' do
-      data = GoodData::Helpers::Csv.read(:path => CsvHelper::CSV_PATH_IMPORT)
+      GoodData::Helpers::Csv.read(:path => CsvHelper::CSV_PATH_IMPORT)
     end
   end
 
@@ -19,4 +19,4 @@ describe GoodData::Helpers::Csv do
       GoodData::Helpers::Csv.write(:path => CsvHelper::CSV_PATH_EXPORT, :data => data)
     end
   end
-end
+end

data/spec/unit/helpers/data_helper_spec.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 #
-# Copyright (c) 2010-2015 GoodData Corporation. All rights reserved.
+# Copyright (c) 2010-2017 GoodData Corporation. All rights reserved.
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
@@ -18,11 +18,7 @@ describe GoodData::Helpers::DataSource do
     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'
-    })
+    @ds = GoodData::Helpers::DataSource.new(type: :s3, bucket: 'some_bucket', key: 'some_key')
   end
 
   it 'should be able to handle AWS' do
@@ -34,17 +30,12 @@ describe GoodData::Helpers::DataSource do
 
   it 'should gracefully handle missing aws client' do
     expect do
-      @ds.realize({
-        'aws_client' => nil
-      })
+      @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'
-    })
+    ds = GoodData::Helpers::DataSource.new(type: :s3, key: 'some_key')
     params = { 'aws_client' => { 's3_client' => @s3_client } }
     expect do
       ds.realize(params)
@@ -52,13 +43,10 @@ describe GoodData::Helpers::DataSource do
   end
 
   it 'should gracefully handle missing data source params - key' do
-    ds = GoodData::Helpers::DataSource.new({
-      type: :s3,
-      bucket: 'some_bucket'
-    })
+    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
+end

data/spec/unit/helpers/global_helpers_spec.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 #
-# Copyright (c) 2010-2015 GoodData Corporation. All rights reserved.
+# Copyright (c) 2010-2017 GoodData Corporation. All rights reserved.
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
@@ -8,9 +8,7 @@ require 'gooddata/helpers/csv_helper'
 
 describe GoodData::Helpers do
   describe '#diff' do
-
     before :each do
-
       @old_tomas = { id: 1, name: 'Tomas', age: 28 }
       @new_tomas = { id: 1, name: "Lil'Tomas", age: 28 }
       @patrick = { id: 4, name: 'Patrick', age: 24 }
@@ -32,8 +30,8 @@ describe GoodData::Helpers do
       expect(diff[:changed]).to eq([
         {
           old_obj: @old_tomas,
-          new_obj: @new_tomas, 
-          diff: { name: "Lil'Tomas"}
+          new_obj: @new_tomas,
+          diff: { name: "Lil'Tomas" }
         },
         {
           old_obj: @old_korczis,
@@ -59,38 +57,27 @@ describe GoodData::Helpers do
     end
 
     it 'should encode params and preserve the nil in hidden' do
-      x = GoodData::Helpers.decode_params({ "x" => "y", GoodData::Helpers::ENCODED_HIDDEN_PARAMS_KEY.to_s => '{"a":{"b": "c"}}'})
-      expect(x).to eq({"x"=>"y", "a"=>{"b"=>"c"}, "gd_encoded_hidden_params"=>nil})
+      x = GoodData::Helpers.decode_params("x" => "y", GoodData::Helpers::ENCODED_HIDDEN_PARAMS_KEY.to_s => '{"a":{"b": "c"}}')
+      expect(x).to eq("x" => "y", "a" => { "b" => "c" }, "gd_encoded_hidden_params" => nil)
     end
 
     it 'should encode params and preserve the nil in hidden' do
-      x = GoodData::Helpers.decode_params({GoodData::Helpers::ENCODED_HIDDEN_PARAMS_KEY.to_s => nil})
-      expect(x).to eq({"gd_encoded_hidden_params" =>nil})
+      x = GoodData::Helpers.decode_params(GoodData::Helpers::ENCODED_HIDDEN_PARAMS_KEY.to_s => nil)
+      expect(x).to eq("gd_encoded_hidden_params" => nil)
     end
 
     it 'should encode params and preserve the nil in hidden' do
-      x = GoodData::Helpers.decode_params({
+      x = GoodData::Helpers.decode_params(
         "x" => "y",
         GoodData::Helpers::ENCODED_PARAMS_KEY.to_s => '{"d":{"b": "c"}}',
         GoodData::Helpers::ENCODED_HIDDEN_PARAMS_KEY.to_s => '{"a":{"b": "c"}}'
-      })
-      expect(x).to eq({
-        "x"=>"y",
-        "a"=>{"b"=>"c"},
-        "d" => {"b" => "c"},
-        "gd_encoded_hidden_params"=>nil
-      })
+      )
+      expect(x).to eq("x" => "y", "a" => { "b" => "c" }, "d" => { "b" => "c" }, "gd_encoded_hidden_params" => nil)
     end
 
     it 'should encode params and note preserve the nil in public' do
-      x = GoodData::Helpers.decode_params({
-        "x" => "y",
-        GoodData::Helpers::ENCODED_PARAMS_KEY.to_s => '{"d":{"b": "c"}}'
-      })
-      expect(x).to eq({
-        "x"=>"y",
-        "d" => {"b" => "c"}
-      })
+      x = GoodData::Helpers.decode_params("x" => "y", GoodData::Helpers::ENCODED_PARAMS_KEY.to_s => '{"d":{"b": "c"}}')
+      expect(x).to eq("x" => "y", "d" => { "b" => "c" })
     end
 
     it 'should be abe to join datasets' do
@@ -102,10 +89,107 @@ describe GoodData::Helpers do
                 { id: 2, y: 'BAR' }]
 
       results = GoodData::Helpers.join(master, lookup, [:x], [:id])
-      expect(results).to eq [{:id=>"a", :y=>"FOO", :x=>1},
-                             {:id=>"b", :y=>"FOO", :x=>1},
-                             {:id=>"c", :y=>"BAR", :x=>2}]
+      expect(results).to eq [{ :id => "a", :y => "FOO", :x => 1 },
+                             { :id => "b", :y => "FOO", :x => 1 },
+                             { :id => "c", :y => "BAR", :x => 2 }]
+    end
+
+    it 'should encode secure params' do
+      x = GoodData::Helpers.decode_params(
+        "x" => "y",
+        "d|b|foo" => "bar",
+        "d|b|e|w" => "z",
+        GoodData::Helpers::ENCODED_PARAMS_KEY.to_s => '{"d":{"b":{"c": "a"}}}',
+        GoodData::Helpers::ENCODED_HIDDEN_PARAMS_KEY.to_s => '{"d":{"b":{"e":{"f": "g"}}}}'
+      )
+      expect(x).to eq(
+        "x" => "y",
+        "d" => { "b" => { "c" => "a", "e" => { "f" => "g", "w" => "z" }, "foo" => "bar" } },
+        "gd_encoded_hidden_params" => nil
+      )
+    end
+
+    it 'should encode reference parameters in gd_encoded_params' do
+      params = {
+        'x' => 'y',
+        'ads_password' => 'ads_123',
+        'my_password' => 'login_123',
+        'gd_encoded_params' => '{"login_username": "login_user", "login_password": "abc_${my_password}_123"}'
+      }
+      expected_result = {
+        'x' => 'y',
+        'ads_password' => 'ads_123',
+        'my_password' => 'login_123',
+        'login_username' => 'login_user',
+        'login_password' => 'abc_login_123_123'
+      }
+      result = GoodData::Helpers.decode_params(params, :resolve_reference_params => true)
+      expect(result).to eq(expected_result)
     end
 
+    it 'should encode escape reference parameters in gd_encoded_params' do
+      params = {
+        'x' => 'y',
+        'ads_password' => 'ads_123',
+        'my_password' => 'login_123',
+        'gd_encoded_params' => '{"login_username": "login_user", "data01": "\\${abc}"}'
+      }
+      expected_result = {
+        'x' => 'y',
+        'ads_password' => 'ads_123',
+        'my_password' => 'login_123',
+        'login_username' => 'login_user',
+        'data01' => '${abc}'
+      }
+      result = GoodData::Helpers.decode_params(params, :resolve_reference_params => true)
+      expect(result).to eq(expected_result)
+    end
+
+    it 'should encode reference parameters in nested block in gd_encoded_params' do
+      params = {
+        'x' => 'y',
+        'ads_password' => 'ads_123',
+        'my_password' => 'login_123',
+        'gd_encoded_params' => '{"login_username": "login_user", "ads_client": {"username": "ads_user", "password": "${ads_password}"}}'
+      }
+      expected_result = {
+        'x' => 'y',
+        'ads_password' => 'ads_123',
+        'my_password' => 'login_123',
+        'login_username' => 'login_user',
+        'ads_client' => {
+          'username' => 'ads_user',
+          'password' => 'ads_123'
+        }
+      }
+      result = GoodData::Helpers.decode_params(params, :resolve_reference_params => true)
+      expect(result).to eq(expected_result)
+    end
+  end
+
+  describe '.interpolate_error_message' do
+    let(:error_message) { { 'error' => { 'message' => 'foo %s', 'parameters' => ['bar'] } } }
+
+    before do
+      @message = GoodData::Helpers.interpolate_error_message(error_message)
+    end
+
+    it 'interpolates parameters' do
+      expect(@message).to eq('foo bar')
+    end
+
+    context 'when error parameter is empty' do
+      let(:error_message) { {} }
+      it 'returns nil' do
+        expect(@message).to be_nil
+      end
+    end
+
+    context 'when error key is empty' do
+      let(:error_message) { { 'error' => {} } }
+      it 'returns nil' do
+        expect(@message).to be_nil
+      end
+    end
   end
 end