gooddata 0.4.0 → 0.5.0

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/lib/gooddata/client.rb

@@ -1,5 +1,9 @@
 require 'gooddata/version'
 require 'gooddata/connection'
+
+# Metadata packages, such as report.rb, require this to be loaded first
+require File.dirname(__FILE__) + '/models/metadata.rb'
+
 Dir[File.dirname(__FILE__) + '/models/*.rb'].each { |file| require file }
 Dir[File.dirname(__FILE__) + '/collections/*.rb'].each { |file| require file }
 

data/lib/gooddata/commands/base.rb

@@ -44,8 +44,10 @@ module GoodData
         begin
           if options.has_key? :answers
             answer = nil
+            options[:default] = options[:answers][0] if !options.has_key? :default
             while !options[:answers].include?(answer)
-              answer = get_answer "#{question} [#{options[:answers].join(',')}]? ", options[:secret]
+              answer = get_answer "#{question} (#{options[:answers].join(',')}) [#{options[:default]}]? ", options[:secret]
+              answer = options[:default] if answer == ""
             end
           else
             question = "#{question} [#{options[:default]}]" if options[:default]

data/lib/gooddata/connection.rb

@@ -1,5 +1,4 @@
 require 'json'
-require 'net/ftptls'
 
 # silence the parenthesis warning in rest-client 1.6.1
 old_verbose, $VERBOSE = $VERBOSE, nil ; require 'rest-client' ; $VERBOSE = old_verbose
@@ -33,6 +32,7 @@ module GoodData
     DEFAULT_URL = 'https://secure.gooddata.com'
     LOGIN_PATH = '/gdc/account/login'
     TOKEN_PATH = '/gdc/account/token'
+    STAGE_PATH = '/uploads'
 
     # Set the GoodData account credentials.
     #
@@ -133,16 +133,39 @@ module GoodData
       connect
     end
 
-    # Uploads a file to GoodData server via FTPS
+    # 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)
-      Net::FTPTLS.open('secure-di.gooddata.com', @username, @password) do |ftp|
-        ftp.passive = true
-        if dir then
-          begin ; ftp.mkdir dir ; rescue ; ensure ; ftp.chdir dir ; end
-        end
-        ftp.binary = true
-        ftp.put file
+      # We should have followed a link. If it was correct.
+      stage_url = DEFAULT_URL.sub(/\./, '-di.')
+
+      # Make a directory, if needed
+      if dir then
+        RestClient::Request.execute(
+          :method => :mkcol,
+          :url => stage_url + STAGE_PATH + dir + '/',
+          :user => @username,
+          :password => @password,
+          :timeout => @options[:timeout],
+          :headers => {
+            :user_agent => GoodData.gem_version_string,
+          }
+        )
       end
+
+      # Upload the file
+      RestClient::Request.execute(
+        :method => :put,
+        :url => stage_url + STAGE_PATH + dir + '/' + File.basename(file),
+        :user => @username,
+        :password => @password,
+        :timeout => @options[:timeout],
+        :headers => {
+          :user_agent => GoodData.gem_version_string,
+        },
+        :payload => File.read(file)
+      )
     end
 
     private

data/lib/gooddata/model.rb

@@ -572,6 +572,9 @@ module GoodData
       def to_csv_data(headers, row)
         val = row[name]
         val.nil?() ? nil : (Date.strptime(val, format) - BEGINNING_OF_TIMES).to_i
+        rescue ArgumentError
+          raise "Value \"#{val}\" for column \"#{name}\" did not match the format: #{format}. " +
+            "Perhaps you need to add or change the \"format\" key in the data set configuration."
       end
 
       def to_manifest_part(mode)

data/lib/gooddata/version.rb

@@ -1,3 +1,3 @@
 module GoodData
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gooddata
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: 
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Pavel Kolesnikov
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-20 00:00:00 Z
+date: 2011-09-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement