gooddata 0.6.0.pre3 → 0.6.0.pre4

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

@@ -1,14 +1,17 @@
 require 'benchmark'
 
-class BenchMiddleware < GoodData::Bricks::Middleware
-
-  def call(params)
-    puts "Starting timer"
-    result = nil
-    report = Benchmark.measure { result = @app.call(params) }
-    puts "Stopping timer"
-    pp report
-    result
-  end
+module GoodData::Bricks
+
+  class BenchMiddleware < GoodData::Bricks::Middleware
 
-end
+    def call(params)
+      puts "Starting timer"
+      result = nil
+      report = Benchmark.measure { result = @app.call(params) }
+      puts "Stopping timer"
+      pp report
+      result
+    end
+
+  end
+end

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

@@ -1,22 +1,27 @@
 require 'gooddata'
 
-class GoodDataMiddleware < GoodData::Bricks::Middleware
+module GoodData::Bricks
+  class GoodDataMiddleware < GoodData::Bricks::Middleware
 
-  def call(params)
-    logger = params[:gdc_logger]
-    token_name = :GDC_SST
-    protocol_name = :GDC_PROTOCOL
-    server_name = :GDC_SERVER
+    def call(params)
+      logger = params[:gdc_logger]
+      token_name = :GDC_SST
+      protocol_name = :GDC_PROTOCOL
+      server_name = :GDC_SERVER
+      project_id = params[:GDC_PROJECT_ID]
 
-    fail "SST (SuperSecureToken) not present in params" if params[token_name].nil?
-    logger.info "Connecting to GD with SST"
-    server = if !params[protocol_name].empty? && !params[server_name].empty?
-      params[protocol_name] + "://" + params[server_name]
+      fail "SST (SuperSecureToken) not present in params" if params[token_name].nil?
+      logger.info "Connecting to GD with SST"
+      server = if !params[protocol_name].empty? && !params[server_name].empty?
+        params[protocol_name] + "://" + params[server_name]
+      end
+
+      GoodData.connect_with_sst(params[token_name], {:server => server})
+      GoodData.logger = logger
+      GoodData.with_project(project_id) do |p|
+        @app.call(params)
+      end
     end
 
-    GoodData.connect_with_sst(params[token_name], {:server => server})
-    GoodData.logger = logger
-    @app.call(params)
   end
-
-end
+end

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

@@ -1,14 +1,16 @@
 require 'logger'
 
-class LoggerMiddleware < GoodData::Bricks::Middleware
+module GoodData::Bricks
+  class LoggerMiddleware < GoodData::Bricks::Middleware
 
-  def call(params)
-    logger = params[:gdc_logger] = params[:GDC_LOGGER_FILE].nil? ? Logger.new(STDOUT) : Logger.new(params[:GDC_LOGGER_FILE])
-    logger.info("Pipeline starts")
+    def call(params)
+      logger = params[:gdc_logger] = params[:GDC_LOGGER_FILE].nil? ? Logger.new(STDOUT) : Logger.new(params[:GDC_LOGGER_FILE])
+      logger.info("Pipeline starts")
 
-    returning(@app.call(params)) do |result|
-      logger.info("Pipeline ending")
+      returning(@app.call(params)) do |result|
+        logger.info("Pipeline ending")
+      end
     end
-  end
 
+  end
 end

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

@@ -1,12 +1,14 @@
-class STDOUTLoggingMiddleware < GoodData::Bricks::Middleware
+module GoodData::Bricks
+  class STDOUTLoggingMiddleware < GoodData::Bricks::Middleware
 
-  def call(params)
-    logger = Logger.new(STDOUT)
-    params[:logger] = logger
-    logger.info("Pipeline starting with STDOUT logger")
-    returning(@app.call(params)) do
-      logger.info("Pipeline ending")
+    def call(params)
+      logger = Logger.new(STDOUT)
+      params[:logger] = logger
+      logger.info("Pipeline starting with STDOUT logger")
+      returning(@app.call(params)) do
+        logger.info("Pipeline ending")
+      end
     end
-  end
 
-end
+  end
+end

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

@@ -1,19 +1,22 @@
 require 'twitter'
 
-class TwitterMiddleware < GoodData::Bricks::Middleware
+module GoodData::Bricks
+  
+  class TwitterMiddleware < GoodData::Bricks::Middleware
 
-  def call(params)
+    def call(params)
     
-    client = Twitter::REST::Client.new do |config|
-      config.consumer_key        = params[:twitter_consumer_key]
-      config.consumer_secret     = params[:twitter_consumer_secret]
-      config.access_token        = params[:twitter_access_token]
-      config.access_token_secret = params[:twitter_access_token_secret]
-    end
+      client = Twitter::REST::Client.new do |config|
+        config.consumer_key        = params[:twitter_consumer_key]
+        config.consumer_secret     = params[:twitter_consumer_secret]
+        config.access_token        = params[:twitter_access_token]
+        config.access_token_secret = params[:twitter_access_token_secret]
+      end
 
-    returning(@app.call(params)) do |result|
-      client.update(result)
+      returning(@app.call(params)) do |result|
+        client.update(result)
+      end
     end
-  end
 
-end
+  end
+end

data/lib/gooddata/client.rb

@@ -119,6 +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?
       old_project = GoodData.project
       begin
         GoodData.use(project)
@@ -239,6 +240,10 @@ module GoodData
       connection.delete path, options
     end
 
+    def upload_webdav(file, options={})
+      connection.upload(file, options[:directory], options)
+    end
+
     def poll(result, key, options={})
       sleep_interval = options[:sleep_interval] || 10
       link = result[key]["links"]["poll"]

data/lib/gooddata/connection.rb

@@ -199,7 +199,7 @@ module GoodData
     def upload(file, dir = nil, options={})
       ensure_connection
       # We should have followed a link. If it was correct.
-      
+
       stage_url = @options[:webdav_server] || @url.sub(/\./, '-di.')
       # Make a directory, if needed
       if dir then
@@ -208,29 +208,25 @@ module GoodData
         GoodData.logger.debug "#{method}: #{url}"
         begin
           # first check if it does exits
-          RestClient::Request.execute(
+          RestClient::Request.execute({
             :method => method,
             :url => url,
-            :user => @username,
-            :password => @password,
             :timeout => @options[:timeout],
             :headers => {
               :user_agent => GoodData.gem_version_string
-            }
+            }}.merge(cookies)
           )
         rescue RestClient::Exception => e
           if e.http_code == 404 then
             method = :mkcol
             GoodData.logger.debug "#{method}: #{url}"
-            RestClient::Request.execute(
+            RestClient::Request.execute({
               :method => method,
               :url => url,
-              :user => @username,
-              :password => @password,
               :timeout => @options[:timeout],
               :headers => {
                 :user_agent => GoodData.gem_version_string
-              }
+              }}.merge(cookies)
             )
           end
         end
@@ -242,17 +238,18 @@ module GoodData
       filename = options[:filename] || options[:stream] ? "randome-filename.txt" : File.basename(file)
 
       # Upload the file
-      RestClient::Request.execute(
+      req = RestClient::Request.new({
         :method => :put,
         :url => stage_url + STAGE_PATH + dir + '/' + filename,
-        :user => @username,
-        :password => @password,
         :timeout => @options[:timeout],
         :headers => {
           :user_agent => GoodData.gem_version_string,
         },
-        :payload => payload
-      )
+        :payload => payload,
+        :raw_response => true
+      }.merge(cookies))
+      resp = req.execute
+      pp e.inspect
     end
 
     def download(what, where)

data/lib/gooddata/version.rb

@@ -1,3 +1,3 @@
 module GoodData
-  VERSION = "0.6.0.pre3"
+  VERSION = "0.6.0.pre4"
 end

metadata

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