gooddata 0.6.49 → 0.6.50

data/lib/gooddata/bricks/middleware/fs_upload_middleware.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.
 
@@ -22,7 +22,7 @@ module GoodData
             path = f[:path]
             case destination.to_sym
             when :staging
-              GoodData.client.get '/gdc/account/token', :dont_reauth => true
+              GoodData.client.get '/gdc/account/token', dont_reauth: true
               url = GoodData.project_webdav_path
               GoodData.upload_to_project_webdav(path)
               puts "Uploaded local file \"#{path}\" to url \"#{url + path}\""

data/lib/gooddata/bricks/middleware/gooddata_middleware.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,30 +9,93 @@ require_relative 'base_middleware'
 module GoodData
   module Bricks
     class GoodDataMiddleware < Bricks::Middleware
+      DEFAULT_PROTOCOL = 'https'
+      DEFAULT_HOSTNAME = 'secure.gooddata.com'
+
       def call(params)
+        # Convert possible jruby hash to plain hash
         params = params.to_hash
+
+        # Transform keys
+        params = GoodData::Helpers.stringify_keys(params)
+        # params = GoodData::Helpers.symbolize_keys(params)
+
+        # Set logger
         logger = params['GDC_LOGGER']
-        token_name = 'GDC_SST'
-        protocol_name = 'CLIENT_GDC_PROTOCOL'
-        server_name = 'CLIENT_GDC_HOSTNAME'
-        project_id = params['GDC_PROJECT_ID']
-
-        server = if params[protocol_name] && params[server_name]
-                   "#{params[protocol_name]}://#{params[server_name]}"
-                 end
-
-        client = if params['GDC_USERNAME'].nil? || params['GDC_PASSWORD'].nil?
-                   puts "Connecting with SST to server #{server}"
-                   fail 'SST (SuperSecureToken) not present in params' if params[token_name].nil?
-                   GoodData.connect(sst_token: params[token_name], server: server)
-                 else
-                   puts "Connecting as #{params['GDC_USERNAME']} to server #{server}"
-                   GoodData.connect(params['GDC_USERNAME'], params['GDC_PASSWORD'], server: server)
-                 end
-        project = client.projects(project_id)
-        GoodData.project = project
         GoodData.logger = logger
-        @app.call(params.merge('GDC_GD_CLIENT' => client, 'gdc_project' => project))
+
+        # Connect Client
+        protocol = params['CLIENT_GDC_PROTOCOL'] || DEFAULT_PROTOCOL
+        hostname = params['CLIENT_GDC_HOSTNAME'] || DEFAULT_HOSTNAME
+        server = "#{protocol}://#{hostname}"
+        client = GoodDataMiddleware.connect(
+          server,
+          params['GDC_VERIFY_SSL'].to_b,
+          params['GDC_USERNAME'],
+          params['GDC_PASSWORD'],
+          params['GDC_SST']
+        )
+
+        opts = params['development_client']
+        if opts
+          if opts['server']
+            server = opts['server']
+          else
+            protocol = opts['protocol'] || DEFAULT_PROTOCOL
+            hostname = opts['hostname'] || DEFAULT_HOSTNAME
+            server = "#{protocol}://#{hostname}"
+          end
+
+          development_client = GoodDataMiddleware.connect(
+            server,
+            opts['verify_ssl'].to_b,
+            opts['username'] || opts['login'] || opts['email'],
+            opts['password'],
+            opts['sst']
+          )
+        else
+          development_client = client
+        end
+
+        new_params = {
+          'GDC_GD_CLIENT' => client,
+          'development_client' => development_client
+        }
+
+        if params['GDC_PROJECT_ID']
+          new_params['gdc_project'] = GoodData.project = client.projects(params['GDC_PROJECT_ID'])
+        end
+
+        returning_value = @app.call(params.merge(new_params))
+
+        # Try to disconnect client
+        begin
+          client.disconnect
+        rescue
+          puts 'Tried to disconnect client. Was unsuccessful. Proceeding anyway.'
+        end
+
+        # Try to disconnect development_client
+        begin
+          development_client.disconnect if development_client != client
+        rescue
+          puts 'Tried to disconnect development_client. Was unsuccessful. Proceeding anyway.'
+        end
+
+        returning_value
+      end
+
+      class << self
+        def connect(server, verify_ssl, username, password, sst_token) # rubocop:disable Metrics/ParameterLists
+          if username.nil? || password.nil?
+            puts "Connecting with SST to server #{server}"
+            raise 'SST (SuperSecureToken) not present in params' if sst_token.nil?
+            GoodData.connect(sst_token: sst_token, server: server, verify_ssl: verify_ssl)
+          else
+            puts "Connecting as #{username} to server #{server}"
+            GoodData.connect(username, password, server: server, verify_ssl: verify_ssl)
+          end
+        end
       end
     end
   end

data/lib/gooddata/bricks/middleware/logger_middleware.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.
 

data/lib/gooddata/bricks/middleware/middleware.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.
 

data/lib/gooddata/bricks/middleware/params_inspect_middleware.rb

@@ -0,0 +1,21 @@
+# encoding: UTF-8
+#
+# 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 'logger'
+
+require_relative 'base_middleware'
+
+module GoodData
+  module Bricks
+    class ParamsInspectMiddleware < Bricks::Middleware
+      def call(params)
+        inspect = params[:inspect_params] || params['inspect_params']
+        puts 'Inspecting Parameters ...'
+        puts JSON.pretty_generate(params) if inspect.to_b
+      end
+    end
+  end
+end

data/lib/gooddata/bricks/middleware/restforce_middleware.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.
 
@@ -12,38 +12,38 @@ require_relative 'base_middleware'
 module GoodData
   module Bricks
     class RestForceMiddleware < Bricks::Middleware
-      DEFAULT_VERSION = '29.0'
+      DEFAULT_VERSION = '29.0'.freeze
 
-      def self.create_client(params)
-        downloader_config = params['config']['downloader']['salesforce']
+      def self.prepare_credentials(downloader_config)
         username = downloader_config['username']
         password = downloader_config['password']
         token = downloader_config['token']
-        client_id = downloader_config['client_id']
-        client_secret = downloader_config['client_secret']
         oauth_refresh_token = downloader_config['oauth_refresh_token']
-        host = downloader_config['host']
-        version = downloader_config['api_version'] || DEFAULT_VERSION
-
-        credentials = if username && password && token
-                        {
-                          :username => username,
-                          :password => password,
-                          :security_token => token
-                        }
-                      elsif (oauth_refresh_token) && (!oauth_refresh_token.empty?)
-                        {
-                          :refresh_token => oauth_refresh_token
-                        }
-                      end
+
+        if username && password && token
+          {
+            username: username,
+            password: password,
+            security_token: token
+          }
+        elsif oauth_refresh_token && !oauth_refresh_token.empty?
+          {
+            refresh_token: oauth_refresh_token
+          }
+        end
+      end
+
+      def self.create_client(params)
+        downloader_config = params['config']['downloader']['salesforce']
+        credentials = prepare_credentials(params)
 
         client = if credentials
-                   credentials.merge!(
-                     :client_id => client_id,
-                     :client_secret => client_secret
-                   )
-                   credentials[:host] = host unless host.nil?
-                   credentials[:api_version] = version
+                   credentials[:client_id] = downloader_config['client_id']
+                   credentials[:client_secret] = downloader_config['client_secret']
+
+                   host = downloader_config['host']
+                   credentials[:host] = host if host
+                   credentials[:api_version] = downloader_config['api_version'] || DEFAULT_VERSION
 
                    Restforce.log = true if params['GDC_LOGGER']
 

data/lib/gooddata/bricks/middleware/stdout_middleware.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.
 

data/lib/gooddata/bricks/middleware/twitter_middleware.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.
 

data/lib/gooddata/bricks/middleware/undot_params_middleware.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.
 

data/lib/gooddata/bricks/pipeline.rb

@@ -1,14 +1,9 @@
 # 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_relative 'base_downloader'
-require_relative 'utils'
-
-require_relative 'middleware/middleware'
-
 module GoodData
   module Bricks
     class Pipeline
@@ -16,14 +11,12 @@ module GoodData
       def self.prepare(pipeline)
         pipeline.reverse.reduce(nil) do |memo, app|
           if memo.nil?
-            app.respond_to?(:new) ? (app.new) : app
+            app.respond_to?(:new) ? app.new : app
+          elsif app.respond_to?(:new)
+            app.new(app: memo)
           else
-            if app.respond_to?(:new)
-              app.new(:app => memo)
-            else
-              app.app = memo
-              app
-            end
+            app.app = memo
+            app
           end
         end
       end

data/lib/gooddata/bricks/utils.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,9 @@ module GoodData
   module Bricks
     module Utils
       def returning(value, &block)
-        fail 'Block was not provided' if block.nil?
+        raise 'Block was not provided' if block.nil?
         return_val = value
-        block.call(value)
+        yield value
         return_val
       end
     end

data/lib/gooddata/cli/cli.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.
 

data/lib/gooddata/cli/commands/auth_cmd.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.
 

data/lib/gooddata/cli/commands/domain_cmd.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.
 

data/lib/gooddata/cli/commands/project_cmd.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,15 +16,6 @@ module GoodData
     arg_name 'project_command'
 
     command :project do |c|
-      c.desc 'If you are in a gooddata project blueprint or if you provide a project id it will start an interactive session inside that project'
-      c.command :jack_in do |jack|
-        jack.action do |global_options, options, _args|
-          warn '[DEPRECATION] `gooddata project jack_in` is deprecated.  Please use `gooddata jack_in` instead.'
-          opts = options.merge(global_options)
-          GoodData::Command::Project.jack_in(opts)
-        end
-      end
-
       c.desc 'Shows users in project'
       c.command :users do |users|
         users.action do |global_options, options, _args|
@@ -33,13 +24,5 @@ module GoodData
         end
       end
     end
-
-    desc 'If you are in a gooddata project blueprint or if you provide a project id it will start an interactive session inside that project'
-    command :jack_in do |jack|
-      jack.action do |global_options, options, _args|
-        opts = options.merge(global_options)
-        GoodData::Command::Project.jack_in(opts)
-      end
-    end
   end
 end

data/lib/gooddata/cli/hooks.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.
 
@@ -49,7 +49,6 @@ GoodData::CLI.module_eval do
   on_error do |_exception|
     # Error logic here
     # return false to skip default error handling
-    # binding.pry
     # pp exception.backtrace
     # pp exception
     true

data/lib/gooddata/cli/shared.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.
 

data/lib/gooddata/cli/terminal.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.
 

data/lib/gooddata/client.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.
 

data/lib/gooddata/commands/api.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.