gooddata-bricks 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c449efac4ebc29bbe1894ddacd889d6c5bc408e0
-  data.tar.gz: 1ddd5f72330bbcbd4837b3790f4c620d1a87e254
+  metadata.gz: 909157ae49e16430568d32477998b87c36b08235
+  data.tar.gz: ae58ed11a11753cd720189711002023192ab99a3
 SHA512:
-  metadata.gz: 0f46c3b8817ec7f367e4e45b629d3765541acbb875f3f059daa7634302ea9980e1032b818e94cb2d6575e256da5656dba4accff1cbf51ded0328b2f0f10fcc35
-  data.tar.gz: 1c9c0c4fa49f22ee8771ed314e534aef03a13de6005a2524026772c2f9b50d509ca76ee9971f49e5c8d9ed1a4086a4e5b5521adaa552c41e7c08dd991a8818cd
+  metadata.gz: 68ec19cefd7a236623e7579a94d16d4bb30656e6ed4a4196aa7fc300c5f131982e88935936dd7d9b3891ea5fb75d02a57f88ebd1f29266a496aeea9aef5ceb10
+  data.tar.gz: 21bb4e4a62be4de59129dd50f4852905782f34abc97291b18ff94c7b246713d6974078ded5da1916be9e380f2a7003417b330ded65aba2be49a79bb7c5db71f0

data/.rubocop.yml

@@ -9,3 +9,9 @@ LineLength:
 
 MethodLength:
   Enabled: false
+
+CyclomaticComplexity:
+  Enabled: false
+
+PerceivedComplexity:
+  Enabled: false

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

@@ -13,9 +13,9 @@ module GoodData
       def call(params)
         if params.key?('ads_client')
           puts "Setting up ADS connection to #{params['ads_client']['ads_id']}"
-          fail "ADS middleware needs username either as part of ads_client spec or as a global 'GDC_USERNAME' parameter" unless params['ads_client']['username'] || params['GDC_USERNAME']
-          fail "ADS middleware needs password either as part of ads_client spec or as a global 'GDC_PASSWORD' parameter" unless params['ads_client']['password'] || params['GDC_PASSWORD']
-          
+          raise "ADS middleware needs username either as part of ads_client spec or as a global 'GDC_USERNAME' parameter" unless params['ads_client']['username'] || params['GDC_USERNAME']
+          raise "ADS middleware needs password either as part of ads_client spec or as a global 'GDC_PASSWORD' parameter" unless params['ads_client']['password'] || params['GDC_PASSWORD']
+
           ads = GoodData::Datawarehouse.new(params['ads_client']['username'] || params['GDC_USERNAME'], params['ads_client']['password'] || params['GDC_PASSWORD'], params['ads_client']['ads_id'])
           @app.call(params.merge('ads_client' => ads, :ads_client => ads))
         else

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

@@ -32,7 +32,13 @@ module GoodData
         project = client.projects(project_id)
         GoodData.project = project
         GoodData.logger = logger
-        @app.call(params.merge('GDC_GD_CLIENT' => client, 'gdc_project' => project))
+        returning_value = @app.call(params.merge('GDC_GD_CLIENT' => client, 'gdc_project' => project))
+        begin
+          client.disconnect
+        rescue
+          puts 'Tried to disconnect. Was unsuccesfull. Proceeding anyway.'
+        end
+        returning_value
       end
     end
   end

data/lib/gooddata/bricks/version.rb

@@ -6,6 +6,6 @@
 
 module GoodData
   module Bricks
-    VERSION = '0.2.0'.freeze
+    VERSION = '0.3.0'.freeze
   end
 end

data/lib/gooddata/helpers/data_helper.rb

@@ -34,7 +34,7 @@ module GoodData
         when 's3'
           realize_s3(params)
         else
-          fail "DataSource does not support type \"#{source}\""
+          raise "DataSource does not support type \"#{source}\""
         end
       end
 
@@ -47,7 +47,7 @@ module GoodData
       def realize_query(params)
         query = @options[:query]
         dwh = params['ads_client']
-        fail "Data Source needs a client to ads to be able to query the storage but 'ads_client' is empty." unless dwh
+        raise "Data Source needs a client to ads to be able to query the storage but 'ads_client' is empty." unless dwh
         filename = Digest::SHA256.new.hexdigest(query)
         measure = Benchmark.measure do
           CSV.open(filename, 'w') do |csv|
@@ -94,11 +94,11 @@ module GoodData
 
       def realize_s3(params)
         s3_client = params['aws_client'] && params['aws_client']['s3_client']
-        fail 'AWS client not present. Perhaps S3Middleware is missing in the brick definition?' if !s3_client || !s3_client.respond_to?(:buckets)
+        raise 'AWS client not present. Perhaps S3Middleware is missing in the brick definition?' if !s3_client || !s3_client.respond_to?(:buckets)
         bucket_name = @options[:bucket]
         key = @options[:key]
-        fail "Key \"bucket\" is missing in S3 datasource" if bucket_name.blank?
-        fail "Key \"key\" is missing in S3 datasource" if key.blank?
+        raise 'Key "bucket" is missing in S3 datasource' if bucket_name.blank?
+        raise 'Key "key" is missing in S3 datasource' if key.blank?
         puts "Realizing download from S3. Bucket #{bucket_name}, object with key #{key}."
         filename = Digest::SHA256.new.hexdigest(@options.to_json)
         bucket = s3_client.buckets[bucket_name]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gooddata-bricks
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Tomas Svarovsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-04 00:00:00.000000000 Z
+date: 2016-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler