cloudpt-api 0.0.1 → 0.1.1

data/LICENSE

@@ -19,4 +19,6 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
+OTHER DEALINGS IN THE SOFTWARE.
+
+Adapted to CloudPT service by Fábio Batista, Webreakstuff Lda. Copyright (c) 2013

data/README.markdown

@@ -1,5 +1,5 @@
 Cloudpt::API - Cloudpt Ruby API client
-=========
+======================================
 
 A Ruby client for the Cloudpt REST API.
 
@@ -11,8 +11,8 @@ Current state:
 
 First release, whole API covered.
 
-Installation
-------------
+Step 1: Installation
+--------------------
 
 Cloudpt::API is available on RubyGems, so:
 
@@ -26,8 +26,8 @@ Or in your Gemfile:
 gem "cloudpt-api"
 ```
 
-Configuration
--------------
+Step 2: Configuration
+---------------------
 
 In order to use this client, you need to have an app created on https://www.Cloudpt.com/developers/apps.
 
@@ -39,8 +39,8 @@ Cloudpt::API::Config.app_secret = YOUR_APP_SECRET
 Cloudpt::API::Config.mode       = "sandbox" # if you have a single-directory app or "Cloudpt" if it has access to the whole Cloudpt
 ```
 
-Cloudpt::API::Client
---------------------
+Step 3a: Authorization
+----------------------
 
 The client is the base for all communication with the API and wraps around almost all calls
 available in the API.
@@ -52,20 +52,25 @@ on how to do this:
 ```ruby
 consumer = Cloudpt::API::OAuth.consumer(:authorize)
 request_token = consumer.get_request_token
-request_token.authorize_url(:oauth_callback => 'http://yoursite.com/callback')
-# Here the user goes to Cloudpt, authorizes the app and is redirected
-# The oauth_token will be available in the params
-request_token.get_access_token(:oauth_verifier => oauth_token)
+# if you have a callback url
+authorize_url = request_token.authorize_url(:oauth_callback => 'http://yoursite.com/callback')
+# if you're running an "out of band app"
+authorize_url = request_token.authorize_url
+# Here the user goes to Cloudpt (following the authorize_url), authorizes the app and is redirected to oauth_callback, or is shown a pin (oauth_verifier).
+# on the redirect case, the oauth_token (to be used as oauth_verifier on the next line) will be available in the params.
+access_token = request_token.get_access_token(:oauth_verifier => oauth_token)
 ```
 
-Now that you have the oauth token and secret, you can create a new instance of the Cloudpt::API::Client, like this:
+Now that you have the oauth token (access_token.token) and secret (access_token.secret), you can create a new instance of the Cloudpt::API::Client, like this:
 
 ```ruby
-client = Cloudpt::API::Client.new :token => token, :secret => secret
+client = Cloudpt::API::Client.new :token => access_token.token, :secret => access_token.secret
 ```
 
-Rake-based authorization
-------------------------
+Note: this token and secret are the ones you'll want to use if you're trying to run the Rspec tests (step 4).
+
+Step 3b: Rake-based authorization
+---------------------------------
 
 Cloudpt::API supplies you with a helper rake which will authorize a single client. This is useful for development and testing.
 
@@ -84,30 +89,26 @@ Simply go to that url, authorize the app, then press enter in the console.
 
 The rake task will output valid ruby code which you can use to create a client.
 
-What differs this from the Cloudpt Ruby SDK?
---------------------------------------------
+Step 4 (optional): Testing
+--------------------------
 
-A few things:
+This assumes you've cloned cloudpt-api repository and you're trying to run the Rspec tests.
 
-* It's using the ruby oauth gem, instead of reinventing the wheel and implementing OAuth communication
-* It treats files and directories as Ruby objects with appropriate classes, on which you can perform operations
+In order to run tests, you need to have an application created and authorized (check step 2 and 3). Put all tokens in spec/connection.yml and you're good to go.
 
-Consider the following example which takes all files with names like 'test.txt' and copies them with a suffix '.old'
+Check out spec/connection.sample.yml for an example.
 
-This is how it would look using the SDK:
+Just run rspec from the project root.
 
-```ruby
-# Because you need the session with the right access token, you need to create one instance per user
-@session = CloudptSession.new(APP_TOKEN, APP_SECRET)
-@session.set_access_token(ACCESS_TOKEN, ACCESS_SECRET)
-@client = CloudptClient.new(@session, :app_folder)
-# The result is a hash, so we need to call a method on the client, supplying the right key from the hash
-@client.search('/', 'test.txt').each do |hash|
-  @client.file_copy(hash['path'], hash['path'] + ".old")
-end
 ```
+$ rspec
+```
+
+
+Step 5: Usage
+-------------
 
-With Cloudpt::API, you can clean it up, first you put the app token and secret in a config or initializer file:
+First you put the app token and secret in a config or initializer file:
 
 ```ruby
 Cloudpt::API::Config.app_key    = APP_TOKEN
@@ -125,13 +126,6 @@ And when you want to use it, just create a new client object with a specific acc
 end
 ```
 
-What differs this from the Cloudpt gem?
---------------------------------------
-
-Cloudpt::API does not extend the Ruby primitives, like the Cloudpt gem:
-
-https://github.com/RISCfuture/Cloudpt/tree/master/lib/Cloudpt/extensions
-
 Cloudpt::API::Client methods
 ----------------------------
 
@@ -143,7 +137,7 @@ Returns a simple object with information about the account:
 client.account # => #<Cloudpt::API::Object>
 ```
 
-For more info, see [https://www.Cloudpt.com/developers/reference/api#account-info](https://www.Cloudpt.com/developers/reference/api#account-info)
+For more info, see [https://cloudpt.pt/documentation#accountinfo](https://cloudpt.pt/documentation#accountinfo)
 
 ### Cloudpt::API::Client#find
 
@@ -309,14 +303,7 @@ Returns a list of files or directorys within that directory
 dir.ls # => [#<Cloudpt::API::File>, #<Cloudpt::API::Dir>]
 ```
 
-Testing
----------
-
-In order to run tests, you need to have an application created and authorized. Put all tokens in spec/connection.yml and you're good to go.
-
-Check out spec/connection.sample.yml for an example.
-
 Copyright
 ---------
-
 Copyright (c) 2011 Marcin Bunsch, Future Simple Inc. See LICENSE for details.
+Copyright (c) 2013 Fábio Batista, Webreakstuff.

data/lib/cloudpt-api/client.rb

@@ -25,6 +25,9 @@ module Cloudpt
 
       def list(path = '')
         response = raw.list :path => path
+        results = Cloudpt::API::Object.convert(response, self)
+        results['contents'] = Cloudpt::API::Object.convert(results.delete('contents') || [], self)
+        results
       end
 
       def ls(path = '')
@@ -37,14 +40,20 @@ module Cloudpt
 
       def mkdir(path)
         # Remove the characters not allowed by Cloudpt
-        path = path.gsub(/[\\\:\?\*\<\>\"\|]+/, '')
-        response = raw.create_folder :path => path
+        path = path.gsub(/(^\/)|([\\\:\?\*\<\>\"\|]+)/, '')
+        response = raw.create_folder :path => "/#{path}"
         Cloudpt::API::Dir.init(response, self)
       end
 
       def search(term, options = {})
         options[:path] ||= ''
         results = raw.search({ :query => term }.merge(options))
+        #search results have broken paths, fix them here for now
+        results.each do |result|
+          if Cloudpt::API::Config.mode == 'sandbox'
+            result['path'] = result['path'].sub(/^\/([^\/]+)?/, '')
+          end
+        end
         Cloudpt::API::Object.convert(results, self)
       end
 

data/lib/cloudpt-api/client/files.rb

@@ -8,19 +8,27 @@ module Cloudpt
         def download(path, options = {})
           root     = options.delete(:root) || Cloudpt::API::Config.mode
           path     = Cloudpt::API::Util.escape(path)
-          url      = ["/Storage/CloudPT/Files", root, path].compact.join('/')
+          url      = ["", "Files", root, path].compact.join('/')
           connection.get_raw(:content, url)
         end
 
         def upload(path, data, options = {})
           root     = options.delete(:root) || Cloudpt::API::Config.mode
+          method   = options.delete(:method)
           query    = Cloudpt::API::Util.query(options)
           path     = Cloudpt::API::Util.escape(path)
-          url      = ["/Storage/CloudPT/Files", root, path].compact.join('/')
-          response = connection.put(:content, "#{url}?#{query}", data, {
-            'Content-Type'   => "application/octet-stream",
-            "Content-Length" => data.length.to_s
-          })
+          url      = ["", "Files", root, path].compact.join('/')
+          if method == :post
+            response = connection.post(:content, "#{url}?#{query}", data, {
+              'Content-Type'   => "application/octet-stream",
+              "Content-Length" => data.length.to_s
+            })
+          else
+            response = connection.put(:content, "#{url}?#{query}", data, {
+              'Content-Type'   => "application/octet-stream",
+              "Content-Length" => data.length.to_s
+            })
+          end
           Cloudpt::API::File.init(response, self)
         end
 

data/lib/cloudpt-api/client/raw.rb

@@ -27,24 +27,24 @@ module Cloudpt
         connection.send(method, endpoint, action, data)
       end
 
-      add_method :get,  "/Storage/CloudPT/Account/Info",           :as => 'account', :root => false
-
-      add_method :get,  "/Storage/CloudPT/Metadata/:root/:path",   :as => 'metadata'
-      add_method :post, "/Storage/CloudPT/Delta",                  :as => 'delta', :root => false
-      add_method :get,  "/Storage/CloudPT/Revisions/:root/:path",  :as => 'revisions'
-      add_method :post, "/Storage/CloudPT/Restore/:root/:path",    :as => 'restore'
-      add_method :get,  "/Storage/CloudPT/Search/:root/:path",     :as => 'search'
-      add_method :post, "/Storage/CloudPT/Shares/:root/:path",     :as => 'shares'
-      add_method :post, "/Storage/CloudPT/Media/:root/:path",      :as => 'media'
-
-      add_method :get_raw, "/Storage/CloudPT/Thumbnails/:root/:path", :as => 'thumbnails', :endpoint => :content
-
-      add_method :post, "/Storage/CloudPT/Copy",           :as => "copy"
-      add_method :get,  "/Storage/CloudPT/CopyRef/:root/:path",   :as => 'copy_ref'
-      add_method :post, "/Storage/CloudPT/CreateFolder",  :as => "create_folder"
-      add_method :post, "/Storage/CloudPT/Delete",         :as => "delete"
-      add_method :post, "/Storage/CloudPT/Move",           :as => "move"
-      add_method :post, "/Storage/CloudPT/List/:root/:path",           :as => "list"
+      add_method :get,  "/Account/Info",           :as => 'account', :root => false
+
+      add_method :get,  "/Metadata/:root/:path",   :as => 'metadata'
+      add_method :post, "/Delta",                  :as => 'delta', :root => false
+      add_method :get,  "/Revisions/:root/:path",  :as => 'revisions'
+      add_method :post, "/Restore/:root/:path",    :as => 'restore'
+      add_method :get,  "/Search/:root/:path",     :as => 'search'
+      add_method :post, "/Shares/:root/:path",     :as => 'shares'
+      add_method :post, "/Media/:root/:path",      :as => 'media'
+
+      add_method :get_raw, "/Thumbnails/:root/:path", :as => 'thumbnails', :endpoint => :content
+
+      add_method :post, "/Fileops/Copy",           :as => "copy"
+      add_method :get,  "/CopyRef/:root/:path",    :as => 'copy_ref'
+      add_method :post, "/Fileops/CreateFolder",   :as => "create_folder"
+      add_method :post, "/Fileops/Delete",         :as => "delete"
+      add_method :post, "/Fileops/Move",           :as => "move"
+      add_method :get, "/List/:root/:path",       :as => "list"
 
     end
 

data/lib/cloudpt-api/connection/requests.rb

@@ -9,6 +9,8 @@ module Cloudpt
           response = yield
           raise Cloudpt::API::Error::ConnectionFailed if !response
           status = response.code.to_i
+          #puts "STATUS:#{status}"
+          #puts "PAYLOAD:\n#{response.body}"
           case status
             when 401
               raise Cloudpt::API::Error::Unauthorized
@@ -23,7 +25,7 @@ module Cloudpt
             when 300..399
               raise Cloudpt::API::Error::Redirect
             when 500..599
-              raise Cloudpt::API::Error
+              raise Cloudpt::API::Error::ServerError
             else
               options[:raw] ? response.body : MultiJson.decode(response.body)
           end
@@ -33,6 +35,7 @@ module Cloudpt
 
         def get_raw(endpoint, path, data = {}, headers = {})
           query = Cloudpt::API::Util.query(data)
+          #puts "GET #{Cloudpt::API::Config.prefix}#{path}?#{URI.parse(URI.encode(query))}"
           request(:raw => true) do
             token(endpoint).get "#{Cloudpt::API::Config.prefix}#{path}?#{URI.parse(URI.encode(query))}", headers
           end
@@ -40,18 +43,24 @@ module Cloudpt
 
         def get(endpoint, path, data = {}, headers = {})
           query = Cloudpt::API::Util.query(data)
+          query = "?#{URI.parse(URI.encode(query))}" unless query.empty?
+          #puts "GET #{Cloudpt::API::Config.prefix}#{path}#{query}"
           request do
-            token(endpoint).get "#{Cloudpt::API::Config.prefix}#{path}?#{URI.parse(URI.encode(query))}", headers
+            token(endpoint).get "#{Cloudpt::API::Config.prefix}#{path}#{query}", headers
           end
         end
 
         def post(endpoint, path, data = {}, headers = {})
+          #puts "POST #{Cloudpt::API::Config.prefix}#{path}"
+          #puts "BODY:\n#{data}"
           request do
             token(endpoint).post "#{Cloudpt::API::Config.prefix}#{path}", data, headers
           end
         end
 
         def put(endpoint, path, data = {}, headers = {})
+          #puts "PUT #{Cloudpt::API::Config.prefix}#{path}"
+          #puts "BODY:\n#{data}"
           request do
             token(endpoint).put "#{Cloudpt::API::Config.prefix}#{path}", data, headers
           end

data/lib/cloudpt-api/objects/file.rb

@@ -33,6 +33,16 @@ module Cloudpt
         response = client.raw.copy_ref({ :path => self.path }.merge(options))
         Cloudpt::API::Object.init(response, client)
       end
+
+
+      #alias_method :old_path, :path
+      #def path
+      #  if Cloudpt::API::Config.mode == 'sandbox'
+      #    Cloudpt::API::Util.strip_slash(self['path'].sub(/^\/([^\/]+)?/, ''))
+      #  else
+      #    old_path
+      #  end
+      #end
       
       def download
         client.download(self.path)

data/lib/cloudpt-api/objects/fileops.rb

@@ -4,22 +4,22 @@ module Cloudpt
     module Fileops
 
       def copy(to, options = {})
-        response = client.raw.copy({ :from_path => self.path, :to_path => to }.merge(options))
+        response = client.raw.copy({ :from_path => "/#{self.path}", :to_path => "/#{Cloudpt::API::Util.strip_slash(to)}" }.merge(options))
         self.update response
       end
 
       def move(to, options = {})
-        response = client.raw.move({ :from_path => self.path, :to_path => to }.merge(options))
+        response = client.raw.move({ :from_path => "/#{self.path}", :to_path => "/#{Cloudpt::API::Util.strip_slash(to)}" }.merge(options))
         self.update response
       end
 
       def destroy(options = {})
-        response = client.raw.delete({ :path => self.path }.merge(options))
+        response = client.raw.delete({ :path => "/#{self.path}" }.merge(options))
         self.update response
       end
 
       def path
-        self['path'].sub(/^\//, '')
+        Cloudpt::API::Util.strip_slash(self['path'])
       end
 
     end

data/lib/cloudpt-api/util/config.rb

@@ -12,14 +12,14 @@ module Cloudpt
       end
 
       self.endpoints = {
-        :main      => "https://api.cloudpt.pt",
+        :main      => "https://publicapi.cloudpt.pt",
         :content   => "https://api-content.cloudpt.pt",
         :authorize => "https://cloudpt.pt"
       }
-      self.prefix     = ""
+      self.prefix     = "/1"
       self.app_key    = nil
       self.app_secret = nil
-      self.mode       = nil
+      self.mode       = 'sandbox'
 
     end
 

data/lib/cloudpt-api/util/error.rb

@@ -9,7 +9,7 @@ module Cloudpt
       class Forbidden < Exception; end
       class NotFound < Exception; end
       class Redirect < Exception; end
-
+      class ServerError < Exception; end
     end
 
   end

data/lib/cloudpt-api/util/oauth.rb

@@ -11,9 +11,9 @@ module Cloudpt
           end
           ::OAuth::Consumer.new(Cloudpt::API::Config.app_key, Cloudpt::API::Config.app_secret,
             :site => Cloudpt::API::Config.endpoints[endpoint],
-            :request_token_path => Cloudpt::API::Config.prefix + "/oauth/request_token",
-            :authorize_path     => Cloudpt::API::Config.prefix + "/oauth/authorize",
-            :access_token_path  => Cloudpt::API::Config.prefix + "/oauth/access_token")
+            :request_token_path => "/oauth/request_token",
+            :authorize_path     => "/oauth/authorize",
+            :access_token_path  => "/oauth/access_token")
         end
 
         def access_token(consumer, options = {})

data/lib/cloudpt-api/util/util.rb

@@ -15,6 +15,10 @@ module Cloudpt
           data.inject([]) { |memo, entry| memo.push(entry.join('=')); memo }.join('&')
         end
 
+        def strip_slash(path)
+          path.sub(/^\//, '')
+        end
+
         def remove_double_slashes(path)
           path.gsub('//', '/')
         end

data/lib/cloudpt-api/version.rb

@@ -1,5 +1,5 @@
 module Cloudpt
   module API
-    VERSION = "0.0.1"
+    VERSION = "0.1.1"
   end
 end

data/spec/lib/cloudpt-api/client_spec.rb

@@ -3,9 +3,15 @@ require "spec_helper"
 
 describe Cloudpt::API::Client do
 
-  before do
+  before(:all) do
     # pending
     @client = Cloudpt::Spec.instance
+    @dirname = "#{Cloudpt::Spec.test_dir}"
+    @dir = @client.mkdir @dirname
+  end
+
+  after(:all) do
+    @dir.destroy
   end
 
   describe "#initialize" do
@@ -27,11 +33,11 @@ describe Cloudpt::API::Client do
 
   describe "#find" do
 
-    before do
-      @filename = "#{Cloudpt::Spec.test_dir}/spec-find-file-test-#{Time.now.to_i}.txt"
+    before(:all) do
+      @filename = "#{Cloudpt::Spec.test_dir}/spec--find-file-test-#{Time.now.to_i}.txt"
       @file = @client.upload @filename, "spec file"
 
-      @dirname = "#{Cloudpt::Spec.test_dir}/spec-find-dir-test-#{Time.now.to_i}"
+      @dirname = "#{Cloudpt::Spec.test_dir}/spec--find-dir-test-#{Time.now.to_i}"
       @dir = @client.mkdir @dirname
     end
 
@@ -50,9 +56,17 @@ describe Cloudpt::API::Client do
   end
 
   describe "#list" do
+    before do
+      @filename = "#{Cloudpt::Spec.test_dir}/spec-find-file-test-#{Time.now.to_i}.txt"
+      @file = @client.upload @filename, "spec file"
+
+      @dirname = "#{Cloudpt::Spec.test_dir}/spec-find-dir-test-#{Time.now.to_i}"
+      @dir = @client.mkdir @dirname
+    end
+
     it "lists root" do
-      result = @client.list("")
-      result.should be_an_instance_of(Array)
+      result = @client.list("#{Cloudpt::Spec.test_dir}")
+      result['contents'].should be_an_instance_of(Array)
     end
   end
 
@@ -106,13 +120,15 @@ describe Cloudpt::API::Client do
       response.bytes.should == 9
     end
 
+    #FAIL ON SERVER |*<>?:
     it "uploads the file with tricky characters" do
-      filename = "#{Cloudpt::Spec.test_dir}/test ,|!@\#$%^&*{b}[].;'.,<>?:-#{Cloudpt::Spec.namespace}.txt"
+      filename = "#{Cloudpt::Spec.test_dir}/test ,!@\#$%^&{b}[].;'.,-#{Cloudpt::Spec.namespace}.txt"
       response = @client.upload filename, "Some file"
       response.path.should == filename
       response.bytes.should == 9
     end
 
+    #FAIL ON SERVER
     it "uploads the file with utf8" do
       filename = "#{Cloudpt::Spec.test_dir}/test łołąó-#{Cloudpt::Spec.namespace}.txt"
       response = @client.upload filename, "Some file"
@@ -125,22 +141,22 @@ describe Cloudpt::API::Client do
 
     let(:term) { "searchable-test-#{Cloudpt::Spec.namespace}" }
 
-    before do
+    before(:all) do
       filename = "#{Cloudpt::Spec.test_dir}/searchable-test-#{Cloudpt::Spec.namespace}.txt"
       @client.upload filename, "Some file"
-    end
-
-    after do
-      @response.size.should == 1
-      @response.first.class.should == Cloudpt::API::File
+      sleep(2)
     end
 
     it "finds a file" do
-      @response = @client.search term, :path => "#{Cloudpt::Spec.test_dir}"
+      response = @client.search term, :path => "#{Cloudpt::Spec.test_dir}"
+      response.size.should_not == 0
+      response.first.class.should == Cloudpt::API::File
     end
 
     it "works if leading slash is present in path" do
-      @response = @client.search term, :path => "/#{Cloudpt::Spec.test_dir}"
+      response = @client.search term, :path => "/#{Cloudpt::Spec.test_dir}"
+      response.size.should_not == 0
+      response.first.class.should == Cloudpt::API::File
     end
 
   end
@@ -148,12 +164,17 @@ describe Cloudpt::API::Client do
   describe "#copy_from_copy_ref" do
 
     it "copies a file from a copy_ref" do
-      filename = "test/searchable-test-#{Cloudpt::Spec.namespace}.txt"
+      filename = "#{Cloudpt::Spec.test_dir}/searchable-test-copy-#{Cloudpt::Spec.namespace}.txt"
       @client.upload filename, "Some file"
-      response = @client.search "searchable-test-#{Cloudpt::Spec.namespace}", :path => 'test'      
-      ref = response.first.copy_ref['copy_ref']
-      @client.copy_from_copy_ref ref, "#{filename}.copied"
-      response = @client.search "searchable-test-#{Cloudpt::Spec.namespace}.txt.copied", :path => 'test'   
+      sleep(2)
+      response = @client.search "searchable-test-copy-#{Cloudpt::Spec.namespace}", :path => "#{Cloudpt::Spec.test_dir}"
+      ref = response.first.copy_ref
+      ref.should_not == nil
+      the_copy_ref = ref['copy-ref']
+      the_copy_ref.should_not == nil
+      @client.copy_from_copy_ref the_copy_ref, "#{filename}.copied"
+      sleep(2)
+      response = @client.search "searchable-test-copy-#{Cloudpt::Spec.namespace}.txt.copied", :path => "#{Cloudpt::Spec.test_dir}"
       response.size.should == 1
       response.first.class.should == Cloudpt::API::File
     end
@@ -188,7 +209,7 @@ describe Cloudpt::API::Client do
     end
 
     it "returns the files that have changed since the cursor was made" do
-      filename = "#{Cloudpt::Spec.test_dir}/delta-test-#{Cloudpt::Spec.namespace}.txt"
+      filename = "#{Cloudpt::Spec.test_dir}/delta-test_add-#{Cloudpt::Spec.namespace}.txt"
       delete_filename = "#{Cloudpt::Spec.test_dir}/delta-test-delete-#{Cloudpt::Spec.namespace}.txt"
       @client.upload delete_filename, 'Some file'
       response = @client.delta

data/spec/lib/cloudpt-api/connection_spec.rb

@@ -47,7 +47,7 @@ describe Cloudpt::API::Connection do
       response = mock :code => 500, :body => '{ "a":1}'
       lambda do
         @connection.request { response }
-      end.should raise_error(Cloudpt::API::Error)
+      end.should raise_error(Cloudpt::API::Error::ServerError)
     end
 
     it "raises a Cloudpt::API::Error when the response is a 400" do

data/spec/lib/cloudpt-api/dir_spec.rb

@@ -4,14 +4,11 @@ describe Cloudpt::API::Dir do
 
   before do
     @client = Cloudpt::Spec.instance
+    @parent_dir = @client.mkdir "#{Cloudpt::Spec.test_dir}"
     @dirname = "#{Cloudpt::Spec.test_dir}/spec-dir-test-#{Time.now.to_i}"
     @dir = @client.mkdir @dirname
   end
 
-  after do
-    # @dir.delete
-  end
-
   describe "#copy" do
 
     it "copies the dir properly" do
@@ -20,6 +17,11 @@ describe Cloudpt::API::Dir do
       @dir.path.should == new_dirname
     end
 
+    after do
+      @dir.destroy
+      @parent_dir.destroy
+    end
+
   end
 
   describe "#move" do
@@ -30,6 +32,11 @@ describe Cloudpt::API::Dir do
       @dir.path.should == new_dirname
     end
 
+    after do
+      @dir.destroy
+      @parent_dir.destroy
+    end
+
   end
 
   describe "#destroy" do

data/spec/lib/cloudpt-api/file_spec.rb

@@ -4,12 +4,14 @@ describe Cloudpt::API::File do
 
   before do
     @client = Cloudpt::Spec.instance
+    @dirname = "#{Cloudpt::Spec.test_dir}"
+    @dir = @client.mkdir @dirname
     @filename = "#{Cloudpt::Spec.test_dir}/spec-test-#{Time.now.to_i}.txt"
     @file = @client.upload @filename, "spec file"
   end
 
   after do
-    # @file.delete
+    @dir.destroy
   end
 
   describe "#copy" do
@@ -44,8 +46,9 @@ describe Cloudpt::API::File do
   describe "#revisions" do
 
     it "retrieves all revisions as an Array of File objects" do
-      @client.upload @file.path, "Updated content"
-
+      sleep(2)
+      @client.upload @file.path, "Updated content", {'overwrite' => true, :method => :post}
+      #FAIL AT SERVER ?
       revisions = @file.revisions
       revisions.size.should == 2
       revisions.collect { |f| f.class }.should == [Cloudpt::API::File, Cloudpt::API::File]
@@ -85,8 +88,9 @@ describe Cloudpt::API::File do
 
       result = @file.share_url
       result.should be_an_instance_of(Cloudpt::API::Object)
-      result.keys.sort.should == ['expires', 'url']
-
+      result.should have_key 'expires'
+      result.should have_key 'url'
+      result.should have_key 'link_shareid'
     end
 
   end
@@ -94,11 +98,11 @@ describe Cloudpt::API::File do
   describe "#copy_ref" do
     
     it "returns a copy_ref object" do
-      
+      sleep(2)
       result = @file.copy_ref
       result.should be_an_instance_of(Cloudpt::API::Object)
-      result.keys.sort.should == ['copy_ref', 'expires']
-      
+      result.should have_key 'copy_ref'
+      result.should have_key 'expires'
     end
     
   end
@@ -106,11 +110,11 @@ describe Cloudpt::API::File do
   describe "#direct_url" do
 
     it "returns an Url object" do
-
+      sleep(2)
       result = @file.direct_url
       result.should be_an_instance_of(Cloudpt::API::Object)
-      result.keys.sort.should == ['expires', 'url']
-
+      result.should have_key 'url'
+      result.should have_key 'expires'
     end
 
   end

data/spec/lib/cloudpt-api/thumbnail_spec.rb

@@ -6,6 +6,7 @@ describe Cloudpt::API::File do
   before do
     @io       = StringIO.new
     @client   = Cloudpt::Spec.instance
+    @dir      = @client.mkdir Cloudpt::Spec.test_dir
     @filename = "#{Cloudpt::Spec.test_dir}/spec-test-#{Time.now.to_i}.jpg"
     jpeg      = File.read("spec/fixtures/cloudpt.jpg")
     @file     = @client.upload @filename, jpeg
@@ -14,14 +15,15 @@ describe Cloudpt::API::File do
   describe "#thumbnail" do
 
     it "downloads a thumbnail" do
+      sleep(2)
       result = @file.thumbnail
 
       @io << result
       @io.rewind
 
       jpeg = JPEG.new(@io)
-      jpeg.height.should == 64
-      jpeg.width.should == 64
+      jpeg.height.should == 32
+      jpeg.width.should == 32
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudpt-api
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-25 00:00:00.000000000 Z
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json