gooddata 0.6.0.pre5 → 0.6.0.pre6

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

@@ -10,17 +10,36 @@ module GoodData::Bricks
       token         = params[:salesforce_token]
       client_id     = params[:salesforce_client_id]
       client_secret = params[:salesforce_client_secret]
-      
-      Restforce.log = true if params[:salesforce_client_logger]
+      oauth_token   = params[:salesforce_oauth_token]
+      refresh_token = params[:salesforce_refresh_token]
+      host          = params[:salesforce_host]
+
+      credentials = {}
 
-      client = Restforce.new(
-        :username       => username,
-        :password       => password,
-        :security_token => token,
+      credentials = if (username && password && token)
+        {
+          :username       => username,
+          :password       => password,
+          :security_token => token
+        }
+      elsif (oauth_token && refresh_token)
+        {
+          :oauth_token    => oauth_token,
+          :refresh_token  => refresh_token
+        }
+      else
+        fail "Salesforce middleware failed while trying to log in. Either salesforce_username, salesforce_password, salesforce_token or salesforce_oauth_token, salesforce_refresh_token are needed. Additionally you have to specify salesforce_client_id and salesforce_client_secret parameters in both cases"
+      end
 
+
+      credentials.merge!({
         :client_id      => client_id,
-        :client_secret  => client_secret)
+        :client_secret  => client_secret,
+      })
+      credentials[:host] = host unless host.nil?
 
+      Restforce.log = true if params[:salesforce_client_logger]
+      client = Restforce.new(credentials)
       @app.call(params.merge(:salesforce_client => client))
     end
 

data/lib/gooddata/client.rb

@@ -119,7 +119,7 @@ module GoodData
     end
 
     def with_project(project, &bl)
-      fail "You have to specify a project when using with_project" if project.nil? || project.empty?
+      fail "You have to specify a project when using with_project" if project.nil? || (project.is_a?(String) && project.empty?)
       old_project = GoodData.project
       begin
         GoodData.use(project)
@@ -233,8 +233,22 @@ module GoodData
       connection.delete path, options
     end
 
-    def upload_webdav(file, options={})
-      connection.upload(file, options[:directory], options)
+    def upload_to_user_webdav(file, options={})
+      u = URI(connection.options[:webdav_server] || GoodData.project.links["uploads"])
+      url = URI.join(u.to_s.chomp(u.path.to_s), "/uploads/")
+      connection.upload(file, options.merge({
+        :directory    => options[:directory],
+        :staging_url  => url
+      }))
+    end
+
+    def upload_to_project_webdav(file, options={})
+      u = URI(connection.options[:webdav_server] || GoodData.project.links["uploads"])
+      url = URI.join(u.to_s.chomp(u.path.to_s), "/project-uploads/", "#{GoodData.project.pid}/")
+      connection.upload(file, options.merge({
+        :directory    => options[:directory],
+        :staging_url  => url
+      }))
     end
 
     def poll(result, key, options={})

data/lib/gooddata/commands/process.rb

@@ -52,7 +52,7 @@ module GoodData::Command
           end
         end
 
-        GoodData.connection.upload(temp.path)
+        GoodData.upload_to_user_webdav(temp.path)
         process_id = options[:process]
         
         data = {

data/lib/gooddata/connection.rb

@@ -32,10 +32,9 @@ module GoodData
     DEFAULT_URL = 'https://secure.gooddata.com'
     LOGIN_PATH = '/gdc/account/login'
     TOKEN_PATH = '/gdc/account/token'
-    STAGE_PATH = '/uploads/'
 
     attr_reader(:auth_token, :url)
-    attr_accessor :status
+    attr_accessor :status, :options
 
 
     # Options:
@@ -196,14 +195,15 @@ module GoodData
     # Uploads a file to GoodData server
     # /uploads/ resources are special in that they use a different
     # host and a basic authentication.
-    def upload(file, dir = nil, options={})
+    def upload(file, options={})
       ensure_connection
-      # We should have followed a link. If it was correct.
 
-      stage_url = @options[:webdav_server] || @url.sub(/\./, '-di.')
+      dir = options[:directory] || ''
+      staging_uri = options[:staging_url].to_s
+      url = dir.empty? ? staging_uri : URI.join(staging_uri, "#{dir}/").to_s
+      
       # Make a directory, if needed
-      if dir then
-        url = stage_url + STAGE_PATH + dir + '/'
+      unless dir.empty? then
         method = :get
         GoodData.logger.debug "#{method}: #{url}"
         begin
@@ -230,17 +230,17 @@ module GoodData
             )
           end
         end
-      else
-        dir = "."
       end
 
       payload = options[:stream] ? "file" : File.read(file)
       filename = options[:filename] || options[:stream] ? "randome-filename.txt" : File.basename(file)
 
       # Upload the file
+      puts "uploading the file #{URI.join(url, filename).to_s}"
+      
       req = RestClient::Request.new({
         :method => :put,
-        :url => stage_url + STAGE_PATH + dir + '/' + filename,
+        :url => URI.join(url, filename).to_s,
         :timeout => @options[:timeout],
         :headers => {
           :user_agent => GoodData.gem_version_string,
@@ -249,7 +249,7 @@ module GoodData
         :raw_response => true
       }.merge(cookies))
       resp = req.execute
-      pp e.inspect
+      true
     end
 
     def download(what, where)

data/lib/gooddata/model.rb

@@ -491,7 +491,7 @@ module GoodData
         end
 
         # upload it
-        GoodData.connection.upload "#{dir}/upload.zip", File.basename(dir)
+        GoodData.upload_to_user_webdav("#{dir}/upload.zip", :directory => File.basename(dir))
         FileUtils.rm_rf dir
 
         # kick the load

data/lib/gooddata/models/project.rb

@@ -189,6 +189,10 @@ module GoodData
       raw_data["project"]
     end
 
+    def links
+      data["links"]
+    end
+
     def to_json
       raw_data.to_json
     end

data/lib/gooddata/version.rb

@@ -1,3 +1,3 @@
 module GoodData
-  VERSION = "0.6.0.pre5"
+  VERSION = "0.6.0.pre6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gooddata
 version: !ruby/object:Gem::Version
-  version: 0.6.0.pre5
+  version: 0.6.0.pre6
   prerelease: 6
 platform: ruby
 authors: