gooddata 0.6.20 → 0.6.22

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

@@ -1,4 +1,8 @@
 # encoding: UTF-8
+#
+# Copyright (c) 2010-2015 GoodData Corporation. All rights reserved.
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
 
 require_relative '../metadata'
 require_relative 'metadata'
@@ -65,6 +69,33 @@ module GoodData
       self
     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)
+      res = add_definition(report_definition)
+      res.save
+    end
+
+    # Returns the newest (current version) report definition as an object
+    #
+    # @return [GoodData::ReportDefinition] Returns the newest report defintion
+    def definition
+      project.report_definitions(latest_report_definition_uri)
+    end
+
+    alias_method :latest_report_definition, :definition
+
+    # Returns the newest (current version) report definition uri
+    #
+    # @return [String] Returns uri of the newest report defintion
+    def definition_uri
+      definition_uris.last
+    end
+
+    alias_method :latest_report_definition_uri, :definition_uri
+
     # Gets a report definitions (versions) of this report as objects.
     #
     # @return [Array<GoodData::ReportDefinition>] Returns list of report definitions. Oldest comes first
@@ -103,9 +134,9 @@ module GoodData
       end
 
       if result.empty?
-        client.create(EmptyResult, result)
+        client.create(ReportDataResult, data: [], top: 0, left: 0, project: project)
       else
-        client.create(ReportDataResult, result)
+        ReportDataResult.from_xtab(result, client: client, project: project)
       end
     end
 
@@ -126,20 +157,6 @@ module GoodData
       client.poll_on_code(result1['uri'], options.merge(process: false))
     end
 
-    # Returns the newest (current version) report definition uri
-    #
-    # @return [String] Returns uri of the newest report defintion
-    def latest_report_definition_uri
-      definition_uris.last
-    end
-
-    # Returns the newest (current version) report definition as an object
-    #
-    # @return [GoodData::ReportDefinition] Returns the newest report defintion
-    def latest_report_definition
-      project.report_definitions(latest_report_definition_uri)
-    end
-
     # Returns the newest (current version) report definition uri
     #
     # @return [String] Returns uri of the newest report defintion
@@ -191,5 +208,34 @@ module GoodData
       new_defs.pmap(&:save)
       self
     end
+
+    ## Update report definition and reflect the change in report
+    #
+    # @param [Hash] opts Options
+    # @option opts [Boolean] :new_definition (true) If true then new definition will be created
+    # @return [GoodData::ReportDefinition] Updated and saved report definition
+    def update_definition(opts = { :new_definition => true }, &block)
+      # TODO: Cache the latest report definition somehow
+      repdef = definition.dup
+
+      block.call(repdef, self) if block_given?
+
+      if opts[:new_definition]
+        new_def = GoodData::ReportDefinition.create(:client => client, :project => project)
+
+        rd = repdef.json['reportDefinition']
+        rd.delete('links')
+        %w(author uri created identifier updated contributor).each { |k| rd['meta'].delete(k) }
+        new_def.json['reportDefinition'] = rd
+        new_def.save
+
+        add_definition!(new_def)
+        return new_def
+      else
+        repdef.save
+      end
+
+      repdef
+    end
   end
 end

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

@@ -1,4 +1,8 @@
 # encoding: UTF-8
+#
+# Copyright (c) 2010-2015 GoodData Corporation. All rights reserved.
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
 
 require_relative '../metadata'
 require_relative 'metadata'
@@ -27,6 +31,8 @@ module GoodData
         end
       end
 
+      alias_method :create_measures_part, :create_metrics_part
+
       def create_metric_part(metric)
         {
           'alias' => metric.title,
@@ -34,6 +40,8 @@ module GoodData
         }
       end
 
