gooddata 0.6.24 → 0.6.25

data/lib/gooddata/models/execution.rb

@@ -12,8 +12,6 @@ module GoodData
     attr_reader :dirty, :json
 
     alias_method :data, :json
-    alias_method :raw_data, :json
-    alias_method :to_hash, :json
 
     # Initializes object instance from raw wire JSON
     #

data/lib/gooddata/models/execution_detail.rb

@@ -12,8 +12,6 @@ module GoodData
     attr_reader :dirty, :json
 
     alias_method :data, :json
-    alias_method :raw_data, :json
-    alias_method :to_hash, :json
 
     # Initializes object instance from raw wire JSON
     #

data/lib/gooddata/models/from_wire.rb

@@ -74,6 +74,16 @@ module GoodData
           a[:title] = attribute['title']
           a[:description] = attribute['description']
           a[:folder] = attribute['folder']
+          if attribute['grain']
+            a[:grain] = attribute['grain'].map do |g|
+              case g.keys.first.to_sym
+              when :dateDimension
+                { date: g.values.first }
+              else
+                Helpers.symbolize_keys(g)
+              end
+            end
+          end
         end
         [attribute] + pl + rl
       end

data/lib/gooddata/models/invitation.rb

@@ -7,7 +7,7 @@
 require_relative '../rest/rest'
 
 module GoodData
-  class Invitation < GoodData::Rest::Object
+  class Invitation < Rest::Resource
     def initialize(json)
       @json = json
     end

data/lib/gooddata/models/links.rb

@@ -7,7 +7,7 @@
 require_relative '../rest/object'
 
 module GoodData
-  class Links < GoodData::Rest::Object
+  class Links < Rest::Resource
     attr_reader :data
 
     def initialize(items)

data/lib/gooddata/models/membership.rb

@@ -13,7 +13,7 @@ require_relative 'project_role'
 require_relative '../rest/object'
 
 module GoodData
-  class Membership < GoodData::Rest::Object
+  class Membership < Rest::Resource
     attr_reader :json
 
     ASSIGNABLE_MEMBERS = [
@@ -109,7 +109,7 @@ module GoodData
     def contributor
       url = @json['user']['meta']['contributor']
       data = client.get url
-      client.factory.create(GoodData::Membership, data)
+      client.create(GoodData::Membership, data)
     end
 
     # Gets date when created
@@ -242,7 +242,7 @@ module GoodData
     # Gets profile of this membership
     def profile
       raw = client.get @json['user']['links']['self']
-      client.factory.create(GoodData::Profile, raw)
+      client.create(GoodData::Profile, raw)
     end
 
     # Gets URL of profile membership
@@ -253,7 +253,7 @@ module GoodData
     # # Gets project which this membership relates to
     # def project
     #   raw = client.get project_url
-    #   client.factory.create(GoodData::Project, raw)
+    #   client.create(GoodData::Project, raw)
     # end
 
     # Gets project id
@@ -274,7 +274,7 @@ module GoodData
       tmp['projects'].map do |project_meta|
         project_uri = project_meta['project']['links']['self']
         project = client.get project_uri
-        client.factory.create(GoodData::Project, project)
+        client.create(GoodData::Project, project)
       end
     end
 
@@ -294,7 +294,7 @@ module GoodData
       tmp = client.get roles_link
       tmp['associatedRoles']['roles'].pmap do |role_uri|
         role = client.get role_uri
-        client.factory.create(GoodData::ProjectRole, role)
+        client.create(GoodData::ProjectRole, role)
       end
     end
 
@@ -401,6 +401,10 @@ module GoodData
       tmp
     end
 
+    def user_groups
+      project.user_groups(:all, user: obj_id)
+    end
+
     private
 
     # Sets status to 'ENABLED' or 'DISABLED'

data/lib/gooddata/models/metadata.rb

@@ -4,34 +4,102 @@
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
+require 'multi_json'
+
 require_relative '../core/project'
 
 require_relative '../mixins/mixins'
 require_relative '../rest/object'
 
 module GoodData
-  class MdObject < GoodData::Rest::Object
+  class MdObject < Rest::Resource
     MD_OBJ_CTG = 'obj'
     IDENTIFIERS_CFG = 'instance-identifiers'
 
-    attr_accessor :json
+    extend Mixin::MdIdToUri
+    extend Mixin::MdObjectIndexer
+    extend Mixin::MdObjectQuery
 
-    alias_method :raw_data, :json
-    alias_method :to_hash, :json
+    extend Mixin::MdFinders
+    extend Mixin::MdObjId
 
-    include GoodData::Mixin::RestResource
+    include Mixin::Links
+    include Mixin::ObjId
+    include Mixin::MdRelations
+    include Mixin::MdGrantees
 
     class << self
-      def metadata_property_reader(*props)
-        props.each do |prop|
-          define_method prop, proc { meta[prop.to_s] }
+      # Method used for replacing objects like Attribute, Fact or Metric. It takes the object. Scans its JSON
+      # representation and returns a new one with object references changed according to mapping. The references an be found either in the object structure or in the MAQL in bracketed form. This implementation takes care only of those in bracketed form.
+      #
+      # @param obj [GoodData::MdObject] what Object that should be replaced
+      # @param mapping [Array[Array]] Array of mapping pairs.
+      # @return [GoodData::MdObject]
+      def replace_bracketed(obj, mapping)
+        replace(obj, mapping) { |e, a, b| e.gsub("[#{a}]", "[#{b}]") }
+      end
+
+      # Method used for replacing objects like Attribute, Fact or Metric. It takes the object. Scans its JSON
+      # representation and returns a new one with object references changed according to mapping. The references an be found either in the object structure or in the MAQL in bracketed form. This implementation takes care only of those in object structure where they are as a string in JSON.
+      #
+      # @param obj [GoodData::MdObject] Object that should be replaced
+      # @param mapping [Array[Array]] Array of mapping pairs.
+      # @return [GoodData::MdObject]
+      def replace_quoted(obj, mapping)
+        replace(obj, mapping) do |e, a, b|
+          e.gsub("\"#{a}\"", "\"#{b}\"")
         end
       end
 
-      def metadata_property_writer(*props)
-        props.each do |prop|
-          define_method "#{prop}=", proc { |val| meta[prop.to_s] = val }
+      # Helper method used for replacing objects like Attribute, Fact or Metric. It takes the object. Scans its JSON
+      # representation yields for a client to perform replacement for each mapping pair and returns a new one
+      # with object of the same type as obj.
+      #
+      # @param obj [GoodData::MdObject] Object that should be replaced
+      # @param mapping [Array[Array]] Array of mapping pairs.
+      # @param block [Proc] Block that receives the object state as a JSON string and mapping pair and expects a new object state as a JSON string back
+      # @return [GoodData::MdObject]
+      def replace(obj, mapping, &block)
+        json = mapping.reduce(obj.to_json) do |a, e|
+          obj_a, obj_b = e
+          uri_what = obj_a.respond_to?(:uri) ? obj_a.uri : obj_a
+          uri_for_what = obj_b.respond_to?(:uri) ? obj_b.uri : obj_b
+          block.call(a, uri_what, uri_for_what)
+        end
+        client = obj.client
+        client.create(obj.class, MultiJson.load(json), :project => obj.project)
+      end
+
+      # Helper method used for finding attribute elements that are interesting becuase they can be possibly
+      # replaced according to mapping specification. This walks through all the attribute elemets. Picks only those
+      # whose attribute is mentioned in the mapping. Walks through all the labels of that particular attribute and
+      # tries to find a value from one to be translated into a label in second. Obviously this is not guaranteed to
+      # find any results or in some cases can yield to incorrect results.
+      #
+      # @param obj [GoodData::MdObject] Object that should be replaced
+      # @param mapping [Array[Array]] Array of mapping pairs.
+      # @param block [Proc] Block that receives the object state as a JSON string and mapping pair and expects a new object state as a JSON string back
+      # @return [GoodData::MdObject]
+      def find_replaceable_values(obj, mapping)
+        values_to_replace = GoodData::SmallGoodZilla.extract_element_uri_pairs(MultiJson.dump(obj.to_json))
+        values_from_mapping = values_to_replace.select { |i| mapping.map { |a, _| a.uri }.include?(i.first) }
+        replaceable_vals = values_from_mapping.map do |a_uri, id|
+          from_attribute, to_attribute = mapping.find { |k, _| k.uri == a_uri }
+          vals = from_attribute.values_for(id)
+          labels = to_attribute.labels
+          results = labels.to_enum.mapcat do |l|
+            vals.map do |v|
+              begin
+                l.find_value_uri(v)
+              rescue
+                nil
+              end
+            end
+          end
+          fail "Unable to find replacement for #{a_uri}" if results.compact.empty?
+          [a_uri, id, results.compact.first]
         end
+        replaceable_vals.map { |a, id, r| ["#{a}/elements?id=#{id}", r] }
       end
     end
 
@@ -88,6 +156,25 @@ module GoodData
       @project ||= Project[uri.gsub(%r{\/obj\/\d+$}, ''), :client => client]
     end
 
+    # Method used for replacing objects like Attribute, Fact or Metric. Returns new object of the same type.
+    #
+    # @param [GoodData::MdObject] what Object that should be replaced
+    # @param [GoodData::MdObject] for_what Object it is replaced with
+    # @return [GoodData::Metric]
+    def replace(mapping)
+      GoodData::MdObject.replace_quoted(self, mapping)
+    end
+
+    # Method used for replacing objects like Attribute, Fact or Metric. Returns itself mutated.
+    # @param [GoodData::MdObject] what Object that should be replaced
+    # @param [GoodData::MdObject] for_what Object it is replaced with
+    # @return [GoodData::Metric]
+    def replace!(mapping)
+      x = replace(mapping)
+      @json = x.json
+      self
+    end
+
     def remove_tag(a_tag)
       self.tags = tag_set.delete(a_tag).to_a.join(' ')
       self

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

@@ -12,9 +12,7 @@ require_relative '../../mixins/is_attribute'
 
 module GoodData
   class Attribute < MdObject
-    root_key :attribute
-
-    include GoodData::Mixin::IsAttribute
+    include Mixin::IsAttribute
 
     ATTRIBUTE_BASE_AGGREGATIONS = [:count]
 
@@ -32,16 +30,17 @@ 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, opts = { :client => @client, :project => @project })
-        matches = uri.match(%r{(.*)/elements\?id=(\d+)$})
-        opts[:project].attributes(matches[1]).primary_label.find_element_value(uri)
+      def find_element_value(stuff, opts = { :project => GoodData.project })
+        stuff.scan(%r{([^\[\]]*)\/elements\?id=(\d+)}).pmap do |a, id|
+          opts[:project].attributes(a).primary_label.find_element_value(id.to_i)
+        end.first
       end
     end
 
     # Returns the labels of an attribute
     # @return [Array<GoodData::Label>]
     def display_forms
-      content['displayForms'].map { |df| GoodData::Label[df['meta']['uri'], :client => client, :project => project] }
+      content['displayForms'].pmap { |df| project.labels(df['meta']['uri']) }
     end
     alias_method :labels, :display_forms
 

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

@@ -9,6 +9,7 @@ require_relative 'dashboard/filter_item'
 require_relative 'dashboard/report_item'
 
 require_relative '../../core/core'
+require_relative '../../helpers/global_helpers'
 require_relative '../metadata'
 require_relative 'metadata'
 require_relative 'report'
@@ -17,9 +18,29 @@ require 'multi_json'
 
 module GoodData
   class Dashboard < GoodData::MdObject
-    root_key :projectDashboard
+    include Mixin::Lockable
+
+    EMPTY_OBJECT = {
+      'projectDashboard' => {
+        'content' => {
+          'tabs' => [],
+          'filters' => []
+        },
+        'meta' => {
+          'tags' => '',
+          'summary' => '',
+          'title' => ''
+        }
+      }
+    }
 
-    include GoodData::Mixin::Lockable
+    ASSIGNABLE_MEMBERS = [
+      :filters,
+      :tabs,
+      :tags,
+      :summary,
+      :title
+    ]
 
     class << self
       # Method intended to get all objects of that type in a specified project
@@ -31,84 +52,19 @@ module GoodData
         query('projectDashboard', Dashboard, options)
       end
 
-      def create_report_tab(tab, options = { :client => GoodData.client, :project => GoodData.project })
-        title = tab[:title]
-        {
-          :title => title,
-          :items => tab[:items].map { |i| GoodData::Dashboard.create_report_tab_item(i, options) }
-        }
-      end
-
-      def create_report_tab_item(item, options = { :client => GoodData.client, :project => GoodData.project })
-        title = item[:title]
-
-        report = GoodData::Report.find_first_by_title(title, options)
-        {
-          :reportItem => {
-            :obj => report.uri,
-            :sizeY => item[:size_y] || 200,
-            :sizeX => item[:size_x] || 300,
-            :style => {
-              :displayTitle => 1,
-              :background => {
-                :opacity => 0
-              }
-            },
-            :visualization => {
-              :grid => {
-                :columnWidths => []
-              },
-              :oneNumber => {
-                :labels => {}
-              }
-            },
-            :positionY => item[:position_y] || 0,
-            :filters => [],
-            :positionX => item[:position_x] || 0
-          }
-        }
-      end
-
-      def create(dashboard = { :tabs => [] }, options = { :client => GoodData.client, :project => GoodData.project })
-        client = options[:client]
-        fail ArgumentError, 'No :client specified' if client.nil?
-
-        p = options[:project]
-        fail ArgumentError, 'No :project specified' if p.nil?
-
-        project = GoodData::Project[p, options]
-        fail ArgumentError, 'Wrong :project specified' if project.nil?
-
-        tabs = dashboard[:tabs] || []
-
-        stuff = {
-          'projectDashboard' => {
-            'content' => {
-              'tabs' => tabs.map { |t| GoodData::Dashboard.create_report_tab(t, options) },
-              'filters' => []
-            },
-            'meta' => {
-              'tags' => dashboard[:tags],
-              'summary' => dashboard[:summary],
-              'title' => dashboard[:title]
-            }
-          }
-        }
+      def create(dashboard = {}, options = { :client => GoodData.client, :project => GoodData.project })
+        client, project = GoodData.get_client_and_project(options)
 
-        client.create(Dashboard, stuff, :project => project)
+        res = client.create(Dashboard, GoodData::Helpers.deep_dup(GoodData::Helpers.deep_stringify_keys(EMPTY_OBJECT)), :project => project)
+        dashboard.each do |k, v|
+          res.send("#{k}=", v) if ASSIGNABLE_MEMBERS.include? k
+        end
+        res
       end
     end
 
     def add_tab(tab)
-      title = tab[:title] || 'Default Tab Title'
-      items = tab[:items] || []
-
-      new_tab_json = {
-        :title => title,
-        :items => items.map { |i| GoodData::Dashboard.create_report_tab_item(i, options) }
-      }
-
-      new_tab = GoodData::DashboardTab.new(self, GoodData::Helpers.deep_stringify_keys(new_tab_json))
+      new_tab = GoodData::DashboardTab.create(self, tab)
       content['tabs'] << new_tab.json
       new_tab
     end
@@ -129,6 +85,16 @@ module GoodData
       client.poll_on_code(x['asyncTask']['link']['poll'], options.merge(process: false))
     end
 
+    # Method used for replacing values in their state according to mapping. Can be used to replace any values but it is typically used to replace the URIs. Returns a new object of the same type.
+    #
+    # @param [Array<Array>]Mapping specifying what should be exchanged for what. As mapping should be used output of GoodData::Helpers.prepare_mapping.
+    # @return [GoodData::Dashboard]
+    def replace(mapping)
+      x = GoodData::MdObject.replace_quoted(self, mapping)
+      vals = GoodData::MdObject.find_replaceable_values(self, mapping)
+      GoodData::MdObject.replace_quoted(x, vals)
+    end
+
     def tabs
       content['tabs'].map do |tab|
         GoodData::DashboardTab.new(self, tab)

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

@@ -4,19 +4,35 @@
 # 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 DashboardItem
-    include GoodData::Mixin::RootKeyGetter
-    include GoodData::Mixin::DataGetter
+require_relative '../../../rest/resource'
 
+module GoodData
+  class DashboardItem < Rest::Resource
     attr_reader :tab
     attr_accessor :json
 
+    ASSIGNABLE_MEMBERS = [
+      :pos_x,
+      :pos_y,
+      :position_x,
+      :position_y,
+      :size_x,
+      :size_y
+    ]
+
     def initialize(tab, json)
       @tab = tab
       @json = json
     end
 
+    def filters
+      data['filters']
+    end
+
+    def filters=(new_filters)
+      data['filters'] = new_filters
+    end
+
     def position_x
       data['positionX']
     end