gooddata 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a5821b611d4899bf0ec0a279e73bbfc3b0e5e9b
-  data.tar.gz: deafc64492f11e9c7c130d2e75e06e7c593382f9
+  metadata.gz: 215639f8217dd917939a3b1d6174b99fb72c8b95
+  data.tar.gz: 2adebe715e73ba4391123a4c61495130d79ae409
 SHA512:
-  metadata.gz: 8b3fe636b75acba1cdd646e3a4080b80a6c62804192be997c6ae3a0c61431bc6027804b3487c191d3bd5d2773f65e9615c30bba89579ee8fc6dad427fe865a36
-  data.tar.gz: b289c6b6c77ed47b2bf8c023a187b99b72cf2215977bb608d4d733b7e46a9e1f2b217f3c2ce921437cd7432474080c18b2de3d1c2e72a25feb9327b1e35ab886
+  metadata.gz: cc87893e984b96990174e8dbd257361e3ee86d16ffda17d199d635bc66b6070665decd5bc0ed6d64e1730185130d97b9d814f23479158864eadbbeea250ad582
+  data.tar.gz: ebcdbeca2dc7ccb94a5a36a6e718277e9bfcf40ac9bc0ae23bc8280ff402868931d941076f64e9e35631a9983df380a6ed07bbe11586e526df5c49490866f943

data/.travis.yml

@@ -10,8 +10,10 @@ env:
 
 rvm:
   - 1.9.3
-  - ruby-head
+  # - ruby-head
   - jruby-19mode
+  # - rbx-2.2.9
+  - 2.1
 
 before_install:
   - gem update --system

data/CHANGELOG.markdown

@@ -0,0 +1,6 @@
+# GoodData Ruby SDK Changelog
+
+## 0.6.3
+- Able to do save_as on metadata objects (Report, Metric, Dashboard)
+- Model is now not created through build and update if it is not passing validations
+- Added a setter for identifier on Metadata Object

data/README.md

@@ -9,6 +9,7 @@ The best documentation for the GoodData API can be found using these resources:
  * http://docs.gooddata.apiary.io/
  * http://developer.gooddata.com/api
  * https://secure.gooddata.com/gdc
+ * http://rubydoc.info/gems/gooddata/frames
 
 ## Status
 

data/gooddata.gemspec

@@ -52,5 +52,6 @@ Gem::Specification.new do |s|
   s.add_dependency "restforce", "~> 1.4.3"
   s.add_dependency "rest-client", "~> 1.6.7"
   s.add_dependency "rubyzip", "~> 1.1.0"
-  s.add_dependency "salesforce_bulk", "~> 1.0.3"
+  s.add_dependency "salesforce_bulk_query", "~> 0.0"
+  s.add_dependency "aws-sdk", "~> 1.45"
 end

data/lib/gooddata.rb

@@ -10,11 +10,14 @@ require_relative 'gooddata/commands/commands'
 require_relative 'gooddata/core/core'
 require_relative 'gooddata/data/data'
 require_relative 'gooddata/exceptions/exceptions'
+require_relative 'gooddata/helpers/helpers'
 require_relative 'gooddata/models/models'
 
 # Files
 require_relative 'gooddata/client'
 require_relative 'gooddata/connection'
 require_relative 'gooddata/extract'
-require_relative 'gooddata/helpers'
 require_relative 'gooddata/version'
+
+# Extensions
+require_relative 'gooddata/extensions/extensions'

data/lib/gooddata/bricks/base_downloader.rb

@@ -1,12 +1,14 @@
 # encoding: UTF-8
 
 require 'pathname'
+require 'aws'
 
 module GoodData
   module Bricks
     class BaseDownloader
       def initialize(params)
         @params = params
+        @logger = @params['GDC_LOGGER']
       end
 
       def pre_process(meta)
@@ -14,34 +16,40 @@ module GoodData
       end
 
       def download
-        puts 'would download data'
+        @logger.info 'would download data' if @logger
         []
       end
 
       def backup(meta)
