gooddata 0.6.11 → 0.6.12

data/lib/gooddata/models/execution.rb

@@ -66,6 +66,17 @@ module GoodData
       @json['execution']['links']['self'] if @json && @json['execution'] && @json['execution']['links']
     end
 
+    # Wait for execution result, status different than RUNNING or SCHEDULED
+    #
+    # @return [GoodData::Execution] Execution result
+    def wait_for_result
+      res = client.poll_on_response(uri) do |body|
+        body['execution'] && (body['execution']['status'] == 'RUNNING' || body['execution']['status'] == 'SCHEDULED')
+      end
+      @json = res
+      self
+    end
+
     # Compares two executions - based on their URI
     def ==(other)
       other.respond_to?(:uri) && other.uri == uri && other.respond_to?(:to_hash) && other.to_hash == to_hash

data/lib/gooddata/models/from_wire.rb

@@ -136,14 +136,14 @@ module GoodData
           if ref =~ /^dataset\./
             {
               :type => :reference,
-              :name => ref.gsub('dataset.', ''),
-              :dataset => ref.gsub('dataset.', '')
+              :name => ref.gsub(/^dataset\./, ''),
+              :dataset => ref.gsub(/^dataset\./, '')
             }
           else
             {
               :type => :date,
-              :name => ref.gsub('dataset.', ''),
-              :dataset => ref.gsub('dataset.', '')
+              :name => ref.gsub(/^dataset\./, ''),
+              :dataset => ref.gsub(/^dataset\./, '')
             }
           end
         end

data/lib/gooddata/models/invitation.rb

@@ -8,11 +8,6 @@ module GoodData
       @json = json
     end
 
-    def author
-      data = client.get @json['invitation']['meta']['author']
-      client.create GoodData::AccountSettings, data
-    end
-
     def contributor
       data = client.get @json['invitation']['meta']['contributor']
       client.create GoodData::AccountSettings, data

data/lib/gooddata/models/membership.rb

@@ -28,67 +28,36 @@ module GoodData
       # @param obj [GoodData::User] Object to be modified
       # @param changes [Hash] Hash with modifications
       # @return [GoodData::User] Modified object
-      def apply(obj, changes)
-        changes.each do |param, val|
-          next unless ASSIGNABLE_MEMBERS.include? param
-          obj.send("#{param}=", val)
-        end
-        obj
-      end
-
-      # Gets hash representing diff of users
-      #
-      # @param user1 [GoodData::User] Original user
-      # @param user2 [GoodData::User] User to compare with
-      # @return [Hash] Hash representing diff
-      def diff(user1, user2)
-        res = {}
-        ASSIGNABLE_MEMBERS.each do |k|
-          l_value = user1.send("#{k}")
-          r_value = user2.send("#{k}")
-          res[k] = r_value if l_value != r_value
-        end
-        res
-      end
-
-      def diff_list(list1, list2)
-        tmp = Hash[list1.map { |v| [v.email, v] }]
-
-        res = {
-          :added => [],
-          :removed => [],
-          :changed => [],
-          :same => []
+      # def apply(obj, changes)
+      #   changes.each do |param, val|
+      #     next unless ASSIGNABLE_MEMBERS.include? param
+      #     obj.send("#{param}=", val)
+      #   end
+      #   obj
+      # end
+      def create(data, options = { client: GoodData.connection })
+        c = client(options)
+        json = {
+          'user' => {
+            'content' => {
+              'email' => data[:email] || data[:login],
+              'login' => data[:login],
+              'firstname' => data[:first_name],
+              'lastname' => data[:last_name],
+              'userRoles' => ['editor'],
+              'password' => data[:password],
+              'domain' => data[:domain],
+              # And following lines are even much more ugly hack
+              # 'authentication_modes' => ['sso', 'password']
+            },
+            'meta' => {}
+          }
         }
+        c.create(self, json)
+      end
 
-        list2.each do |user_new|
-          user_existing = tmp[user_new.email]
-          if user_existing.nil?
-            res[:added] << user_new
-            next
-          end
-
-          if user_existing != user_new
-            diff = self.diff(user_existing, user_new)
-            res[:changed] << {
-              :user => user_existing,
-              :diff => diff
-            }
-          else
-            res[:same] << user_existing
-          end
-        end
-
-        tmp = Hash[list2.map { |v| [v.email, v] }]
-        list1.each do |user_existing|
-          user_new = tmp[user_existing.email]
-          if user_new.nil?
-            res[:removed] << user_existing
-            next
-          end
-        end
-
-        res
+      def diff_list(list_1, list_2)
+        GoodData::Helpers.diff(list_1, list_2, key: :login)
       end
     end
 
@@ -101,13 +70,15 @@ module GoodData
     # @param right [GoodData::User] Project to compare with
     # @return [Boolean] True if same else false
     def ==(other)
-      res = true
-      ASSIGNABLE_MEMBERS.each do |k|
-        l_val = send("#{k}")
-        r_val = other.send("#{k}")
-        res = false if l_val != r_val
-      end
-      res
+      return false unless other.respond_to?(:to_hash)
+      to_hash == other.to_hash
+      # res = true
+      # ASSIGNABLE_MEMBERS.each do |k|
+      #   l_val = send("#{k}")
+      #   r_val = other.send("#{k}")
+      #   res = false if l_val != r_val
+      # end
+      # res
     end
 
     # Checks objects for non-equality
@@ -122,18 +93,9 @@ module GoodData
     #
     # @param changes [Hash] Hash with modifications
     # @return [GoodData::User] Modified object
-    def apply(changes)
-      GoodData::User.apply(self, changes)
-    end
-
-    # Gets author (person who created)  of this object
-    #
-    # @return [String] Author
-    def author
-      url = @json['user']['meta']['author']
-      data = client.get url
-      client.factory.create(GoodData::Membership, data)
-    end
+    # def apply(changes)
+    #   GoodData::User.apply(self, changes)
+    # end
 
     # Gets the contributor
     #
@@ -151,6 +113,13 @@ module GoodData
       Time.parse(@json['user']['meta']['created'])
     end
 
+    # Is the member deleted?
+    #
+    # @return [Boolean] true if he is deleted
+    def deleted?
+      !(login =~ /^deleted-/).nil?
+    end
+
     # Gets hash representing diff of users
     #
     # @param user [GoodData::User] Another profile to compare with
@@ -275,11 +244,11 @@ module GoodData
       @json['user']['links']['self']
     end
 
-    # Gets project which this membership relates to
-    def project
-      raw = client.get project_url
-      client.factory.create(GoodData::Project, raw)
-    end
+    # # Gets project which this membership relates to
+    # def project
+    #   raw = client.get project_url
+    #   client.factory.create(GoodData::Project, raw)
+    # end
 
     # Gets project id
     def project_id
@@ -304,15 +273,19 @@ module GoodData
     end
 
     # Gets first role
+    #
+    # @return [GoodData::ProjectRole] Array of project roles
     def role
-      roles.first
+      roles && roles.first
     end
 
     # Gets the project roles of user
     #
     # @return [Array<GoodData::ProjectRole>] Array of project roles
     def roles
-      tmp = client.get @json['user']['links']['roles']
+      roles_link = GoodData::Helpers.get_path(@json, %w(user links roles))
+      return unless roles_link
+      tmp = client.get roles_link
       tmp['associatedRoles']['roles'].pmap do |role_uri|
         role = client.get role_uri
         client.factory.create(GoodData::ProjectRole, role)
@@ -358,21 +331,75 @@ module GoodData
     #
     # @return [String] Object URI
     def uri
-      @json['user']['links']['self']
+      links['self']
     end
 
     # Enables membership
     #
-    # @return result from post execution
+    # @return [GoodData::Membership] returns self
     def enable
-      self.status = 'enabled'
+      self.status = 'ENABLED'
+      self
+    end
+
+    # Is the member enabled?
+    #
+    # @return [Boolean] true if it is enabled
+    def enabled?
+      status == 'ENABLED'
     end
 
     # Disables membership
     #
-    # @return result from post execution
+    # @return [GoodData::Membership] returns self
     def disable
-      self.status = 'disabled'
+      self.status = 'DISABLED'
+      self
+    end
+
+    # Is the member enabled?
+    #
+    # @return [Boolean] true if it is disabled
+    def disabled?
+      !enabled?
+    end
+
+    def data
+      data = @json || {}
+      data['user'] || {}
+    end
+
+    def name
+      (first_name || '') + (last_name || '')
+    end
+
+    def meta
+      data['meta'] || {}
+    end
+
+    def links
+      data['links'] || {}
+    end
+
+    def content
+      data['content'] || {}
+    end
+
+    def to_hash
+      tmp = content.merge(meta).merge('uri' => uri).symbolize_keys
+      [
+        [:userRoles, :role],
+        [:companyName, :company_name],
+        [:phoneNumber, :phone_number],
+        [:firstname, :first_name],
+        [:lastname, :last_name],
+        [:authenticationModes, :authentication_modes]
+      ].each do |vals|
+        wire, rb = vals
+        tmp[rb] = tmp[wire]
+        tmp.delete(wire)
+      end
+      tmp
     end
 
     private
@@ -391,7 +418,10 @@ module GoodData
         }
       }
 
-      @json = client.post("/gdc/projects/#{project_id}/users", payload)
+      res = client.post("/gdc/projects/#{project_id}/users", payload)
+      fail 'Update failed' unless res['projectUsersUpdateResult']['failed'].empty?
+      @json['user']['content']['status'] = new_status.to_s.upcase
+      self
     end
   end
 end

data/lib/gooddata/models/metadata.rb

@@ -42,7 +42,6 @@ module GoodData
       if saved? # rubocop:disable Style/GuardClause
         client.delete(uri)
         meta.delete('uri')
-        # ["uri"] = nil
       end
     end
 
@@ -68,7 +67,7 @@ module GoodData
     end
 
     def project
-      @project ||= Project[uri.gsub(%r{\/obj\/\d+$}, ''), :client => client, :project => project]
+      @project ||= Project[uri.gsub(%r{\/obj\/\d+$}, ''), :client => client]
     end
 
     def saved?

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

@@ -41,6 +41,13 @@ module GoodData
     end
     alias_method :labels, :display_forms
 
+    def dimension
+      uri = content['dimension']
+      return nil if uri.nil?
+
+      GoodData::Dimension[uri, client: client, project: project]
+    end
+
     # Returns the first display form which is the primary one
     # @return [GoodData::Label] Primary label
     def primary_display_form

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

@@ -89,7 +89,7 @@ module GoodData
       tab = options[:tab] || ''
 
       req_uri = "/gdc/projects/#{GoodData.project.pid}/clientexport"
-      x = GoodData.post(req_uri, 'clientExport' => { 'url' => "https://secure.gooddata.com/dashboard.html#project=#{GoodData.project.uri}&dashboard=#{uri}&tab=#{tab}&export=1", 'name' => title })
+      x = client.post(req_uri, 'clientExport' => { 'url' => "https://secure.gooddata.com/dashboard.html#project=#{GoodData.project.uri}&dashboard=#{uri}&tab=#{tab}&export=1", 'name' => title })
       GoodData.poll_on_code(x['asyncTask']['link']['poll'], process: false)
     end
 

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

@@ -0,0 +1,52 @@
+# encoding: UTF-8
+
+require_relative '../metadata'
+require_relative '../../mixins/is_dimension'
+require_relative 'metadata'
+
+module GoodData
+  class Dimension < GoodData::MdObject
+    root_key :dimension
+
+    include GoodData::Mixin::IsDimension
+
+    class << self
+      # Method intended to get all objects of that type in a specified project
+      #
+      # @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 })
+        query('dimensions', Dimension, options)
+      end
+
+      # Returns a Project object identified by given string
+      # The following identifiers are accepted
+      #  - /gdc/md/<id>
+      #  - /gdc/projects/<id>
+      #  - <id>
+      #
+      def [](id, opts = { client: GoodData.connection })
+        return id if id.instance_of?(GoodData::Dimension) || id.respond_to?(:dimension?) && id.dimension?
+
+        if id == :all
+          Dimension.all({ client: GoodData.connection }.merge(opts))
+        else
+          uri = id
+
+          c = client(opts)
+          fail ArgumentError, 'No :client specified' if c.nil?
+
+          response = c.get(uri)
+          c.factory.create(Dimension, response)
+        end
+      end
+    end
+
+    def attributes
+      content['attributes'].map do |attribute|
+        client.create(Attribute, { 'attribute' => attribute }, project: project)
+      end
+    end
+  end
+end

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

@@ -13,7 +13,7 @@ module GoodData
     include GoodData::Mixin::IsFact
 
     # TODO: verify that we have all (which we do not right now)
-    FACT_BASE_AGGREGATIONS = [:sum, :min, :max, :avg, :median]
+    FACT_BASE_AGGREGATIONS = [:sum, :min, :max, :avg, :median, :runsum, :runmin, :runmax, :runavg, :runstdev, :runstdevp, :runvar, :runvarp, :stdev, :stdevp, :var, :varp]
 
     class << self
       # Method intended to get all objects of that type in a specified project

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

@@ -55,14 +55,28 @@ module GoodData
     # @return [Array]
     def values(options = {})
       limit = options[:limit] || 100
-      results = client.post("#{uri}/validElements?limit=#{limit}&offset=0&order=asc", {})
-      results['validElements']['items'].map do |el|
-        v = el['element']
-        {
-          :value => v['title'],
-          :uri => v['uri']
-        }
+      offset = 0
+      vals = []
+      loop do
+        results = GoodData.post("#{uri}/validElements?limit=#{limit}&offset=#{offset}&order=asc", {})
+        x = results['validElements']['items'].map do |el|
+          v = el['element']
+          {
+            :value => v['title'],
+            :uri => v['uri']
+          }
+        end
+        vals.concat(x)
+        break if vals.length < offset
+        offset += limit
       end
+      vals
+    end
+
+    def values_count(options = {})
+      limit = options[:limit] || 100
+      results = client.post("#{uri}/validElements?limit=#{limit}&offset=0&order=asc", {})
+      results['validElements']['paging']['total'].to_i
     end
 
     # Gives an attribute of current label