gooddata 0.6.19 → 0.6.20

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

@@ -54,25 +54,24 @@ module GoodData
     # @option options [Number] :limit limits the number of values to certain number. Default is 100
     # @return [Array]
     def values(options = {})
-      limit = options[:limit] || 100
-      page_limit = 100
-      offset = 0
-      vals = []
-      loop do
-        results = GoodData.post("#{uri}/validElements?limit=#{page_limit}&offset=#{offset}&order=asc", {})
-        elements = results['validElements']
-        items = elements['items'].map do |el|
-          v = el['element']
-          {
-            :value => v['title'],
-            :uri => v['uri']
-          }
+      client = client(options)
+      Enumerator.new do |y|
+        offset = options[:offset] || 0
+        page_limit = options[:limit] || 100
+        loop do
+          results = client.post("#{uri}/validElements?limit=#{page_limit}&offset=#{offset}&order=asc", {})
+          elements = results['validElements']
+          elements['items'].map do |el|
+            v = el['element']
+            y << {
+              :value => v['title'],
+              :uri => v['uri']
+            }
+          end
+          break if elements['items'].count < page_limit
+          offset += page_limit
         end
-        vals.concat(items)
-        break if vals.length > limit || vals.length == elements['paging']['total'].to_i
-        offset += page_limit
       end
-      vals.take(limit)
     end
 
     def values_count

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

@@ -24,7 +24,7 @@ module GoodData
       # @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 })
-        query('metrics', Metric, options)
+        query('metric', Metric, options)
       end
 
       def xcreate(metric, options = { :client => GoodData.connection, :project => GoodData.project })

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

@@ -16,7 +16,7 @@ module GoodData
       # @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 })
-        query('reports', Report, options)
+        query('report', Report, options)
       end
 
       def create(options = { :client => GoodData.connection, :project => GoodData.project })

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

@@ -17,7 +17,7 @@ module GoodData
       # @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 })
-        query('reportdefinition', ReportDefinition, options)
+        query('reportDefinition', ReportDefinition, options)
       end
 
       def create_metrics_part(left, top)
@@ -276,7 +276,7 @@ module GoodData
         uri_for_what = for_what.respond_to?(:uri) ? for_what.uri : for_what
 
         content['grid']['metrics'] = metric_parts.map do |item|
-          item.deep_dup.tap do |i|
+          GoodData::Helpers.deep_dup(item).tap do |i|
             i['uri'].gsub!("[#{uri_what}]", "[#{uri_for_what}]")
           end
         end
@@ -284,7 +284,7 @@ module GoodData
         cols = content['grid']['columns'] || []
         content['grid']['columns'] = cols.map do |item|
           if item.is_a?(Hash)
-            item.deep_dup.tap do |i|
+            GoodData::Helpers.deep_dup(item).tap do |i|
               i['attribute']['uri'].gsub!("[#{uri_what}]", "[#{uri_for_what}]")
             end
           else
@@ -295,7 +295,7 @@ module GoodData
         rows = content['grid']['rows'] || []
         content['grid']['rows'] = rows.map do |item|
           if item.is_a?(Hash)
-            item.deep_dup.tap do |i|
+            GoodData::Helpers.deep_dup(item).tap do |i|
               i['attribute']['uri'].gsub!("[#{uri_what}]", "[#{uri_for_what}]")
             end
           else
@@ -306,7 +306,7 @@ module GoodData
         widths = content['grid']['columnWidths'] || []
         content['grid']['columnWidths'] = widths.map do |item|
           if item.is_a?(Hash)
-            item.deep_dup.tap do |i|
+            GoodData::Helpers.deep_dup(item).tap do |i|
               if i['locator'][0].key?('attributeHeaderLocator')
                 i['locator'][0]['attributeHeaderLocator']['uri'].gsub!("[#{uri_what}]", "[#{uri_for_what}]")
               end
@@ -319,7 +319,7 @@ module GoodData
         sort = content['grid']['sort']['columns'] || []
         content['grid']['sort']['columns'] = sort.map do |item|
           if item.is_a?(Hash)
-            item.deep_dup.tap do |i|
+            GoodData::Helpers.deep_dup(item).tap do |i|
               next unless i.key?('metricSort')
               next unless i['metricSort'].key?('locators')
               next unless i['metricSort']['locators'][0].key?('attributeLocator2')
@@ -336,7 +336,7 @@ module GoodData
             key = e[0]
             val = e[1]
             a[key] = val.map do |item|
-              item.deep_dup.tap do |i|
+              GoodData::Helpers.deep_dup(item).tap do |i|
                 i['uri'].gsub!("[#{uri_what}]", "[#{uri_for_what}]")
               end
             end

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

@@ -15,7 +15,7 @@ module GoodData
       # @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 })
-        query('prompts', Variable, options)
+        query('prompt', Variable, options)
       end
 
       def create(data, options = { :client => GoodData.connection, :project => GoodData.project })

data/lib/gooddata/models/model.rb

@@ -93,7 +93,7 @@ module GoodData
 
     class << self
       def title(item)
-        item[:title] || item[:id].titleize
+        item[:title] || GoodData::Helpers.titleize(item[:id])
       end
 
       def column_name(item)
@@ -222,7 +222,7 @@ module GoodData
       def merge_dataset_columns(a_schema_blueprint, b_schema_blueprint)
         a_schema_blueprint = a_schema_blueprint.to_hash
         b_schema_blueprint = b_schema_blueprint.to_hash
-        d = a_schema_blueprint.deep_dup
+        d = GoodData::Helpers.deep_dup(a_schema_blueprint)
         d[:columns] = d[:columns] + b_schema_blueprint[:columns]
         d[:columns].uniq!
         columns_that_failed_to_merge = d[:columns].group_by { |x| [:reference, :date].include?(x[:type]) ? x[:dataset] : x[:id] }.map { |k, v| [k, v.count, v] }.select { |x| x[1] > 1 }

data/lib/gooddata/models/profile.rb

@@ -79,7 +79,7 @@ module GoodData
       end
 
       def create_object(attributes)
-        json = EMPTY_OBJECT.deep_dup
+        json = GoodData::Helpers.deep_dup(EMPTY_OBJECT)
         json['accountSetting']['links']['self'] = attributes[:uri] if attributes[:uri]
         res = client.create(GoodData::Profile, json)
 
@@ -393,7 +393,7 @@ module GoodData
     end
 
     def to_hash
-      tmp = content.merge(uri: uri).symbolize_keys
+      tmp = GoodData::Helpers.symbolize_keys(content.merge(uri: uri))
       [
         [:companyName, :company],
         [:phoneNumber, :phone],

data/lib/gooddata/models/project.rb

@@ -9,6 +9,8 @@ require 'zip'
 
 require_relative '../exceptions/no_project_error'
 
+require_relative '../helpers/auth_helpers'
+
 require_relative '../rest/resource'
 require_relative '../mixins/author'
 require_relative '../mixins/contributor'
@@ -25,6 +27,7 @@ module GoodData
     PROJECT_PATH = '/gdc/projects/%s'
     SLIS_PATH = '/ldm/singleloadinterface'
     DEFAULT_INVITE_MESSAGE = 'Join us!'
+    DEFAULT_ENVIRONMENT = 'PRODUCTION'
 
     EMPTY_OBJECT = {
       'project' => {
@@ -34,7 +37,7 @@ module GoodData
         'content' => {
           'guidedNavigation' => 1,
           'driver' => 'Pg',
-          'environment' => 'PRODUCTION'
+          'environment' => GoodData::Helpers::AuthHelper.read_environment
         }
       }
     }
@@ -87,7 +90,7 @@ module GoodData
 
       def create_object(data = {})
         c = client(data)
-        new_data = EMPTY_OBJECT.deep_dup.tap do |d|
+        new_data = GoodData::Helpers.deep_dup(EMPTY_OBJECT).tap do |d|
           d['project']['meta']['title'] = data[:title]
           d['project']['meta']['summary'] = data[:summary] if data[:summary]
           d['project']['meta']['projectTemplate'] = data[:template] if data[:template]
@@ -114,6 +117,7 @@ module GoodData
         c = client(opts)
         fail ArgumentError, 'No :client specified' if c.nil?
 
+        opts = { :auth_token => Helpers::AuthHelper.read_token }.merge(opts)
         auth_token = opts[:auth_token] || opts[:token]
         fail ArgumentError, 'You have to provide your token for creating projects as :auth_token parameter' if auth_token.nil? || auth_token.empty?
 
@@ -1011,7 +1015,7 @@ module GoodData
 
     # Saves project
     def save
-      data_to_send = raw_data.deep_dup
+      data_to_send = GoodData::Helpers.deep_dup(raw_data)
       data_to_send['project']['content'].delete('cluster')
       data_to_send['project']['content'].delete('isPublic')
       data_to_send['project']['content'].delete('state')
@@ -1094,27 +1098,21 @@ module GoodData
     #
     #
     # @return [Array<GoodData::User>] List of users
-    def users(opts = { offset: 0, limit: 1_000 })
-      result = []
-
-      # TODO: @korczis, review this after WA-3953 get fixed
-      offset = 0 || opts[:offset]
-      uri = "/gdc/projects/#{pid}/users?offset=#{offset}&limit=#{opts[:limit]}"
-      loop do
-        break unless uri
-        tmp = client(opts).get(uri)
-        tmp['users'].each do |user|
-          result << client.factory.create(GoodData::Membership, user, project: self)
-        end
-        offset += opts[:limit]
-        if tmp['users'].length == opts[:limit]
-          uri = "/gdc/projects/#{pid}/users?offset=#{offset}&limit=#{opts[:limit]}"
-        else
-          uri = nil
+    def users(opts = {})
+      client = client(opts)
+      Enumerator.new do |y|
+        offset = opts[:offset] || 0
+        limit = opts[:limit] || 1_000
+        loop do
+          tmp = client.get("/gdc/projects/#{pid}/users", params: { offset: offset, limit: limit })
+          tmp['users'].each do |user_data|
+            user = client.create(GoodData::Membership, user_data, project: self)
+            y << user if opts[:all] || user.enabled?
+          end
+          break if tmp['users'].count < limit
+          offset += limit
         end
       end
-
-      opts[:all] ? result : result.select(&:enabled?).reject(&:deleted?)
     end
 
     alias_method :members, :users
@@ -1137,7 +1135,7 @@ module GoodData
     def import_users(new_users, options = {})
       domain = options[:domain]
       role_list = roles
-      users_list = users(all: true, offset: 0, limit: 1_000)
+      users_list = users(all: true)
       new_users = new_users.map { |x| (x.is_a?(Hash) && x[:user] && x[:user].to_hash.merge(role: x[:role])) || x.to_hash }
 
       GoodData.logger.warn("Importing users to project (#{pid})")

data/lib/gooddata/models/project_role.rb

@@ -36,10 +36,10 @@ module GoodData
         d[:title] = data[:title]
         d[:summary] = data[:summary]
       end
-      new_data = EMPTY_OBJECT.deep_dup.tap do |d|
+      new_data = GoodData::Helpers.deep_dup(EMPTY_OBJECT).tap do |d|
         d['projectRole']['links']['self'] = data[:uri] if data[:uri]
-        d['projectRole']['meta'] = d['projectRole']['meta'].merge(meta_data.stringify_keys)
-        d['projectRole']['permissions'] = d['projectRole']['permissions'].merge((data[:permissions] || {}).stringify_keys)
+        d['projectRole']['meta'] = d['projectRole']['meta'].merge(GoodData::Helpers.stringify_keys(meta_data))
+        d['projectRole']['permissions'] = d['projectRole']['permissions'].merge(GoodData::Helpers.stringify_keys(data[:permissions] || {}))
       end
       new(new_data)
     end

data/lib/gooddata/models/schedule.rb

@@ -101,7 +101,7 @@ module GoodData
           :reschedule => 0
         }
 
-        schedule = c.create(GoodData::Schedule, GoodData::Helpers.stringify_keys_deep!(SCHEDULE_TEMPLATE.deep_dup), client: c, project: p)
+        schedule = c.create(GoodData::Schedule, GoodData::Helpers.deep_stringify_keys(GoodData::Helpers.deep_dup(SCHEDULE_TEMPLATE)), client: c, project: p)
 
         schedule.name = options[:name]
         schedule.hidden_params = options[:hidden_params]
@@ -119,7 +119,7 @@ module GoodData
     # @param json [Object] Raw JSON
     # @return [GoodData::Schedule] New GoodData::Schedule instance
     def initialize(json)
-      json = GoodData::Helpers.stringify_keys_deep!(json)
+      json = GoodData::Helpers.deep_stringify_keys(json)
       super
       GoodData::Helpers.decode_params(json['schedule']['params'] || {})
       GoodData::Helpers.decode_params(json['schedule']['hiddenParams'] || {})
@@ -179,7 +179,8 @@ module GoodData
     # @param [Hash] opts execution options.
     # @option opts [Boolean] :wait Wait for execution result
     # @return [Object] Raw Response
-    def execute(opts = { :wait => true })
+    def execute(opts = {})
+      opts =  { :wait => true }.merge(opts)
       data = {
         :execution => {}
       }
@@ -187,7 +188,7 @@ module GoodData
       execution = client.create(GoodData::Execution, res, client: client, project: project)
 
       return execution unless opts[:wait]
-      execution.wait_for_result
+      execution.wait_for_result(opts)
     end
 
     # Returns execution URL
@@ -265,6 +266,13 @@ module GoodData
       @dirty = true
     end
 
+    # Returns execution process related to this schedule
+    #
+    # @return [GoodData::Process] Process ID
+    def process
+      project.processes(process_id)
+    end
+
     # Returns execution process ID
     #
     # @return [String] Process ID
@@ -398,6 +406,8 @@ module GoodData
 
     def schedule_type=(type)
       json['schedule']['type'] = type
+      @dirty = true
+      self
     end
 
     def trigger_id
@@ -406,6 +416,8 @@ module GoodData
 
     def trigger_id=(a_trigger)
       json['schedule']['triggerScheduleId'] = a_trigger
+      @dirty = true
+      self
     end
 
     def name
@@ -414,6 +426,8 @@ module GoodData
 
     def name=(name)
       json['schedule']['name'] = name
+      @dirty = true
+      self
     end
 
     def set_trigger(trigger) # rubocop:disable Style/AccessorMethodName

data/lib/gooddata/models/user_filters/mandatory_user_filter.rb

@@ -16,7 +16,7 @@ module GoodData
       def all(options = { client: GoodData.connection, project: GoodData.project })
         c = client(options)
         project = options[:project]
-        vars = c.get(project.md['query'] + '/userfilters/')['query']['entries']
+        filters = query('userFilter', nil, options)
         count = 10_000
         offset = 0
         user_lookup = {}
@@ -30,20 +30,17 @@ module GoodData
           break if result['userFilters']['length'] < offset
           offset += count
         end
-        vars.each_slice(100).mapcat do |batch|
-          batch.pmap do |a|
-            uri = a['link']
-            data = c.get(uri)
-            payload = {
-              'expression' => data['userFilter']['content']['expression'],
-              'related' => user_lookup[a['link']],
-              'level' => :user,
-              'type'  => :filter,
-              'uri'   => a['link']
-            }
-            c.create(GoodData::MandatoryUserFilter, payload, project: project)
-          end
+        mufs = filters.map do |filter_data|
+          payload = {
+            'expression' => filter_data['userFilter']['content']['expression'],
+            'related' => user_lookup[filter_data['userFilter']['meta']['uri']],
+            'level' => :user,
+            'type'  => :filter,
+            'uri'   => filter_data['userFilter']['meta']['uri']
+          }
+          c.create(GoodData::MandatoryUserFilter, payload, project: project)
         end
+        mufs.enum_for
       end
 
       def count(options = { client: GoodData.connection, project: GoodData.project })
@@ -69,7 +66,7 @@ module GoodData
         }
       }
       res = client.post(project.md['obj'], data)
-      @json['uri'] = res['uri']
+      @json[:uri] = res['uri']
     end
   end
 end

data/lib/gooddata/models/user_filters/user_filter.rb

@@ -4,7 +4,7 @@ module GoodData
   class UserFilter < GoodData::MdObject
     def initialize(data)
       @dirty = false
-      @json = data
+      @json = GoodData::Helpers.symbolize_keys(data)
     end
 
     def ==(other)
@@ -20,7 +20,7 @@ module GoodData
     #
     # @return [String] Uri of related object
     def related_uri
-      @json['related']
+      @json[:related]
     end
 
     # Returns the the object of this filter is related to. It can be either project or a user
@@ -35,7 +35,7 @@ module GoodData
     #
     # @return [GoodData::Project | GoodData::Profile] Related object
     def variable
-      uri = @json['prompt']
+      uri = @json[:prompt]
       GoodData::Variable[uri, client: client, project: project]
     end
 
@@ -46,14 +46,14 @@ module GoodData
     #
     # @return [Symbol] level on which this filter will be applied
     def level
-      @json['level'].to_sym
+      @json[:level].to_sym
     end
 
     # Returns the MAQL expression of the filter
     #
     # @return [String] MAQL expression
     def expression
-      @json['expression']
+      @json[:expression]
     end
 
     # Allows to set the MAQL expression of the filter
@@ -62,21 +62,21 @@ module GoodData
     # @return [String] MAQL expression
     def expression=(expression)
       @dirty = true
-      @json['expression'] = expression
+      @json[:expression] = expression
     end
 
     # Gives you URI of the filter
     #
     # @return [String]
     def uri
-      @json['uri']
+      @json[:uri]
     end
 
     # Allows to set URI of the filter
     #
     # @return [String]
     def uri=(uri)
-      @json['uri'] = uri
+      @json[:uri] = uri
     end
 
     # Returns pretty version of the expression