-        puts 'would send a backup list of files to backup'
-        files = meta.reduce([]) do |a, e|
-          a << e[:filename]
+        @logger.info 'would send a backup list of files to backup' if @logger
+
+        files = meta['objects'].map { |k, o| o }.reduce([]) do |a, e|
+          a + e['filenames']
         end
 
-        bucket_name = @params[:s3_backup_bucket_name]
+        bucket_name = @params['s3_backup_bucket_name']
 
         s3 = AWS::S3.new(
-          :access_key_id => @params[:aws_access_key_id],
-          :secret_access_key => @params[:aws_secret_access_key])
+          :access_key_id => @params['aws_access_key_id'],
+          :secret_access_key => @params['aws_secret_access_key']
+        )
 
         bucket = s3.buckets[bucket_name]
         bucket = s3.buckets.create(bucket_name) unless bucket.exists?
 
         files.each do |file|
-          obj = bucket.objects[file]
-          obj.write(Pathname.new(file))
+          file_path =  Pathname.new(file)
+          target_path = Pathname.new(@params['s3_backup_path'] || '') + file_path.basename
+          obj = bucket.objects[target_path]
+          obj.write(file_path)
+          @logger.info "Backed up file #{file_path} to s3 #{target_path}" if @logger
         end
+
         meta
       end
 
       def post_process(meta)
-        puts 'Maybe some postprocessing'
+        @logger.info 'Maybe some postprocessing' if @logger
         meta
       end
 
@@ -49,19 +57,25 @@ module GoodData
       def run
         downloaded_data = download
         downloaded_data = pre_process(downloaded_data)
-        backup(downloaded_data)
+        backup(downloaded_data) unless @params['skip_backup']
+
         downloaded_data = post_process(downloaded_data)
 
-        accumulated_state = downloaded_data.reduce([]) do |memo, item|
-          item.key?(:state) ? memo.concat(item[:state]) : memo
-        end
-        accumulated_state.each do |item|
-          key = item[:key]
-          val = item[:value]
+        # save the state - whatever is in the return value of #download in the :persist key .. to project metadata
+        if downloaded_data[:persist]
+          accumulated_state = downloaded_data[:persist].reduce([]) do |memo, item|
+            item.key?(:state) ? memo.concat(item[:state]) : memo
+          end
+          accumulated_state.each do |item|
+            key = item[:key]
+            val = item[:value]
 
-          puts "Saving metadata #{key} => #{val}"
-          GoodData::ProjectMetadata[key] = val
+            @logger.info "Saving metadata #{key} => #{val}" if @logger
+            GoodData::ProjectMetadata[key] = val
+          end
         end
+
+        post_process(downloaded_data)
       end
     end
   end

data/lib/gooddata/bricks/middleware/bulk_salesforce_middleware.rb

@@ -1,37 +1,61 @@
 # encoding: UTF-8
 
-require 'salesforce_bulk'
+require 'salesforce_bulk_query'
 
 require_relative 'base_middleware'
 
 module GoodData
   module Bricks
     class BulkSalesforceMiddleware < Bricks::Middleware
+      DEFAULT_VERSION = '29.0'
+
       def call(params)
-        username = params[:salesforce_username]
-        password = params[:salesforce_password]
-        token = params[:salesforce_token]
-        client_id = params[:salesforce_client_id]
-        client_secret = params[:salesforce_client_secret]
-        host = params[:salesforce_host]
-
-        credentials = if username && password && token
-                        {
-                          :username => username,
-                          :password => password,
-                          :security_token => token
-                        }
-                      end
-
-        client = if credentials
-                   credentials.merge!(
-                     :client_id => client_id,
-                     :client_secret => client_secret
-                   )
-                   credentials[:host] = host unless host.nil?
-                   SalesforceBulk::Api.new(credentials[:username], credentials[:password] + credentials[:security_token])
-                 end
-        @app.call(params.merge(:salesforce_bulk_client => client))
+        username = params['salesforce_username']
+        password = params['salesforce_password']
+        token = params['salesforce_token']
+        oauth_refresh_token = params['salesforce_oauth_refresh_token']
+
+        client_id = params['salesforce_client_id']
+        client_secret = params['salesforce_client_secret']
+        host = params['salesforce_host']
+        version = params['salesforce_api_version'] || DEFAULT_VERSION
+
+        app_info = {
+          :client_id => client_id,
+          :client_secret => client_secret
+        }
+        app_info[:host] = host unless host.nil?
+        salesforce = nil
+        client_params = nil
+
+        if username && password && token
+          # use basic auth
+          client_params = {
+            :username => username,
+            :password => password,
+            :security_token => token
+          }.merge(app_info)
+
+        elsif oauth_refresh_token
+          # use oauth
+          client_params = {
+            :refresh_token => oauth_refresh_token
+          }.merge(app_info)
+        end
+
+        if client_params
+
+          client_params[:api_version] = version
+
+          client = params['salesforce_client'] || Restforce.new(client_params)
+          client.authenticate!
+
+          salesforce = SalesforceBulkQuery::Api.new(client, :logger => params['GDC_LOGGER'])
+          # SalesforceBulkQuery adds its own Restforce logging so turn it off
+          Restforce.log = false if params['GDC_LOGGER']
+        end
+
+        @app.call(params.merge('salesforce_bulk_client' => salesforce))
       end
     end
   end

data/lib/gooddata/bricks/middleware/restforce_middleware.rb

@@ -7,40 +7,43 @@ require_relative 'base_middleware'
 module GoodData
   module Bricks
     class RestForceMiddleware < Bricks::Middleware
+      DEFAULT_VERSION = '29.0'
+
       def call(params)
-        username = params[:salesforce_username]
-        password = params[:salesforce_password]
-        token = params[:salesforce_token]
-        client_id = params[:salesforce_client_id]
-        client_secret = params[:salesforce_client_secret]
-        oauth_token = params[:salesforce_oauth_token]
-        refresh_token = params[:salesforce_refresh_token]
-        host = params[:salesforce_host]
-
-        if username && password && token
-          credentials = {
-            :username => username,
-            :password => password,
-            :security_token => token
-          }
-        elsif oauth_token && refresh_token
-          {
-            :oauth_token => oauth_token,
-            :refresh_token => refresh_token
-          }
-        end
-
-        if credentials
-          client = credentials.merge!(
-            :client_id => client_id,
-            :client_secret => client_secret
-          )
-          credentials[:host] = host unless host.nil?
-
-          Restforce.log = true if params[:salesforce_client_logger]
-          Restforce.new(credentials)
-        end
-        @app.call(params.merge(:salesforce_client => client))
+        username = params['salesforce_username']
+        password = params['salesforce_password']
+        token = params['salesforce_token']
+        client_id = params['salesforce_client_id']
+        client_secret = params['salesforce_client_secret']
+        oauth_refresh_token = params['salesforce_oauth_refresh_token']
+        host = params['salesforce_host']
+        version = params['salesforce_api_version'] || DEFAULT_VERSION
+
+        credentials = if username && password && token
+                        {
+                          :username => username,
+                          :password => password,
+                          :security_token => token
+                        }
+                      elsif (oauth_refresh_token) && (!oauth_refresh_token.empty?)
+                        {
+                          :refresh_token => oauth_refresh_token
+                        }
+                      end
+
+        client = if credentials
+                   credentials.merge!(
+                                        :client_id => client_id,
+                                        :client_secret => client_secret
+                                      )
+                   credentials[:host] = host unless host.nil?
+                   credentials[:api_version] = version
+
+                   Restforce.log = true if params['salesforce_client_logger']
+
+                   Restforce.new(credentials)
+                 end
+        @app.call(params.merge('salesforce_client' => client))
       end
     end
   end

data/lib/gooddata/cli/commands/project_cmd.rb

@@ -53,10 +53,12 @@ GoodData::CLI.module_eval do
     c.desc 'Create a gooddata project'
     c.command :create do |create|
       create.action do |global_options, options, args|
-        title = ask 'Project name'
-        summary = ask('Project summary') { |q| q.default = '' }
-        template = ask('Project template')
-        token = ask('token')
+        opts = options.merge(global_options)
+
+        title = args[0] || ask('Project name')
+        summary = args[1] || ask('Project summary') { |q| q.default = '' }
+        template = args[2] || ask('Project template')
+        token = opts[:token] || ask('token')
 
         opts = options.merge(global_options)
         GoodData.connect(opts)

data/lib/gooddata/client.rb

@@ -4,7 +4,7 @@ require 'csv'
 
 require_relative 'version'
 require_relative 'connection'
-require_relative 'helpers'
+require_relative 'helpers/helpers'
 
 FasterCSV = CSV
 

data/lib/gooddata/commands/api.rb

@@ -25,7 +25,7 @@ module GoodData
         # Test of login
         def test
           if GoodData.test_login
-            puts "Succesfully logged in as #{GoodData.profile.user}"
+            puts "Succesfully logged in as #{GoodData.profile.email}"
           else
             puts 'Unable to log in to GoodData server!'
           end

data/lib/gooddata/commands/auth.rb

@@ -4,7 +4,7 @@ require 'highline/import'
 require 'multi_json'
 
 require_relative '../cli/terminal'
-require_relative '../helpers'
+require_relative '../helpers/helpers'
 
 module GoodData
   module Command

data/lib/gooddata/connection.rb

@@ -21,16 +21,19 @@ module GoodData
     #
     def connect(options = nil, second_options = nil, third_options = {})
       GoodData.logger.debug 'GoodData#connect'
-
-      if options.is_a? Hash
-        fail 'You have to provide login and password' if (options[:login].nil? || options[:login].empty?) && (options[:password].nil? || options[:password].empty?)
-        threaded[:connection] = Connection.new(options[:login], options[:password], options)
-        GoodData.project = options[:project] if options[:project]
-      elsif options.is_a?(String) && second_options.is_a?(String)
-        fail 'You have to provide login and password' if (options.nil? || options.empty?) && (second_options.nil? || second_options.empty?)
-        threaded[:connection] = Connection.new(options, second_options, third_options)
-      end
-
+      threaded[:connection] = if options.is_a? Hash
+                                fail 'You have to provide login and password' if (options[:login].nil? || options[:login].empty?) && (options[:password].nil? || options[:password].empty?)
+                                Connection.new(options[:login], options[:password], options)
+                                conn = Connection.new(options[:login], options[:password], options)
+                                GoodData.project = options[:project] if options[:project]
+                                conn
+                              elsif options.is_a?(String) && second_options.is_a?(String)
+                                fail 'You have to provide login and password' if (options.nil? || options.empty?) && (second_options.nil? || second_options.empty?)
+                                Connection.new(options, second_options, third_options)
+                              elsif options.nil? && second_options.nil?
+                                p = GoodData::Command::Auth.read_credentials
+                                Connection.new(p[:login] || p[:username], p[:password], p)
+                              end
       threaded[:connection]
     end
 

data/lib/gooddata/core/connection.rb

@@ -377,7 +377,7 @@ module GoodData
     def scrub_params(params, keys)
       keys = keys.reduce([]) { |a, e| a.concat([e.to_s, e.to_sym]) }
 
-      new_params = Marshal.load(Marshal.dump(params))
+      new_params = params.deep_dup
       GoodData::Helpers.hash_dfs(new_params) do |k, key|
         keys.each do |key_to_scrub|
           k[key_to_scrub] = ('*' * k[key_to_scrub].length) if k && k.key?(key_to_scrub) && k[key_to_scrub]

data/lib/gooddata/core/user.rb

@@ -3,17 +3,25 @@
 require_relative 'connection'
 require_relative 'threaded'
 
+require_relative '../models/profile'
+
 module GoodData
   class << self
     # Attempts to log in
+    #
+    # @return [Boolean] True if logged in else false
     def test_login
       connection.connect!
       connection.logged_in?
     end
 
-    # Returns the currently logged in user Profile.
-    def profile
-      threaded[:profile] ||= Profile.load
+    # Gets currently logged user
+    #
+    # @return [GoodData::Profile] User Profile
+    def user
+      GoodData::Profile.current
     end
+
+    alias_method :profile, :user
   end
 end