+      alias_method :create_measure_part, :create_metric_part
+
       def create_attribute_part(attrib)
         {
           'attribute' => {
@@ -68,54 +76,41 @@ module GoodData
 
       def find(stuff, opts = { :client => GoodData.connection, :project => GoodData.project })
         client = opts[:client]
+        project = opts[:project]
         fail ArgumentError, 'No :client specified' if client.nil?
+        fail ArgumentError, 'No :project specified' if project.nil?
 
         stuff.map do |item|
-          if item.respond_to?(:attribute?) && item.attribute?
-            item.display_forms.first
-          elsif item.is_a?(String)
-            x = GoodData::MdObject.get_by_id(item, opts)
-            fail "Object given by id \"#{item}\" could not be found" if x.nil?
-            case x.raw_data.keys.first.to_s
-            when 'attribute'
-              attr = GoodData::Attribute.new(x.json)
-              attr.client = client
-              attr.project = opts[:project]
-              attr.display_forms.first
-            when 'attributeDisplayForm'
-              GoodData::Label.new(x.json)
-            when 'metric'
-              GoodData::Metric.new(x.json)
-            end
-          elsif item.is_a?(Hash) && item.keys.include?(:title)
-            case item[:type].to_s
-            when 'metric'
-              GoodData::Metric.find_first_by_title(item[:title])
-            when 'attribute'
-              result = GoodData::Attribute.find_first_by_title(item[:title])
-              result.display_forms.first
-            end
-          elsif item.is_a?(Hash) && (item.keys.include?(:id))
-            case item[:type].to_s
-            when 'metric'
-              GoodData::Metric.get_by_id(item[:id])
-            when 'attribute'
-              GoodData::Attribute.get_by_id(item[:id]).display_forms.first
-            when 'label'
-              GoodData::Label.get_by_id(item[:id])
-          end
-          elsif item.is_a?(Hash) && (item.keys.include?(:identifier))
-            case item[:type].to_s
-            when 'metric'
-              GoodData::Metric.get_by_id(item[:identifier])
-            when 'attribute'
-              result = GoodData::Attribute.get_by_id(item[:identifier])
-              result.display_forms.first
-            when 'label'
-              GoodData::Label.get_by_id(item[:identifier])
-            end
+          obj = if item.is_a?(String)
+                  begin
+                    project.objects(item)
+                  rescue RestClient::ResourceNotFound
+                    raise "Object given by id \"#{item}\" could not be found"
+                  end
+                elsif item.is_a?(Hash) && item.keys.include?(:title)
+                  case item[:type].to_s
+                  when 'metric'
+                    GoodData::Metric.find_first_by_title(item[:title], opts)
+                  when 'attribute'
+                    GoodData::Attribute.find_first_by_title(item[:title], opts)
+                  end
+                elsif item.is_a?(Hash) && (item.keys.include?(:id) || item.keys.include?(:identifier))
+                  id = item[:id] || item[:identifier]
+                  case item[:type].to_s
+                  when 'metric'
+                    project.metrics(id)
+                  when 'attribute'
+                    project.attributes(id)
+                  when 'label'
+                    projects.labels(id)
+                  end
+                else
+                  item
+                end
+          if obj.respond_to?(:attribute?) && obj.attribute?
+            obj.display_forms.first
           else
-            item
+            obj
           end
         end
       end
@@ -223,6 +218,8 @@ module GoodData
       content['grid']['metrics']
     end
 
+    alias_method :measure_parts, :metric_parts
+
     def metrics
       metric_parts.map { |i| project.metrics(i['uri']) }
     end
@@ -307,7 +304,7 @@ module GoodData
         content['grid']['columnWidths'] = widths.map do |item|
           if item.is_a?(Hash)
             GoodData::Helpers.deep_dup(item).tap do |i|
-              if i['locator'][0].key?('attributeHeaderLocator')
+              if i['locator'].length > 0 && ['locator'][0].key?('attributeHeaderLocator')
                 i['locator'][0]['attributeHeaderLocator']['uri'].gsub!("[#{uri_what}]", "[#{uri_for_what}]")
               end
             end
@@ -374,9 +371,9 @@ module GoodData
       end
 
       if result.empty?
-        client.create(EmptyResult, result)
+        client.create(ReportDataResult, data: [], top: 0, left: 0, project: project)
       else
-        client.create(ReportDataResult, result)
+        ReportDataResult.from_xtab(result, client: client, project: project)
       end
     end
   end

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

@@ -1,4 +1,8 @@
 # encoding: UTF-8
+#
+# Copyright (c) 2010-2015 GoodData Corporation. All rights reserved.
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
 
 require_relative '../metadata'
 

data/lib/gooddata/models/model.rb

@@ -1,4 +1,8 @@
 # encoding: UTF-8
+#
+# Copyright (c) 2010-2015 GoodData Corporation. All rights reserved.
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
 
 require_relative '../core/rest'
 
@@ -131,6 +135,22 @@ module GoodData
 
       # Load given file into a data set described by the given schema
       def upload_data(path, project_blueprint, dataset, options = { :client => GoodData.connection, :project => GoodData.project })
+        data = [
+          {
+            data: path,
+            dataset: dataset,
+            options: options
+          }
+        ]
+        GoodData::Model.upload_multiple_data(data, project_blueprint, options)
+      end
+
+      # Uploads multiple data sets using batch upload interface
+      # @param data [String|Array] Input data
+      # @param project_blueprint [ProjectBlueprint] Project blueprint
+      # @param options [Hash] Additional options
+      # @return [Hash] Batch upload result
+      def upload_multiple_data(data, project_blueprint, options = { :client => GoodData.connection, :project => GoodData.project })
         client = options[:client]
         fail ArgumentError, 'No :client specified' if client.nil?
 
@@ -139,25 +159,18 @@ module GoodData
 
         project = GoodData::Project[p, options]
         fail ArgumentError, 'Wrong :project specified' if project.nil?
-        # path = if path =~ URI.regexp
-        #   Tempfile.open('remote_file') do |temp|
-        #     temp << open(path).read
-        #     temp.flush
-        #     # GoodData::Model.upload_data(path, to_manifest(mode))
-        #   end
-        #
-        # else
-        #   # GoodData::Model.upload_data(path, to_manifest(mode))
-        #   # upload_data(path, mode)
-        # end
-
-        mode = options[:mode] || 'FULL'
-        manifest = GoodData::Model::ToManifest.dataset_to_manifest(project_blueprint, dataset, mode)
+
         project = options[:project] || GoodData.project
 
-        path = path.path if path.respond_to? :path
-        inline_data = path.is_a?(String) ? false : true
-        csv_header = nil
+        manifest = {
+
+          'dataSetSLIManifestList' => data.map do |d|
+            mode = d[:options] && d[:options][:mode] ? d[:options][:mode] : options[:mode] || 'FULL'
+            GoodData::Model::ToManifest.dataset_to_manifest(project_blueprint, d[:dataset], mode)
+          end
+        }
+
+        csv_headers = []
 
         # create a temporary zip file
         dir = Dir.mktmpdir
@@ -165,16 +178,28 @@ module GoodData
           Zip::File.open("#{dir}/upload.zip", Zip::File::CREATE) do |zip|
             # TODO: make sure schema columns match CSV column names
             zip.get_output_stream('upload_info.json') { |f| f.puts JSON.pretty_generate(manifest) }
-            if inline_data
-              csv_header = path.first
-              zip.get_output_stream('data.csv') do |f|
-                path.each do |row|
-                  f.puts row.to_csv
+
+            data.zip(manifest['dataSetSLIManifestList']).each do |item|
+              path = item[0][:data]
+              path = item[0][:data].path if item[0][:data].respond_to? :path
+              inline_data = path.is_a?(String) ? false : true
+              csv_header = nil
+
+              filename = item[1]['dataSetSLIManifest']['file']
+
+              if inline_data
+                csv_header = path.first
+                zip.get_output_stream(filename) do |f|
+                  path.each do |row|
+                    f.puts row.to_csv
+                  end
                 end
+              else
+                csv_header = File.open(path, &:gets).split(',')
+                zip.add(filename, path)
               end
-            else
-              csv_header = File.open(path, &:gets).split(',')
-              zip.add('data.csv', path)
+
+              csv_headers << csv_header
             end
           end
 
@@ -183,40 +208,64 @@ module GoodData
         ensure
           FileUtils.rm_rf dir
         end
+        csv_headers.flatten!
 
         # kick the load
         pull = { 'pullIntegration' => File.basename(dir) }
         link = project.md.links('etl')['pull2']
-        task = client.post(link, pull, :info_message => "Starting the data load from user storage to dataset '#{dataset}'.")
+
+        # TODO: List uploaded datasets
+        task = client.post(link, pull, :info_message => 'Starting the data load from user storage to dataset.')
 
         res = client.poll_on_response(task['pull2Task']['links']['poll'], :info_message => 'Getting status of the dataload task.') do |body|
           body['wTaskStatus']['status'] == 'RUNNING' || body['wTaskStatus']['status'] == 'PREPARED'
         end
 
-        if res['wTaskStatus']['status'] == 'ERROR' # rubocop:disable Style/GuardClause
+        if res['wTaskStatus']['status'] == 'ERROR'
           s = StringIO.new
-          client.download_from_user_webdav(File.basename(dir) + '/upload_status.json', s, :client => client, :project => project)
+
+          messages = res['wTaskStatus']['messages'] || []
+          messages.each do |msg|
+            GoodData.logger.error(JSON.pretty_generate(msg))
+          end
+
+          begin
+            client.download_from_user_webdav(File.basename(dir) + '/upload_status.json', s, :client => client, :project => project)
+          rescue => e
+            raise "Unable to download upload_status.json from remote server, reason: #{e.message}"
+          end
+
           js = MultiJson.load(s.string)
-          manifest_cols =  manifest['dataSetSLIManifest']['parts'].map { |c| c['columnName'] }
+          manifests = manifest['dataSetSLIManifestList'].map do |m|
+            m['dataSetSLIManifest']
+          end
+
+          parts = manifests.map do |m|
+            m['parts']
+          end
+
+          manifest_cols = parts.flatten.map { |c| c['columnName'] }
 
           # extract some human readable error message from the webdav file
-          manifest_extra = manifest_cols - csv_header
-          csv_extra = csv_header - manifest_cols
+          manifest_extra = manifest_cols - csv_headers
+          csv_extra = csv_headers - manifest_cols
 
           error_message = begin
-                            js['error']['message'] % js['error']['parameters']
-                          rescue NoMethodError, ArgumentError
-                            ''
-                          end
+            js['error']['message'] % js['error']['parameters']
+          rescue NoMethodError, ArgumentError
+            ''
+          end
           m = "Load failed with error '#{error_message}'.\n"
           m += "Columns that should be there (manifest) but aren't in uploaded csv: #{manifest_extra}\n" unless manifest_extra.empty?
           m += "Columns that are in csv but shouldn't be there (manifest): #{csv_extra}\n" unless csv_extra.empty?
-          m += "Columns in the uploaded csv: #{csv_header}\n"
+          m += "Columns in the uploaded csv: #{csv_headers}\n"
           m += "Columns in the manifest: #{manifest_cols}\n"
           m += "Original message:\n#{JSON.pretty_generate(js)}\n"
           m += "Manifest used for uploading:\n#{JSON.pretty_generate(manifest)}"
           fail m
         end
+
+        res
       end
 
       def merge_dataset_columns(a_schema_blueprint, b_schema_blueprint)

data/lib/gooddata/models/models.rb

@@ -1,4 +1,8 @@
 # encoding: UTF-8
+#
+# Copyright (c) 2010-2015 GoodData Corporation. All rights reserved.
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
 
 require 'pathname'
 

data/lib/gooddata/models/module_constants.rb

@@ -1,4 +1,8 @@
 # encoding: UTF-8
+#
+# Copyright (c) 2010-2015 GoodData Corporation. All rights reserved.
+# 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
   module Model