gooddata-bricks 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bbf4e721ee07561d0a148a71a03be11adbdc43f
-  data.tar.gz: 05d5f2febf699e6a10113c500ae83d1c396789e3
+  metadata.gz: da3e64cedbf60891bbc0b2495b348f699d95bd7f
+  data.tar.gz: 3c5ca10e13645cda123ebcbd8dea9eb2ed480168
 SHA512:
-  metadata.gz: 90a7c09c10fcad5d51419f2a16f056a2843b3b2524ff00e4bba5ef7487879b4c07b48dbee76d31953f7d6e0355acc6783cec43b4bf5d1be80e52e56358f30bbd
-  data.tar.gz: 515f0a2473d13895cab46eee334422b4e9af19282f69201613fb14c099c2f30bc062cea3704d388a044093309ecd937293cd2d88bbf496d9eb201eea97a8a2a7
+  metadata.gz: 1fbc41076702fdcc7d659b0e46cc43f57c01f466380c65d222d82b2602a09fc1bde98945d4b0a11bd0ddab130c2d31b38faaf5acbaed4d2297cc68190db359d7
+  data.tar.gz: 236411cdd63a585202c12e4f44aaffe4c5b15685753e5f3d714d3ffc7290e082e351b95a3a9470a18bf27c6b0df44ad2cbed1e1e21ea26ca6e0be9799a0b405d

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in gooddata-bricks.gemspec
 gemspec
+
+gem 'gooddata', git: 'https://github.com/gooddata/gooddata-ruby.git', ref: 'a716539'

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

@@ -23,27 +23,31 @@ module GoodData
         # Set logger
         logger = params['GDC_LOGGER']
         GoodData.logger = logger
-
+        server = "#{params['CLIENT_GDC_PROTOCOL'] || DEFAULT_PROTOCOL}://#{params['CLIENT_GDC_HOSTNAME'] || DEFAULT_HOSTNAME}"
+        opts = {
+          server: server,
+          verify_ssl: params['GDC_VERIFY_SSL'].to_b,
+          username: params['GDC_USERNAME'],
+          password: params['GDC_PASSWORD'],
+          sst_token: params['GDC_SST']
+        }
         # Connect Client
-        client = GoodDataMiddleware.connect(
-          params['CLIENT_GDC_PROTOCOL'] || DEFAULT_PROTOCOL,
-          params['CLIENT_GDC_HOSTNAME'] || DEFAULT_HOSTNAME,
-          params['GDC_VERIFY_SSL'].to_b,
-          params['GDC_USERNAME'],
-          params['GDC_PASSWORD'],
-          params['GDC_SST']
-        )
+        client = GoodData.connect(opts)
 
         opts = params['development_client']
         if opts
-          development_client = GoodDataMiddleware.connect(
-            opts['protocol'] || DEFAULT_PROTOCOL,
-            opts['hostname'] || DEFAULT_HOSTNAME,
-            opts['verify_ssl'].to_b,
-            opts['username'],
-            opts['password'],
-            opts['sst']
-          )
+          new_opts = {
+            verify_ssl: opts['verify_ssl'].to_b || opts[:verify_ssl].to_b,
+            username: opts['username'] || opts[:username],
+            password: opts['password'] || opts[:password],
+            sst_token: opts['sst_token'] || opts[:sst_token]
+          }
+
+          if opts[:sever].nil?
+            new_opts[:server] = "#{opts['protocol'] || opts[:protocol] || DEFAULT_PROTOCOL}://#{opts['hostname'] || opts[:hostname] || DEFAULT_HOSTNAME}"
+          end
+
+          development_client = GoodData.connect(new_opts)
         else
           development_client = client
         end
@@ -65,21 +69,6 @@ module GoodData
         end
         returning_value
       end
-
-      class << self
-        def connect(protocol, hostname, verify_ssl, username, password, sst_token)
-          server = "#{protocol}://#{hostname}" if protocol && hostname
-
-          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
 end

data/lib/gooddata/bricks/version.rb

@@ -6,6 +6,6 @@
 
 module GoodData
   module Bricks
-    VERSION = '0.6.0'.freeze
+    VERSION = '0.7.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gooddata-bricks
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Tomas Svarovsky
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-02-06 00:00:00.000000000 Z
+date: 2017-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement