gooddata 0.6.43 → 0.6.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75045179773aed8468c7f91efed78c02acd931ba
-  data.tar.gz: 88f27665f4934752bd0de316aeb2680ad8d3e22a
+  metadata.gz: 13caeda48d2131a8b475b6f40a499a4021781b9d
+  data.tar.gz: 3ae2f5d7baccbebc38f6b67ad36b0b84d534e8af
 SHA512:
-  metadata.gz: bed8c32eb8cb93dde99409c46353b35204374b4f38a482a80f5da9b70d73af8f2b2c879d15aebfcf617fe5a999bcc1bee861567289bc36befd5d073f0d1bddc1
-  data.tar.gz: 91b609b51dca26757d34d435c054a7e3936aa847a93dc17e388985b998a44917222c290784a2e09fe87e290de278a828ec3f7a369335721316fca59d3072f7f0
+  metadata.gz: 1e8db72abb19850d4586c8f689bedb987ab6c48c8ea03bbce232192d46c0a331f37c9c30847e069446ac9be9479322e5b7eca348d7bee16592db8e8ae142b347
+  data.tar.gz: 12d7328f77bdb39ea6bc950f372dd67b1e0ffc7e6c2c655722cb05532961275814f1c9b92dae324c5eb25fc8820ff9b5922c77e07187da632042dcbc8844d9f4

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # GoodData Ruby SDK Changelog
 
+## 0.6.44
+- Fixed the tests
+- The MAQL execution now throws an exception if there is an error
+- The authentication is made via tokens not cookies
+
 ## 0.6.26
 - There is first implementation of transfering ETLs
 - Fixed bug with getting clients from domain

data/README.md

@@ -21,7 +21,7 @@ The best documentation for the GoodData API can be found using these resources:
 
 ## Install
 
-If you are using bundler. Add
+If you are using bundler, add
 
     gem "gooddata"
 
@@ -43,13 +43,13 @@ If you are using gems just
   future version unintentionally.
 * Commit, do not mess with rakefile, version, or history.
   (if you want to have your own version, that is fine but bump version in a commit by itself we can ignore when we pull)
-* run `rake test` and make sure all tests passes
-* run `rake cop` and make sure you did not introduced any new coding rules issues 
+* run `rake test` and make sure all tests pass
+* run `rake cop` and make sure you did not introduce any new coding rules issues
 * Send us a pull request. Bonus points for topic branches.
 
 ## Credits
 
-**Originaly started by**
+**Originally started by**
 
 Pavel Kolesnikov [ <mailto:pavel@gooddata.com> / [@koles](http://twitter.com/koles) ] 
 

data/lib/gooddata/commands/datasets.rb

@@ -77,7 +77,7 @@ module GoodData
 
           fail(CommandFailed, "Usage: #{$PROGRAM_NAME} <dataset config>") unless cfg_file
           config = begin
-            JSON.load open(cfg_file)
+            JSON.parse open(cfg_file)
           rescue
             raise(CommandFailed, "Error reading dataset config file '#{cfg_file}'")
           end
@@ -103,7 +103,7 @@ module GoodData
           file, cfg_file = args
           fail(CommandFailed, "Usage: #{$PROGRAM_NAME} datasets:load <file> <dataset config>") unless cfg_file
           begin
-            config = JSON.load open(cfg_file)
+            config = JSON.parse open(cfg_file)
           rescue
             raise(CommandFailed, "Error reading dataset config file '#{cfg_file}'")
           end

data/lib/gooddata/core/logging.rb

@@ -13,7 +13,7 @@ module GoodData
   DEFAULT_LOG_OUTPUT = STDOUT
   DEFAULT_LOGGER_CLASS = Logger
 
-  DEFAULT_RESTLOG_LEVEL = Logger::INFO
+  DEFAULT_RESTLOG_LEVEL = Logger::DEBUG
   DEFAULT_RESTLOG_OUTPUT = STDOUT
   DEFAULT_RESTLOGGER_CLASS = Logger
 

data/lib/gooddata/exceptions/maql_execution.rb

@@ -0,0 +1,16 @@
+# encoding: UTF-8
+#
+# Copyright (c) 2010-2015 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.
+
+module GoodData
+  class MaqlExecutionError < RuntimeError
+    attr_accessor :data
+
+    def initialize(message, data)
+      super(message || 'Execution of maql failed')
+      @data = data
+    end
+  end
+end

data/lib/gooddata/extensions/string.rb

@@ -1,7 +1,7 @@
 class String
   def to_b
     return true if self == true || self =~ (/(true|t|yes|y|1)$/i)
-    return false if self == false || self.blank? || self =~ (/(false|f|no|n|0)$/i)
-    raise ArgumentError.new("invalid value for Boolean: \"#{self}\"")
+    return false if self == false || blank? || self =~ (/(false|f|no|n|0)$/i)
+    raise ArgumentError, "invalid value for Boolean: \"#{self}\""
   end
-end
+end

data/lib/gooddata/helpers/global_helpers.rb

@@ -265,7 +265,7 @@ module GoodData
       # @param [Object] Something
       # @return [Boolean] Returns true or false if the input is 'true' or true
       def to_boolean(param)
-        (param == 'true' || param == true) ? true : false
+        param == 'true' || param == true ? true : false
       end
 
       # encrypts data with the given key. returns a binary data with the
@@ -283,10 +283,10 @@ module GoodData
         Base64.encode64(random_iv + encrypted)
       end
 
-      def decrypt(data_base_64, key)
+      def decrypt(database64, key)
         return '' if key.nil? || key.empty?
 
-        data = Base64.decode64(data_base_64)
+        data = Base64.decode64(database64)
 
         cipher = OpenSSL::Cipher::Cipher.new('aes-256-cbc')
         cipher.decrypt

data/lib/gooddata/helpers/global_helpers_params.rb

@@ -26,7 +26,7 @@ module GoodData
       def encode_params(params, data_key)
         res = {}
         nested = {}
-        core_types = [FalseClass, Fixnum, Float, NilClass, TrueClass, String]
+        core_types = [FalseClass, Integer, Float, NilClass, TrueClass, String]
         params.each do |k, v|
           if core_types.include?(v.class)
             res[k] = v

data/lib/gooddata/lcm/lcm.rb

@@ -18,9 +18,9 @@ module GoodData
             next if !filter_on_segment.empty? && !(filter_on_segment.include?(segment.id))
             p = client.project
             begin
-              p.create_users(migration_spec[:technical_user].map { |u| {login: u, role: 'admin'} })
+              p.create_users(migration_spec[:technical_user].map { |u| { login: u, role: 'admin' } })
             rescue RestClient::Exception => e
-              messages << {type: :technical_user_addition, status: 'ERROR', message: e.message}
+              messages << { type: :technical_user_addition, status: 'ERROR', message: e.message }
             end
           end
         end
@@ -91,14 +91,12 @@ module GoodData
       def transfer_label_types(source_project, targets)
         semaphore = Mutex.new
 
-        synchronized_puts = Proc.new do |*args|
-          semaphore.synchronize {
-            puts args
-          }
+        synchronized_puts = proc do |*args|
+          semaphore.synchronize { puts args }
         end
 
         # Convert to array
-        targets = [targets] unless targets.kind_of?(Array)
+        targets = [targets] unless targets.is_a?(Array)
 
         client = source_project.client
 
@@ -126,10 +124,10 @@ module GoodData
         # Transfer to target projects
         targets.peach do |target|
           transfer.peach do |identifier, type|
-            uri = GoodData::MdObject.identifier_to_uri({project: target, client: client}, identifier)
+            uri = GoodData::MdObject.identifier_to_uri({ project: target, client: client }, identifier)
             next unless uri
 
-            obj = GoodData::MdObject[uri, {project: target, client: client}]
+            obj = GoodData::MdObject[uri, { project: target, client: client }]
 
             if obj.content['type'] != type
               synchronized_puts.call "Updating #{identifier} -> #{type} in #{target.title} - #{target.uri}"

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

@@ -34,8 +34,8 @@ module GoodData
         end
       end
 
-      def respond_to?(method_sym, *arguments, &block)
-        if @data.key?(method_sym)
+      def respond_to_missing?(method_name, include_private = false)
+        if @data.key?(method_name)
           true
         else
           super

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

@@ -401,7 +401,7 @@ module GoodData
       #
       # @return [Array] array of errors
       def validate_some_anchors
-        find_columns_by_type(:anchor).count == 0 ? [{ type: :no_anchor, dataset: id }] : []
+        find_columns_by_type(:anchor).count.zero? ? [{ type: :no_anchor, dataset: id }] : []
       end
 
       # Validate if the dataset does not have more than one anchor defined.

data/lib/gooddata/models/domain.rb

@@ -391,7 +391,7 @@ module GoodData
       res = client.poll_on_code(res['asyncTask']['links']['poll'])
       failed_count = GoodData::Helpers.get_path(res, %w(clientProjectProvisioningResult failed count), 0)
       created_count = GoodData::Helpers.get_path(res, %w(clientProjectProvisioningResult created count), 0)
-      return Enumerator.new([]) if failed_count + created_count == 0
+      return Enumerator.new([]) if failed_count + created_count == 0 # rubocop:disable Style/NumericPredicate
       Enumerator.new do |y|
         uri = GoodData::Helpers.get_path(res, %w(clientProjectProvisioningResult links details))
         loop do

data/lib/gooddata/models/membership.rb

@@ -63,8 +63,8 @@ module GoodData
         c.create(self, json)
       end
 
-      def diff_list(list_1, list_2)
-        GoodData::Helpers.diff(list_1, list_2, key: :login)
+      def diff_list(list1, list2)
+        GoodData::Helpers.diff(list1, list2, key: :login)
       end
     end
 

data/lib/gooddata/models/metadata.rb

@@ -145,7 +145,7 @@ module GoodData
     def deprecated=(flag)
       if flag == '1' || flag == 1 || flag == true
         meta['deprecated'] = '1'
-      elsif flag == '0' || flag == 0 || flag == false
+      elsif flag == '0' || flag == 0 || flag == false # rubocop:disable Style/NumericPredicate
         meta['deprecated'] = '0'
       else
         fail 'You have to provide flag as either 1 or "1" or 0 or "0" or true/false'

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

@@ -53,7 +53,7 @@ module GoodData
       end
 
       def create(dashboard = {}, options = { :client => GoodData.client, :project => GoodData.project })
-        client, project = GoodData.get_client_and_project(options)
+        client, project = GoodData.get_client_and_project(GoodData::Helpers.stringify_keys(options))
 
         res = client.create(Dashboard, GoodData::Helpers.deep_dup(GoodData::Helpers.deep_stringify_keys(EMPTY_OBJECT)), :project => project)
         dashboard.each do |k, v|

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

@@ -20,27 +20,27 @@ module GoodData
       # @param options [Hash] the options hash
       # @option options [Boolean] :full if passed true the subclass can decide to pull in full objects. This is desirable from the usability POV but unfortunately has negative impact on performance so it is not the default
       # @return [Array<GoodData::MdObject> | Array<Hash>] Return the appropriate metadata objects or their representation
-      def all(options = {:client => GoodData.connection, :project => GoodData.project})
+      def all(options = { :client => GoodData.connection, :project => GoodData.project })
         query('folder', Folder, options)
       end
     end
 
     def entries
-      (self.json['folder']['content']['entries'] || []).pmap do |entry|
-        res = case self.json['folder']['content']['type'].first
-                when 'fact'
-                  GoodData::Fact[entry['link'], :client => self.client, :project => self.project]
-                when 'metric'
-                  GoodData::Metric[entry['link'], :client => self.client, :project => self.project]
-                else
-                  GoodData::MdObject[entry['link'], :client => self.client, :project => self.project]
+      (json['folder']['content']['entries'] || []).pmap do |entry|
+        res = case json['folder']['content']['type'].first
+              when 'fact'
+                GoodData::Fact[entry['link'], :client => client, :project => project]
+              when 'metric'
+                GoodData::Metric[entry['link'], :client => client, :project => project]
+              else
+                GoodData::MdObject[entry['link'], :client => client, :project => project]
               end
         res
       end
     end
 
     def type
-      self.json['folder']['content']['type'][0]
+      json['folder']['content']['type'][0]
     end
   end
 end

data/lib/gooddata/models/process.rb

@@ -94,7 +94,7 @@ module GoodData
       def deploy(path, options = { :client => GoodData.client, :project => GoodData.project })
         return deploy_brick(path, options) if path.to_s.start_with?(APP_STORE_URL)
 
-        return deploy_from_appstore(path.to_s, options) if (path.to_s =~ /\${.*}:(.*)\/(.*):\//) == 0
+        return deploy_from_appstore(path.to_s, options) if (path.to_s =~ %r{\${.*}:(.*)\/(.*):\/}) == 0 # rubocop:disable Style/NumericPredicate
 
         client, project = GoodData.get_client_and_project(options)
 
@@ -146,7 +146,7 @@ module GoodData
             if ref
               `git checkout #{ref}`
 
-              fail 'Wrong branch or tag specified!' if $CHILD_STATUS.to_i != 0
+              fail 'Wrong branch or tag specified!' if $CHILD_STATUS.to_i.nonzero?
             end
 
             opts = {
@@ -167,7 +167,7 @@ module GoodData
         end
       end
 
-      def deploy_from_appstore(path, options = {:client => GoodData.client, :project => GoodData.project})
+      def deploy_from_appstore(path, options = { :client => GoodData.client, :project => GoodData.project })
         client, project = GoodData.get_client_and_project(options)
 
         deploy_name = options[:name]
@@ -203,8 +203,6 @@ module GoodData
         puts HighLine.color("Deploy DONE #{path}", HighLine::GREEN) if verbose
         process
       end
-      
-      # ----------------------------- Private Stuff
 
       private
 

data/lib/gooddata/models/profile.rb

@@ -93,14 +93,14 @@ module GoodData
         res
       end
 
-      def diff(item_1, item_2)
-        x = diff_list([item_1], [item_2])
+      def diff(item1, item2)
+        x = diff_list([item1], [item2])
         return {} if x[:changed].empty?
         x[:changed].first[:diff]
       end
 
-      def diff_list(list_1, list_2)
-        GoodData::Helpers.diff(list_1, list_2, key: :login)
+      def diff_list(list1, list2)
+        GoodData::Helpers.diff(list1, list2, key: :login)
       end
 
       # Gets user currently logged in

data/lib/gooddata/models/project.rb

@@ -590,7 +590,13 @@ module GoodData
     # @return [Array] Result of executing MAQLs
     def delete_all_data(options = {})
       return false unless options[:force]
-      datasets.pmap(&:delete_data)
+      begin
+        datasets.pmap(&:delete_data)
+      rescue MaqlExecutionError => e
+        # This is here so that we do not throw out exceptions on synchornizing date dimensions
+        # Currently there is no reliable way how to tell it is a date dimension
+        fail e unless GoodData::Helpers.interpolate_error_messages(e.data['wTaskStatus']['messages']) == ["Internal error [handle_exception, hide_internal]."]
+      end
     end
 
     # Deletes dashboards for project
@@ -627,9 +633,13 @@ module GoodData
       response = client.post(ldm_uri, manage: { maql: maql })
       polling_uri = response['entries'].first['link']
 
-      client.poll_on_response(polling_uri, options) do |body|
+      result = client.poll_on_response(polling_uri, options) do |body|
         body && body['wTaskStatus'] && body['wTaskStatus']['status'] == 'RUNNING'
       end
+      if result['wTaskStatus']['status'] == 'ERROR'
+        fail MaqlExecutionError.new("Executionof MAQL '#{maql}' failed in project '#{pid}'", result)
+      end
+      result
     end
 
     # Helper for getting facts of a project
@@ -749,11 +759,11 @@ module GoodData
     alias_method :member, :get_user
 
     def find_by_tag(tags)
-      tags = tags.split(',').map(&:strip) unless tags.kind_of?(Array)
+      tags = tags.split(',').map(&:strip) unless tags.is_a?(Array)
 
       objects = tags.map do |tag|
-        url = "/gdc/md/#{self.pid}/tags/#{tag}"
-        res = self.client.get(url)
+        url = "/gdc/md/#{pid}/tags/#{tag}"
+        res = client.get(url)
 
         ((res || {})['entries'] || []).map do |entry|
           entry['link']
@@ -818,7 +828,7 @@ module GoodData
       puts "Inviting #{email}, role: #{role}"
 
       role_url = nil
-      if role.index('/gdc/') != 0
+      if role.index('/gdc/').nonzero?
         tmp = get_role(role)
         role_url = tmp.uri if tmp
       else
@@ -1491,7 +1501,7 @@ module GoodData
         client.post("#{uri}/users", 'users' => payload)
       end
       # this ugly line turns the hash of errors into list of errors with types so we can process them easily
-      typed_results = results.flat_map { |x| x['projectUsersUpdateResult'].flat_map { |k, v| v.map { |v_2| v_2.is_a?(String) ? { type: k.to_sym, user: v_2 } : GoodData::Helpers.symbolize_keys(v_2).merge(type: k.to_sym) } } }
+      typed_results = results.flat_map { |x| x['projectUsersUpdateResult'].flat_map { |k, v| v.map { |v2| v2.is_a?(String) ? { type: k.to_sym, user: v2 } : GoodData::Helpers.symbolize_keys(v2).merge(type: k.to_sym) } } }
       # we have to concat errors from role resolution and API result
       typed_results + (users_by_type[:failed] || [])
     end

data/lib/gooddata/models/project_creator.rb

@@ -39,58 +39,36 @@ module GoodData
         def migrate_datasets(spec, opts = {})
           opts = { client: GoodData.connection }.merge(opts)
           dry_run = opts[:dry_run]
+          replacements = opts['maql_replacements'] || opts[:maql_replacements] || {}
 
           client, project = GoodData.get_client_and_project(opts)
 
           bp = ProjectBlueprint.new(spec)
+
           uri = "/gdc/projects/#{project.pid}/model/diff?includeGrain=true"
           result = client.post(uri, bp.to_wire)
+          response = client.poll_on_code(result['asyncTask']['link']['poll'])
 
-          link = result['asyncTask']['link']['poll']
-          response = client.get(link, :process => false)
-
-          while response.code != 200
-            sleep 1
-            GoodData::Rest::Client.retryable(:tries => 3) do
-              sleep 1
-              response = client.get(link, :process => false)
-            end
-          end
-
-          response = client.get(link)
-
-          errors = []
           maqls = pick_correct_chunks(response['projectModelDiff']['updateScripts'], opts)
-          if !maqls.empty? && !dry_run
-            maqls.each_with_index do |maql, _idx|
+          replaced_maqls = apply_replacements_on_maql(maqls, replacements)
+
+          unless dry_run
+            errors = []
+            replaced_maqls.each do |replaced_maql_chunks|
               begin
-                chunks = maql[:orig]['updateScript']['maqlDdlChunks']
-                chunks.each do |chunk|
-                  # TODO: Hack the MAQL here
-                  (opts[:maql_replacements] || opts['maql_replacements'] || {}).each do |k, v|
-                    src = Regexp.new(k)
-                    dest = v
-                    chunk.gsub!(src, dest)
-                  end
-
-                  puts chunk
-
-                  result = project.execute_maql(chunk)
-                  if result['wTaskStatus']['status'] == 'ERROR'
-                    puts JSON.pretty_generate(result)
-                    fail 'Creating dataset failed'
-                  end
-                end
-                return chunks
+                replaced_maql_chunks['updateScript']['maqlDdlChunks'].each { |chunk| project.execute_maql(chunk) }
               rescue => e
-                puts "Error occured when executing MAQL, project: \"#{project.title}\" reason: \"#{e.message}\", chunks: #{chunks.inspect}"
+                puts "Error occured when executing MAQL, project: \"#{project.title}\" reason: \"#{e.message}\", chunks: #{replaced_maql_chunks.inspect}"
                 errors << e
                 next
               end
             end
-
-            fail "Unable to migrate LDM, reason(s): #{JSON.pretty_generate(errors)}" unless errors.empty?
+            if 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
           end
+          replaced_maqls
         end
 
         def migrate_reports(project, spec)
@@ -130,7 +108,7 @@ module GoodData
         end
 
         def pick_correct_chunks(chunks, opts = {})
-          preference = opts[:update_preference]
+          preference = GoodData::Helpers.symbolize_keys(opts[:update_preference] || {})
 
           # first is cascadeDrops, second is preserveData
           rules = [
@@ -150,14 +128,24 @@ module GoodData
 
           results = GoodData::Helpers.join(rules, stuff, [:cascade_drops, :preserve_data], [:cascade_drops, :preserve_data], inner: true).sort_by { |l| l[:priority] } || []
 
-          (preference || {}).each do |k, v|
+          preference.each do |k, v|
             results = results.find_all do |result|
-              sym = k.to_sym
-              !result.has_key?(sym) || result[sym] == v
+              result[k] == v
             end
           end
+          (preference.empty? ? [results.first].compact : results).map { |result| result[:orig] }
+        end
+
+        private
 
-          preference ? results : [results.first]
+        def apply_replacements_on_maql(maqls, replacements = {})
+          maqls.map do |maql|
+            GoodData::Helpers.deep_dup(maql).tap do |m|
+              m['updateScript']['maqlDdlChunks'] = m['updateScript']['maqlDdlChunks'].map do |chunk|
+                replacements.reduce(chunk) { |a, (k, v)| a.gsub(Regexp.new(k), v) }
+              end
+            end
+          end
         end
       end
     end