Rewrote the test full_project to use the new syntax. Removing unused Mode::MdObject. Added SST logging + test

Author: Tomas Svarovsky

lib/gooddata/mixins/md_relations.rb

@@ -3,17 +3,17 @@
 module GoodData
   module Mixin
     module MdRelations
-      def dependency(uri, key = nil, opts = { :client => GoodData.connection, :project => GoodData.project })
+      def dependency(uri, key = nil, opts = { :client => client, :project => project })
         GoodData::MdObject.dependency(uri, key, opts)
       end
 
       # Checks for dependency
-      def dependency?(type, obj, opts = { :client => GoodData.connection, :project => GoodData.project })
+      def dependency?(type, obj, opts = { :client => client, :project => project })
         GoodData::MdObject.dependency?(type, self, obj, opts)
       end
 
       # Returns which objects uses this MD resource
-      def usedby(key = nil, opts = { :client => GoodData.connection, :project => GoodData.project })
+      def usedby(key = nil, opts = { :client => client, :project => project })
         p = opts[:project]
         fail ArgumentError, 'No :project specified' if p.nil?
 
@@ -26,24 +26,21 @@ def usedby(key = nil, opts = { :client => GoodData.connection, :project => GoodD
       alias_method :used_by, :usedby
 
       # Returns which objects this MD resource uses
-      def using(key = nil, opts = { :client => GoodData.connection, :project => GoodData.project })
-        p = opts[:project]
-        fail ArgumentError, 'No :project specified' if p.nil?
-
+      def using(key = nil, opts = { :client => client, :project => project })
         project = opts[:project]
         fail ArgumentError, 'Wrong :project specified' if project.nil?
 
         dependency("#{project.md['using2']}/#{obj_id}", key, opts)
       end
 
-      def usedby?(obj, opts = { :client => GoodData.connection, :project => GoodData.project })
+      def usedby?(obj, opts = { :client => client, :project => project })
         GoodData::MdObject.used_by?(self, obj, opts)
       end
 
       alias_method :used_by?, :usedby?
 
       # Checks if obj is using this MD resource
-      def using?(obj, opts = { :client => GoodData.connection, :project => GoodData.project })
+      def using?(obj, opts = { :client => client, :project => project })
         dependency?(:using, obj, opts)
       end
     end

lib/gooddata/models/md_object.rb

@@ -30,7 +30,7 @@ def all(options = {})
       # @return [String] Textual representation of a particular attribute element
       def find_element_value(uri, opts = { :client => @client, :project => @project })
         matches = uri.match(/(.*)\/elements\?id=(\d+)$/)
-        Attribute[matches[1], :client => opts[:client], :project => opts[:project]].primary_label.find_element_value(uri)
+        opts[:project].attributes(matches[1]).primary_label.find_element_value(uri)
       end
     end
 

lib/gooddata/models/metadata/attribute.rb

@@ -17,10 +17,20 @@ def all(options = {})
         query('reports', Report, options)
       end
 
-      def create(options = {})
+      def create(options = { :client => GoodData.connection, :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?
+        
         title = options[:title]
+        fail "Report needs a title specified" unless title
         summary = options[:summary] || ''
-        rd = options[:rd] || ReportDefinition.create(:top => options[:top], :left => options[:left])
+        rd = options[:rd] || ReportDefinition.create(options)
         rd.save
 
         report = {
@@ -39,10 +49,20 @@ def create(options = {})
         }
         # TODO: write test for report definitions with explicit identifiers
         report['report']['meta']['identifier'] = options[:identifier] if options[:identifier]
-        Report.new report
+        client.create(Report, report, :project => project)
       end
     end
 
+    # Add a report definition to a report. This will show on a UI as a new version.
+    #
+    # @param report_definition [GoodData::ReportDefinition | String] Report definition to add. Either it can be a URI of a report definition or an actual report definition object. 
+    # @return [GoodData::Report] Return self
+    def add_definition(report_definition)
+      rep_def = project.report_definitions(report_definition)
+      content['definitions'] = definition_uris << rep_def.uri
+      self
+    end
+
     def results
       content['results']
     end

lib/gooddata/models/metadata/report.rb

@@ -152,15 +152,18 @@ def user_csv_import(row)
       end
     end
 
-    def add_metric(options = {})
-      options[:expression] || fail('Metric has to have its expression defined')
-      m1 = GoodData::Metric.xcreate(options)
-      m1.save
+    def add_metric(metric, options = {})
+      default = { client: client, project: self }
+      if metric.is_a?(String)
+        GoodData::Metric.xcreate(metric, options.merge(default))
+      else
+        GoodData::Metric.xcreate(metric.merge(default))
+      end
     end
     alias_method :create_metric, :add_metric
 
     def add_report(options = {})
-      rep = GoodData::Report.create(options)
+      rep = GoodData::Report.create(options.merge(client: client, project: self))
       rep.save
     end
     alias_method :create_report, :add_report
@@ -340,6 +343,10 @@ def facts_by_title(title)
       GoodData::Fact.find_by_title(title, project: self, client: client)
     end
 
+    def find_attribute_element_value(uri)
+      GoodData::Attribute.find_element_value(uri, client: client, project: self)
+    end
+
     # Gets project role by its identifier
     #
     # @param [String] role_name Title of role to look for

lib/gooddata/models/project.rb

@@ -54,14 +54,12 @@ def initialize(opts)
       def connect(username, password, options = {})
         # Reset old cookies first
         if options[:sst_token]
-          # server_cookies = options[:cookies]
-          # options.merge(:cookies => { 'GDCAuthSST' => token })
           merge_cookies!({ 'GDCAuthSST' => options[:sst_token] })
-          # status = :logged_in
+          @user = get(get('/gdc/app/account/bootstrap')['bootstrapResource']['accountSetting']['links']['self'])
+          @auth = {}
           refresh_token :dont_reauth => true
         else
           credentials = Connection.construct_login_payload(username, password)
-
           @auth = post(LOGIN_PATH, credentials, :dont_reauth => true)['userLogin']
 
           @user = get(@auth['profile'])
@@ -73,7 +71,7 @@ def connect(username, password, options = {})
       def disconnect
         # TODO: Wrap somehow
         url = @auth['state']
-        delete url
+        delete url if url
 
         @auth = nil
         @server = nil
@@ -126,6 +124,13 @@ def post(uri, data, options = {})
         fail NotImplementedError "POST #{uri}"
       end
 
+      # Reader method for SST token
+      #
+      # @return uri [String] SST token
+      def sst_token
+        cookies[:cookies]['GDCAuthSST']
+      end
+
       def stats_table(values = stats)
         sorted = values.sort_by { |k, v| v[:avg] }
         Terminal::Table.new :headings => %w(title avg min max total calls) do |t|
@@ -143,6 +148,13 @@ def stats_table(values = stats)
         end
       end
 
+      # Reader method for TT token
+      #
+      # @return uri [String] TT token
+      def tt_token
+        cookies[:cookies]['GDCAuthTT']
+      end
+
       private
 
       def merge_cookies!(cookies)