gooddata 0.5.1 → 0.5.2

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

data/lib/gooddata/client.rb

@@ -129,8 +129,8 @@ module GoodData
     # === Examples
     #
     #   GoodData.get '/gdc/projects'
-    def get(path)
-      connection.get(path)
+    def get(path, options = {})
+      connection.get(path, options)
     end
 
     # Performs a HTTP POST request.
@@ -145,8 +145,8 @@ module GoodData
     # === Examples
     #
     #   GoodData.post '/gdc/projects', { ... }
-    def post(path, data)
-      connection.post path, data
+    def post(path, data, options = {})
+      connection.post path, data, options
     end
 
     # Performs a HTTP DELETE request.
@@ -160,8 +160,8 @@ module GoodData
     # === Examples
     #
     #   GoodData.delete '/gdc/project/1'
-    def delete(path)
-      connection.delete path
+    def delete(path, options = {})
+      connection.delete path, options
     end
 
     def test_login

data/lib/gooddata/connection.rb

@@ -32,7 +32,7 @@ module GoodData
     DEFAULT_URL = 'https://secure.gooddata.com'
     LOGIN_PATH = '/gdc/account/login'
     TOKEN_PATH = '/gdc/account/token'
-    STAGE_PATH = '/uploads'
+    STAGE_PATH = '/uploads/'
 
     # Set the GoodData account credentials.
     #
@@ -68,9 +68,11 @@ module GoodData
     #
     #   Connection.new(username, password).get '/gdc/projects'
     def get(path, options = {})
+      pp options
       GoodData.logger.debug "GET #{path}"
       ensure_connection
-      process_response(options) { @server[path].get cookies }
+      b = Proc.new { @server[path].get cookies }
+      response = (options[:process] == false) ? (b.call) : process_response(options, &b)
     end
 
     # Performs a HTTP POST request.
@@ -86,10 +88,11 @@ module GoodData
     #
     #   Connection.new(username, password).post '/gdc/projects', { ... }
     def post(path, data, options = {})
-      payload = data.to_json
+      payload = data.is_a?(Hash) ? data.to_json : data
       GoodData.logger.debug "POST #{path}, payload: #{payload}"
       ensure_connection
-      process_response(options) { @server[path].post payload, cookies }
+      b = Proc.new { @server[path].post payload, cookies }
+      options[:process] == false ? b.call : process_response(options, &b)
     end
 
     # Performs a HTTP DELETE request.
@@ -103,10 +106,11 @@ module GoodData
     # === Examples
     #
     #   Connection.new(username, password).delete '/gdc/project/1'
-    def delete(path)
+    def delete(path, options = {})
       GoodData.logger.debug "DELETE #{path}"
       ensure_connection
-      process_response { @server[path].delete cookies }
+      b = Proc.new { @server[path].delete cookies }
+      options[:process] == false ? b.call : process_response(options, &b)
     end
 
     # Get the cookies associated with the current connection.
@@ -137,19 +141,23 @@ module GoodData
     # /uploads/ resources are special in that they use a different
     # host and a basic authentication.
     def upload(file, dir = nil)
+      ensure_connection
       # We should have followed a link. If it was correct.
       stage_url = DEFAULT_URL.sub(/\./, '-di.')
 
       # Make a directory, if needed
       if dir then
+        method = :mkcol
+        url = stage_url + STAGE_PATH + dir + '/'
+        GoodData.logger.debug "#{method}: #{url}"
         RestClient::Request.execute(
-          :method => :mkcol,
-          :url => stage_url + STAGE_PATH + dir + '/',
+          :method => method,
+          :url => url,
           :user => @username,
           :password => @password,
           :timeout => @options[:timeout],
           :headers => {
-            :user_agent => GoodData.gem_version_string,
+            :user_agent => GoodData.gem_version_string
           }
         )
       end
@@ -204,14 +212,14 @@ module GoodData
       @status = :logged_in
     end
 
-    def process_response(options = {})
+    def process_response(options = {}, &block)
       begin
         begin
-          response = yield
+          response = block.call
         rescue RestClient::Unauthorized
           raise $! if options[:dont_reauth]
           refresh_token
-          response = yield
+          response = block.call
         end
         merge_cookies! response.cookies
         content_type = response.headers[:content_type]
@@ -223,6 +231,7 @@ module GoodData
           GoodData.logger.debug "Response: a zipped stream"
         elsif response.headers[:content_length].to_s == '0'
           result = nil
+          GoodData.logger.debug "Response: Empty response possibly 204"
         else
           raise "Unsupported response content type '%s':\n%s" % [ content_type, response.to_str[0..127] ]
         end

data/lib/gooddata/models/data_result.rb

@@ -17,12 +17,15 @@ module GoodData
     private
     def convert_field(val)
       if val.is_a?(String) && val.match(/^[-+]?\d*\.?\d+(?:[eE][-+]?\d+)?$/)
+        # Is it a Number?
         val = val.scan(/[-+]?\d*\.?\d+(?:[eE][-+]?\d+)?/).first
         val = val.include?('.') ? val.to_f.round : val.to_i
         return val
-      elsif val.nil? || val == ' '
-        return 'N/A'
+      elsif val.nil? || (val.respond_to?(:strip) && val.strip.empty?)
+        #is ia a String
+        return ''
       elsif val.respond_to? :round
+        # No idea what that one does
         return val.round
       else
         return val
@@ -39,14 +42,17 @@ module GoodData
     end
 
     def print
+      puts to_s
+    end
+
+    def to_s
       a = to_table.to_a
       a.transpose.unshift((1..a.length).to_a).each_with_index.map{|col, i|
         col.unshift(i.zero?? nil : i)   # inserts row labels #
         w = col.map{|cell| cell.to_s.length}.max   # w = "column width" #
         col.each_with_index.map{|cell, i|
           i.zero?? cell.to_s.center(w) : cell.to_s.ljust(w)}   # alligns the column #
-      }.transpose.each{|row| puts "[#{row.join(' | ')}]"}
-      nil
+      }.transpose.map{|row| "[#{row.join(' | ')}]"}.join("\n")
     end
 
     def to_table
@@ -55,6 +61,38 @@ module GoodData
 
   end
 
+  class EmptyResult < DataResult
+
+    def initialize(data, options = {})
+      super(data)
+      @options = options
+      assemble_table
+    end
+
+    def to_s
+      "No Data"
+    end
+
+    def assemble_table
+      @table = FasterCSV::Table.new([GoodData::Row.new([],[],false)])
+    end
+
+    def to_table
+      @table
+    end
+
+    def without_column_headers
+      @table
+    end
+
+    def == (otherDataResult)
+      false
+    end
+    
+    def diff(otherDataResult)
+      ['empty']
+    end
+  end
 
   class SFDataResult < DataResult
 
@@ -68,7 +106,14 @@ module GoodData
       sf_data = data[:queryResponse][:result][:records]
       sf_data = sf_data.is_a?(Hash) ? [sf_data] : sf_data
       if @options[:soql]
-        @headers = @options[:soql].strip.match(/^SELECT (.*) FROM/)[1].strip.split(",").map{|item| item.strip.split(/\s/)}.map{|item| item.last.to_sym}
+        # puts @options[:soql]
+        fields = @options[:soql].strip.match(/SELECT (.*) FROM/i)[1]
+        @headers = fields.strip.split(",").map do |item|
+          item.strip.split(/\s/)
+        end.map do |item|
+          item.last.to_sym
+        end
+        # pp @headers
       elsif @options[:headers]
         @headers = @options[:headers]
       else

data/lib/gooddata/models/report.rb

@@ -14,15 +14,16 @@ module GoodData
     def execute
       # puts "Executing report #{uri}"
       result = GoodData.post '/gdc/xtab2/executor3', {"report_req" => {"report" => uri}}
+      
       dataResultUri = result["reportResult2"]["content"]["dataResult"]
-
       result = GoodData.get dataResultUri
+      return EmptyResult.new([]) if result.nil?
+
       while result["taskState"] && result["taskState"]["status"] == "WAIT" do
         sleep 10
         result = GoodData.get dataResultUri
       end
-      data_result = ReportDataResult.new(GoodData.get dataResultUri)
-      data_result
+      ReportDataResult.new(GoodData.get dataResultUri)
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gooddata
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - Pavel Kolesnikov
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-12 00:00:00 Z
+date: 2012-02-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement