gooddata 0.6.46 → 0.6.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08ebe2ca066c3bcb8457ef1b9a736dda55e0d6d5
-  data.tar.gz: a99fdf45348cc33462fee6187f03981794e947da
+  metadata.gz: 1fe4a380bfb3c6a8bf88999a27ca7dc61a18f637
+  data.tar.gz: e01f91a9f40a36ce9e64f3018b033616882fc94f
 SHA512:
-  metadata.gz: bdeb336ae21eae0b68d4878de8417d7606799d22b9998977c92e1048715b3c6d1d710ec0b4ea4839667fd5a8f43b584a469e1bceed9a83592f3da3dd55fbd48a
-  data.tar.gz: d8706eac0e9378771c643e45d38709c2ddc72a557e19806dc3aeff1eda51267891452217fe561f4dd0ffc8ace3a8fa5b1f05640195140a7f6c0f1a430abee6d8
+  metadata.gz: acc255529450901f5896fb15178d078fe69ff99ee9d1f54b1f29999780ed9857a7214ed34c47fcfe081f905c955bc2581e3db0bfbc18d7144c0cb4695c3fd33b
+  data.tar.gz: 9041e3486768a8b493009f8c710a20170ba14717e68b3870eef4480eefae83c8ed60acce69cc0eedab8ea7d15d9b6281f42952520861d91efe13c86029dcaa21

data/.rubocop.yml

@@ -1,9 +1,15 @@
+AllCops:
+  DisplayCopNames: true
+
 AbcSize:
   Enabled: false
 
 ClassLength:
   Enabled: false
 
+Metrics/BlockLength:
+  Max: 40
+
 ModuleLength:
   Enabled: false
 

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # GoodData Ruby SDK Changelog
 
+## 0.6.47
+- Support for GD_MAX_RETRY environment variable for external manual override of maximum retry attempts
+- Updated dependencies (gems)
+- Do not log params if JSON parsing fails
+
 ## 0.6.46
 - Fixed transfer_label_types, use target client for lookup
 

data/gooddata.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'redcarpet', '~> 3.1', '>= 3.1.1' if RUBY_PLATFORM != 'java'
   s.add_development_dependency 'rspec', '~> 3.4', '>= 3.4.0'
   s.add_development_dependency 'rspec-expectations', '~> 3.4', '>= 3.4.0'
-  s.add_development_dependency 'rubocop', '~> 0.34', '>= 0.34.0'
+  s.add_development_dependency 'rubocop', '~> 0.45', '>= 0.45.0'
   s.add_development_dependency 'ruby-debug-ide', '~> 0.4' if !ENV['TRAVIS_BUILD'] && RUBY_VERSION >= '2.0.0'
   s.add_development_dependency 'simplecov', '~> 0.10', '>= 0.10.0'
   s.add_development_dependency 'webmock', '~> 1.21', '>= 1.21.0'

data/lib/gooddata/goodzilla/goodzilla.rb

@@ -146,10 +146,10 @@ module GoodData
         ids = GoodData::SmallGoodZilla.get_ids(metric)
         interpolated_ids = ids.zip(Array(interpolate_ids(options, ids)))
 
-        metric = interpolated[:facts].reduce(metric) { |a, e| a.sub("#\"#{e[0]}\"", "[#{e[1]}]") }
-        metric = interpolated[:attributes].reduce(metric) { |a, e| a.sub("@\"#{e[0]}\"", "[#{e[1]}]") }
-        metric = interpolated[:metrics].reduce(metric) { |a, e| a.sub("?\"#{e[0]}\"", "[#{e[1]}]") }
-        metric = interpolated_ids.reduce(metric) { |a, e| a.gsub("![#{e[0]}]", "[#{e[1]}]") }
+        metric = interpolated[:facts].reduce(metric) { |acc, elem| acc.sub("#\"#{elem[0]}\"", "[#{elem[1]}]") }
+        metric = interpolated[:attributes].reduce(metric) { |acc, elem| acc.sub("@\"#{elem[0]}\"", "[#{elem[1]}]") }
+        metric = interpolated[:metrics].reduce(metric) { |acc, elem| acc.sub("?\"#{elem[0]}\"", "[#{elem[1]}]") }
+        metric = interpolated_ids.reduce(metric) { |acc, elem| acc.gsub("![#{elem[0]}]", "[#{elem[1]}]") }
         metric
       end
 

data/lib/gooddata/helpers/global_helpers_params.rb

@@ -70,7 +70,7 @@ module GoodData
           parsed_data_params = JSON.parse(data_params)
           parsed_hidden_data_params = JSON.parse(hidden_data_params)
         rescue JSON::ParserError => e
-          raise e.class, "Error reading json from '#{key}' or '#{hidden_key}' in params #{params}\n #{e.message}"
+          raise e.class, "Error reading json from '#{key}' or '#{hidden_key}', reason: #{e.message}"
         end
 
         # Add the nil on ENCODED_HIDDEN_PARAMS_KEY

data/lib/gooddata/models/blueprint/project_blueprint.rb

@@ -308,7 +308,7 @@ module GoodData
       #
       # @return [Array<Hash>]
       def attributes
-        datasets.reduce([]) { |a, e| a.concat(e.attributes) }
+        datasets.reduce([]) { |acc, elem| acc.concat(elem.attributes) }
       end
 
       # Returns list of attributes and anchors from all the datasets in a blueprint
@@ -718,8 +718,8 @@ module GoodData
       def validate
         errors = []
         errors.concat validate_references
-        errors.concat datasets.reduce([]) { |a, e| a.concat(e.validate) }
-        errors.concat datasets.reduce([]) { |a, e| a.concat(e.validate_gd_data_type_errors) }
+        errors.concat datasets.reduce([]) { |acc, elem| acc.concat(elem.validate) }
+        errors.concat datasets.reduce([]) { |acc, elem| acc.concat(elem.validate_gd_data_type_errors) }
         errors
       rescue
         raise GoodData::ValidationError

data/lib/gooddata/models/metadata/label.rb

@@ -51,7 +51,7 @@ module GoodData
           offset: 0,
           order: 'asc'
         }
-        params = default_params.merge(url_or_params).map { |x, v| "#{x}=#{CGI.escape(v.to_s)}" }.reduce { |a, e| "#{a}&#{e}" }
+        params = default_params.merge(url_or_params).map { |x, v| "#{x}=#{CGI.escape(v.to_s)}" }.reduce { |acc, elem| "#{acc}&#{elem}" }
         final_url = "#{uri}/validElements?#{params}"
       end
 

data/lib/gooddata/models/project_creator.rb

@@ -63,7 +63,7 @@ module GoodData
                 next
               end
             end
-            if (errors.length > 0) && (errors.length == replaced_maqls.length)
+            if (!errors.empty?) && (errors.length == replaced_maqls.length)
               messages = errors.map { |e| GoodData::Helpers.interpolate_error_messages(e.data['wTaskStatus']['messages']) }
               fail "Unable to migrate LDM, reason(s): \n #{messages.join("\n")}"
             end

data/lib/gooddata/rest/client.rb

@@ -329,7 +329,7 @@ module GoodData
             fail ExecutionLimitExceeded, "The time limit #{time_limit} secs for polling on #{link} is over"
           end
           sleep sleep_interval
-          GoodData::Rest::Client.retryable(:tries => 3, :refresh_token => proc { connection.refresh_token }) do
+          GoodData::Rest::Client.retryable(:tries => ConnectionHelper::GD_MAX_RETRY, :refresh_token => proc { connection.refresh_token }) do
             response = get(link, process: process)
           end
         end

data/lib/gooddata/rest/connection.rb

@@ -288,7 +288,7 @@ module GoodData
           end
         end
 
-        GoodData::Rest::Connection.retryable(:tries => 2, :refresh_token => proc { refresh_token }) do
+        GoodData::Rest::Connection.retryable(:tries => ConnectionHelper::GD_MAX_RETRY, :refresh_token => proc { refresh_token }) do
           if where.is_a?(IO) || where.is_a?(StringIO)
             b.call(where)
           else
@@ -486,7 +486,7 @@ module GoodData
           RestClient::Request.execute(raw)
         end
 
-        GoodData::Rest::Connection.retryable(:tries => 2, :refresh_token => proc { refresh_token }) do
+        GoodData::Rest::Connection.retryable(:tries => ConnectionHelper::GD_MAX_RETRY, :refresh_token => proc { refresh_token }) do
           b.call
         end
       end
@@ -543,7 +543,7 @@ module GoodData
       end
 
       def process_response(options = {}, &block)
-        retries = options[:tries] || 3
+        retries = options[:tries] || ConnectionHelper::GD_MAX_RETRY
         process = options[:process]
         dont_reauth = options[:dont_reauth]
         options = options.reject { |k, _| [:process, :dont_reauth].include?(k) }
@@ -594,7 +594,7 @@ module GoodData
       end
 
       def scrub_params(params, keys)
-        keys = keys.reduce([]) { |a, e| a.concat([e.to_s, e.to_sym]) }
+        keys = keys.reduce([]) { |acc, elem| acc.concat([elem.to_s, elem.to_sym]) }
 
         new_params = GoodData::Helpers.deep_dup(params)
         GoodData::Helpers.hash_dfs(new_params) do |k, _key|
@@ -700,7 +700,7 @@ module GoodData
         method = :get
         GoodData.logger.debug "#{method}: #{url}"
 
-        GoodData::Rest::Connection.retryable(:tries => 2, :refresh_token => proc { refresh_token }) do
+        GoodData::Rest::Connection.retryable(:tries => ConnectionHelper::GD_MAX_RETRY, :refresh_token => proc { refresh_token }) do
           raw = {
             :method => method,
             :url => url,

data/lib/gooddata/version.rb

@@ -6,7 +6,7 @@
 
 # GoodData Module
 module GoodData
-  VERSION = '0.6.46'
+  VERSION = '0.6.47'
 
   class << self
     # Version

data/spec/environment/default.rb

@@ -12,6 +12,7 @@ module GoodData
   module Environment
     module ConnectionHelper
       set_const :GD_PROJECT_TOKEN, ENV["GD_PROJECT_TOKEN"]
+      set_const :GD_MAX_RETRY, (ENV["GD_MAX_RETRY"] && ENV["GD_MAX_RETRY"].to_i) || 3
 
       set_const :DEFAULT_USERNAME, "tomas.korcak+gem_tester@gooddata.com"
       set_const :TEST_USERNAME, "john.doe@gooddata.com"

data/spec/unit/rest/polling_spec.rb

@@ -75,7 +75,7 @@ describe 'Behavior during polling and retries' do
 
   it 'should make 1 additional request when hitting 500' do
     expect do
-      @client.get('/internal_error')
+      @client.get('/internal_error', :tries => 3)
     end.to raise_error(RestClient::InternalServerError)
     expect(a_request(:get, "#{@server}/internal_error")).to have_been_made.times(3)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gooddata
 version: !ruby/object:Gem::Version
-  version: 0.6.46
+  version: 0.6.47
 platform: ruby
 authors:
 - Pavel Kolesnikov
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-21 00:00:00.000000000 Z
+date: 2016-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -173,20 +173,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.34'
+        version: '0.45'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.34.0
+        version: 0.45.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.34'
+        version: '0.45'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.34.0
+        version: 0.45.0
 - !ruby/object:Gem::Dependency
   name: ruby-debug-ide
   requirement: !ruby/object:Gem::Requirement