gooddata 0.6.7 → 0.6.8

data/lib/gooddata/models/empty_result.rb

@@ -31,5 +31,27 @@ module GoodData
     def diff(otherDataResult)
       ['empty']
     end
+
+    def [](index, options = {})
+      to_table[index]
+    end
+
+    alias_method :row, :[]
+
+    def empty?
+      true
+    end
+
+    def column(index)
+      table[index]
+    end
+
+    def include_row?(row = nil)
+      false
+    end
+
+    def include_column?(row = nil)
+      false
+    end
   end
 end

data/lib/gooddata/models/invitation.rb

@@ -1,19 +1,21 @@
 # encoding: UTF-8
 
+require_relative '../rest/rest'
+
 module GoodData
-  class Invitation
+  class Invitation < GoodData::Rest::Object
     def initialize(json)
       @json = json
     end
 
     def author
-      # TODO: Return object instead
-      @json['invitation']['meta']['author']
+      data = client.get @json['invitation']['meta']['author']
+      client.create GoodData::AccountSettings, data
     end
 
     def contributor
-      # TODO: Return object instead
-      @json['invitation']['meta']['contributor']
+      data = client.get @json['invitation']['meta']['contributor']
+      client.create GoodData::AccountSettings, data
     end
 
     def created
@@ -37,13 +39,13 @@ module GoodData
     end
 
     def profile
-      # TODO: Return object instead
-      @json['invitation']['links']['profile']
+      data = client.get @json['invitation']['links']['profile']
+      client.create GoodData::AccountSettings, data
     end
 
     def project
-      # TODO: Return object instead
-      @json['invitation']['links']['project']
+      data = client.get @json['invitation']['links']['project']
+      client.create GoodData::Project, data
     end
 
     def project_name

data/lib/gooddata/models/links.rb

@@ -1,7 +1,9 @@
 # encoding: UTF-8
 
+require_relative '../rest/object'
+
 module GoodData
-  class Links
+  class Links < GoodData::Rest::Object
     attr_reader :data
 
     def initialize(items)
@@ -20,8 +22,8 @@ module GoodData
     end
 
     def links(category, identifier = nil)
-      return Links.new(GoodData.get(self[category])) unless identifier
-      Links.new GoodData.get(get(category, identifier))
+      return Links.new(client.get(self[category])) unless identifier
+      Links.new client.get(get(category, identifier))
     end
 
     def [](category)

data/lib/gooddata/models/membership.rb

@@ -1,12 +1,15 @@
 # encoding: UTF-8
 
 require 'multi_json'
+require 'pmap'
 
 require_relative 'project'
 require_relative 'project_role'
 
+require_relative '../rest/object'
+
 module GoodData
-  class Membership
+  class Membership < GoodData::Rest::Object
     attr_reader :json
 
     ASSIGNABLE_MEMBERS = [
@@ -128,8 +131,8 @@ module GoodData
     # @return [String] Author
     def author
       url = @json['user']['meta']['author']
-      data = GoodData.get url
-      GoodData::Membership.new(data)
+      data = client.get url
+      client.factory.create(GoodData::Membership, data)
     end
 
     # Gets the contributor
@@ -137,8 +140,8 @@ module GoodData
     # @return [String] Contributor
     def contributor
       url = @json['user']['meta']['contributor']
-      data = GoodData.get url
-      GoodData::Membership.new(data)
+      data = client.get url
+      client.factory.create(GoodData::Membership, data)
     end
 
     # Gets date when created
@@ -190,7 +193,7 @@ module GoodData
     def invitations
       res = []
 
-      tmp = GoodData.get @json['user']['links']['invitations']
+      tmp = client.get @json['user']['links']['invitations']
       tmp['invitations'].each do |invitation|
         # TODO: Something is missing here
       end
@@ -239,7 +242,7 @@ module GoodData
     def permissions
       res = {}
 
-      tmp = GoodData.get @json['user']['links']['permissions']
+      tmp = client.get @json['user']['links']['permissions']
       tmp['associatedPermissions']['permissions'].each do |permission_name, permission_value|
         res[permission_name] = permission_value
       end
@@ -263,8 +266,8 @@ module GoodData
 
     # Gets profile of this membership
     def profile
-      raw = GoodData.get @json['user']['links']['self']
-      GoodData::Profile.new(raw)
+      raw = client.get @json['user']['links']['self']
+      client.factory.create(GoodData::Profile, raw)
     end
 
     # Gets URL of profile membership
@@ -274,8 +277,8 @@ module GoodData
 
     # Gets project which this membership relates to
     def project
-      raw = GoodData.get project_url
-      GoodData::Project.new(raw)
+      raw = client.get project_url
+      client.factory.create(GoodData::Project, raw)
     end
 
     # Gets project id
@@ -292,16 +295,12 @@ module GoodData
     #
     # @return [Array<GoodData::Project>] Array of projets
     def projects
-      res = []
-
-      tmp = GoodData.get @json['user']['links']['projects']
-      tmp['projects'].each do |project_meta|
+      tmp = client.get @json['user']['links']['projects']
+      tmp['projects'].map do |project_meta|
         project_uri = project_meta['project']['links']['self']
-        project = GoodData.get project_uri
-        res << GoodData::Project.new(project)
+        project = client.get project_uri
+        client.factory.create(GoodData::Project, project)
       end
-
-      res
     end
 
     # Gets first role
@@ -313,15 +312,11 @@ module GoodData
     #
     # @return [Array<GoodData::ProjectRole>] Array of project roles
     def roles
-      res = []
-
-      tmp = GoodData.get @json['user']['links']['roles']
-      tmp['associatedRoles']['roles'].each do |role_uri|
-        role = GoodData.get role_uri
-        res << GoodData::ProjectRole.new(role)
+      tmp = client.get @json['user']['links']['roles']
+      tmp['associatedRoles']['roles'].pmap do |role_uri|
+        role = client.get role_uri
+        client.factory.create(GoodData::ProjectRole, role)
       end
-
-      res
     end
 
     # Gets the status
@@ -396,7 +391,7 @@ module GoodData
         }
       }
 
-      @json = GoodData.post("/gdc/projects/#{project_id}/users", payload)
+      @json = client.post("/gdc/projects/#{project_id}/users", payload)
     end
   end
 end

data/lib/gooddata/models/metadata.rb

@@ -1,12 +1,13 @@
 # encoding: UTF-8
 
-require_relative '../core/connection'
 require_relative '../core/project'
 
 require_relative '../mixins/mixins'
+require_relative '../rest/object'
 
 module GoodData
-  class MdObject
+  class MdObject < GoodData::Rest::Object
+    MD_OBJ_CTG = 'obj'
     IDENTIFIERS_CFG = 'instance-identifiers'
 
     attr_reader :json
@@ -14,30 +15,20 @@ module GoodData
     alias_method :raw_data, :json
     alias_method :to_hash, :json
 
-    include GoodData::Mixin::RootKeyGetter
-    include GoodData::Mixin::MdJson
-    include GoodData::Mixin::DataGetter
-    include GoodData::Mixin::MetaGetter
-    include GoodData::Mixin::ObjId
-    include GoodData::Mixin::ContentGetter
-    include GoodData::Mixin::Timestamps
-    include GoodData::Mixin::Links
-    include GoodData::Mixin::NotAttribute
-    include GoodData::Mixin::NotExportable
-    include GoodData::Mixin::NotFact
-    include GoodData::Mixin::NotMetric
-    include GoodData::Mixin::NotLabel
-    include GoodData::Mixin::MdRelations
+    include GoodData::Mixin::RestResource
 
     class << self
-      include GoodData::Mixin::RootKeySetter
-      include GoodData::Mixin::MetaPropertyReader
-      include GoodData::Mixin::MetaPropertyWriter
-      include GoodData::Mixin::MdObjId
-      include GoodData::Mixin::MdObjectQuery
-      include GoodData::Mixin::MdObjectIndexer
-      include GoodData::Mixin::MdFinders
-      include GoodData::Mixin::MdIdToUri
+      def metadata_property_reader(*props)
+        props.each do |prop|
+          define_method prop, proc { meta[prop.to_s] }
+        end
+      end
+
+      def metadata_property_writer(*props)
+        props.each do |prop|
+          define_method "#{prop}=", proc { |val| meta[prop.to_s] = val }
+        end
+      end
     end
 
     metadata_property_reader :uri, :identifier, :title, :summary, :tags, :deprecated, :category
@@ -49,14 +40,14 @@ module GoodData
 
     def delete
       if saved?
-        GoodData.delete(uri)
+        client.delete(uri)
         meta.delete('uri')
         # ["uri"] = nil
       end
     end
 
     def reload!
-      @json = GoodData.get(uri) if saved?
+      @json = client.get(uri) if saved?
       self
     end
 
@@ -77,7 +68,7 @@ module GoodData
     end
 
     def project
-      @project ||= Project[uri.gsub(%r{\/obj\/\d+$}, '')]
+      @project ||= Project[uri.gsub(%r{\/obj\/\d+$}, ''), :client => client, :project => project]
     end
 
     def saved?
@@ -88,17 +79,24 @@ module GoodData
     def save
       fail('Validation failed') unless validate
 
+      opts = {
+        :client => client,
+        :project => project
+      }
+
       if saved?
-        GoodData.put(uri, to_json)
+        client.put(uri, to_json)
       else
         explicit_identifier = meta['identifier']
         # Pre-check to provide a user-friendly error rather than
         # failing later
-        if explicit_identifier && MdObject[explicit_identifier]
+        if explicit_identifier && MdObject[explicit_identifier, opts]
           fail "Identifier '#{explicit_identifier}' already in use"
         end
-        result = GoodData.post(GoodData.project.md['obj'], to_json)
-        saved_object = self.class[result['uri']]
+
+        req_uri = project.md['obj']
+        result = client.post(req_uri, to_json)
+        saved_object = self.class[result['uri'], opts]
         # TODO: add test for explicitly provided identifier
 
         @json = saved_object.json
@@ -108,11 +106,11 @@ module GoodData
           # it explicitly with an extra PUT call.
           meta['identifier'] = explicit_identifier
           begin
-            GoodData.put(uri, to_json)
+            client.put(uri, to_json)
           rescue => e
             # Cannot change the identifier (perhaps because it's in use
             # already?), cleaning up.
-            GoodData.delete(uri)
+            client.delete(uri)
             raise e
           end
         end
@@ -124,12 +122,14 @@ module GoodData
     #
     # @param new_title [String] New title. If not provided one is provided
     # @return [GoodData::MdObject] MdObject that has been saved as
-    def save_as(new_title = "Clone of #{title}")
+    def save_as(new_title = nil)
+      new_title = "Clone of #{title}" if new_title.nil?
+
       dupped = Marshal.load(Marshal.dump(json))
       dupped[root_key]['meta'].delete('uri')
       dupped[root_key]['meta'].delete('identifier')
       dupped[root_key]['meta']['title'] = new_title
-      x = self.class.new(dupped)
+      x = client.create(self.class, dupped, :project => project)
       x.save
     end
 

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

@@ -1,5 +1,7 @@
 # encoding: UTF-8
 
+require_relative '../metadata'
+
 require_relative 'metadata'
 
 require_relative '../../mixins/is_attribute'
@@ -18,7 +20,7 @@ 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 = {})
+      def all(options = { :client => GoodData.connection, :project => GoodData.project })
         query('attributes', Attribute, options)
       end
 
@@ -26,16 +28,16 @@ module GoodData
       #
       # @param uri [String] Uri of the element. in the form of /gdc/md/PID/obj/OBJ_ID/elements?id=21
       # @return [String] Textual representation of a particular attribute element
-      def find_element_value(uri)
+      def find_element_value(uri, opts = { :client => @client, :project => @project })
         matches = uri.match(/(.*)\/elements\?id=(\d+)$/)
-        Attribute[matches[1]].primary_label.find_element_value(uri)
+        opts[:project].attributes(matches[1]).primary_label.find_element_value(uri)
       end
     end
 
     # Returns the labels of an attribute
     # @return [Array<GoodData::Label>]
     def display_forms
-      content['displayForms'].map { |df| GoodData::Label[df['meta']['uri']] }
+      content['displayForms'].map { |df| GoodData::Label[df['meta']['uri'], :client => client, :project => project] }
     end
     alias_method :labels, :display_forms
 
@@ -57,9 +59,9 @@ module GoodData
       fail "Suggested aggreagtion function (#{a_type}) does not exist for base metric created out of attribute. You can use only one of #{ATTRIBUTE_BASE_AGGREGATIONS.map { |x| ":" + x.to_s }.join(',')}" unless ATTRIBUTE_BASE_AGGREGATIONS.include?(a_type)
       a_title = options[:title] || "#{a_type} of #{title}"
       if an_attribute
-        Metric.xcreate(:expression => "SELECT #{a_type.to_s.upcase}(![#{identifier}], ![#{an_attribute.identifier}])", :title => a_title)
+        Metric.xcreate("SELECT #{a_type.to_s.upcase}(![#{identifier}], ![#{an_attribute.identifier}])", :title => a_title, :client => client, :project => project)
       else
-        Metric.xcreate(:expression => "SELECT #{a_type.to_s.upcase}(![#{identifier}])", :title => a_title)
+        Metric.xcreate("SELECT #{a_type.to_s.upcase}(![#{identifier}])", :title => a_title, :client => client, :project => project)
       end
     end
 
@@ -77,9 +79,9 @@ module GoodData
     # @param [Hash] options the options to pass to the value list
     # @option options [Number] :limit limits the number of values to certain number. Default is 100
     # @return [Array]
-    def values(options = {})
+    def values
       results = labels.map do |label|
-        label.values(options)
+        label.values
       end
       results.first.zip(*results[1..-1])
     end

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

@@ -17,7 +17,7 @@ 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 = {})
+      def all(options = { :client => GoodData.connection, :project => GoodData.project })
         query('projectdashboards', Dashboard, options)
       end
 

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

@@ -21,7 +21,7 @@ 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 = {})
+      def all(options = { :client => GoodData.connection, :project => GoodData.project })
         query('facts', Fact, options)
       end
     end
@@ -30,11 +30,11 @@ module GoodData
     # @param [Hash] options the options to pass to the value list
     # @option options [Symbol] :type type of aggregation function. Default is :sum
     # @return [GoodData::Metric]
-    def create_metric(options = {})
+    def create_metric(options = { :type => :sum })
       a_type = options[:type] || :sum
       fail "Suggested aggreagtion function (#{a_type}) does not exist for base metric created out of fact. You can use only one of #{FACT_BASE_AGGREGATIONS.map { |x| ":" + x.to_s }.join(',')}" unless FACT_BASE_AGGREGATIONS.include?(a_type)
       a_title = options[:title] || "#{a_type} of #{title}"
-      Metric.xcreate(:expression => "SELECT #{a_type.to_s.upcase}(![#{identifier}])", :title => a_title)
+      Metric.xcreate("SELECT #{a_type.to_s.upcase}(![#{identifier}])", :title => a_title, :client => client, :project => project)
     end
   end
 end