dropbox-api 0.4.1 → 0.4.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e1474a34de5bf86752d2a0fc373aa9d556e80cc6
+  data.tar.gz: dc33512fa9132a5e9c12f36156328294309f2cb5
+SHA512:
+  metadata.gz: ece9abc626bfcd3f8920614b8db8de0ead7004713e33c80190ae34b47f20740ea5d9800d3fb4abb19202b1712ba2b07a5a5a3118b690dba3971056119c41b215
+  data.tar.gz: 9ec8f8012d2a3b3967fa2d1973b9eb9dfc317abfb3f515439ed7ba3c1609468e6e365758ae2ccba5789dff1bd7855030c9e3067fbfbb94274ee290e97047a5fb

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

@@ -10,20 +10,36 @@ module Dropbox
           raise Dropbox::API::Error::ConnectionFailed if !response
           status = response.code.to_i
           case status
+            when 400
+              parsed = MultiJson.decode(response.body)
+              raise Dropbox::API::Error::BadInput.new("400 - Bad input parameter - #{parsed['error']}")
             when 401
-              raise Dropbox::API::Error::Unauthorized
+              raise Dropbox::API::Error::Unauthorized.new("401 - Bad or expired token")
             when 403
               parsed = MultiJson.decode(response.body)
-              raise Dropbox::API::Error::Forbidden.new(parsed["error"])
+              raise Dropbox::API::Error::Forbidden.new('403 - Bad OAuth request')
             when 404
-              raise Dropbox::API::Error::NotFound
-            when 400, 406
+              raise Dropbox::API::Error::NotFound.new("404 - Not found")
+            when 405
+              parsed = MultiJson.decode(response.body)
+              raise Dropbox::API::Error::WrongMethod.new("405 - Request method not expected - #{parsed['error']}")
+            when 406
               parsed = MultiJson.decode(response.body)
-              raise Dropbox::API::Error.new(parsed["error"])
+              raise Dropbox::API::Error.new("#{status} - #{parsed['error']}")
+            when 429
+              raise Dropbox::API::Error::RateLimit.new('429 - Rate Limiting in affect')
             when 300..399
-              raise Dropbox::API::Error::Redirect
-            when 500..599
-              raise Dropbox::API::Error
+              raise Dropbox::API::Error::Redirect.new("#{status} - Redirect Error")
+            when 503
+              parsed = MultiJson.decode(response.body)
+              header_parse = MultiJson.decode(response.headers)
+              error_message = "#{parsed["error"]}. Retry after: #{header_parse['Retry-After']}"
+              raise Dropbox::API::Error.new("503 - #{error_message}")
+            when 507
+              raise Dropbox::API::Error::StorageQuota.new("507 - Dropbox storage quota exceeded.")
+            when 500..502, 504..506, 508..599
+              parsed = MultiJson.decode(response.body)
+              raise Dropbox::API::Error.new("#{status} - Server error. Check http://status.dropbox.com/")
             else
               options[:raw] ? response.body : MultiJson.decode(response.body)
           end

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

@@ -3,12 +3,16 @@ module Dropbox
 
     class Error < StandardError
 
+      class BadInput < Error; end
       class ConnectionFailed < Error; end
       class Config < Error; end
       class Unauthorized < Error; end
       class Forbidden < Error; end
       class NotFound < Error; end
       class Redirect < Error; end
+      class WrongMethod < Error; end
+      class RateLimit < Error; end
+      class StorageQuota < Error; end
 
     end
 

data/lib/dropbox-api/version.rb

@@ -1,5 +1,5 @@
 module Dropbox
   module API
-    VERSION = "0.4.1"
+    VERSION = "0.4.2"
   end
 end

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

@@ -10,62 +10,91 @@ describe Dropbox::API::Connection do
   describe "#request" do
 
     it "returns a parsed response when the response is a 200" do
-      response = mock :code => 200, :body => '{ "a":1}'
+      response = double :code => 200, :body => '{ "a":1}'
       response = @connection.request { response }
       response.should be_an_instance_of(Hash)
     end
 
     it "raises a Dropbox::API::Error::Unauthorized when the response is a 401" do
-      response = mock :code => 401, :body => '{ "a":1}'
+      response = double :code => 401, :body => '{ "a":1}'
       lambda do
         @connection.request { response }
-      end.should raise_error(Dropbox::API::Error::Unauthorized)
+      end.should raise_error(Dropbox::API::Error::Unauthorized, '401 - Bad or expired token')
     end
 
     it "raises a Dropbox::API::Error::Forbidden when the response is a 403" do
-      response = mock :code => 403, :body => '{ "a":1}'
+      response = double :code => 403, :body => '{ "a":1}'
       lambda do
         @connection.request { response }
-      end.should raise_error(Dropbox::API::Error::Forbidden)
+      end.should raise_error(Dropbox::API::Error::Forbidden, '403 - Bad OAuth request')
     end
 
     it "raises a Dropbox::API::Error::NotFound when the response is a 404" do
-      response = mock :code => 404, :body => '{ "a":1}'
+      response = double :code => 404, :body => '{ "a":1}'
       lambda do
         @connection.request { response }
-      end.should raise_error(Dropbox::API::Error::NotFound)
+      end.should raise_error(Dropbox::API::Error::NotFound, '404 - Not found')
+    end
+
+    it "raises a Dropbox::API::Error::WrongMethod when the response is a 405" do
+      response = double :code => 405, :body => '{ "error": "The requested method GET is not allowed for the URL /foo/." }'
+      lambda do
+        @connection.request { response }
+      end.should raise_error(Dropbox::API::Error::WrongMethod, '405 - Request method not expected - The requested method GET is not allowed for the URL /foo/.')
     end
 
     it "raises a Dropbox::API::Error when the response is a 3xx" do
-      response = mock :code => 301, :body => '{ "a":1}'
+      response = double :code => 301, :body => '{ "a":1}'
       lambda do
         @connection.request { response }
-      end.should raise_error(Dropbox::API::Error::Redirect)
+      end.should raise_error(Dropbox::API::Error::Redirect, '301 - Redirect Error')
     end
 
     it "raises a Dropbox::API::Error when the response is a 5xx" do
-      response = mock :code => 500, :body => '{ "a":1}'
+      response = double :code => 500, :body => '{ "a":1}'
       lambda do
         @connection.request { response }
-      end.should raise_error(Dropbox::API::Error)
+      end.should raise_error(Dropbox::API::Error, '500 - Server error. Check http://status.dropbox.com/')
     end
 
     it "raises a Dropbox::API::Error when the response is a 400" do
-      response = mock :code => 400, :body => '{ "error": "bad request" }'
+      response = double :code => 400, :body => '{ "error": "bad request foo" }'
+      lambda do
+        @connection.request { response }
+      end.should raise_error(Dropbox::API::Error::BadInput, '400 - Bad input parameter - bad request foo')
+    end
+
+    it "raises a Dropbox::API::Error when the response is a 406" do
+      response = double :code => 406, :body => '{ "error": "bad request bar" }'
       lambda do
         @connection.request { response }
-      end.should raise_error(Dropbox::API::Error)
+      end.should raise_error(Dropbox::API::Error, '406 - bad request bar')
     end
 
     it "raises a Dropbox::API::Error when the response is a 406" do
-      response = mock :code => 406, :body => '{ "error": "bad request" }'
+      response = double :code => 429, :body => '{ "error": "rate limited" }'
+      lambda do
+        @connection.request { response }
+      end.should raise_error(Dropbox::API::Error::RateLimit, '429 - Rate Limiting in affect')
+    end
+
+    it "raises a Dropbox::API::Error when the response is a 503" do
+      response = double :code => 503, :body => '{ "error": "rate limited" }', :headers => '{ "Retry-After": "50" }'
+      lambda do
+       @connection.request { response }
+     end.should raise_error(Dropbox::API::Error, '503 - rate limited. Retry after: 50')
+   end
+
+    it "raises a Dropbox::API::Error::StorageQuota when the response is a 507" do
+      response = double :code => 507, :body => '{ "error": "quote limit" }'
       lambda do
         @connection.request { response }
-      end.should raise_error(Dropbox::API::Error)
+      end.should raise_error(Dropbox::API::Error, '507 - Dropbox storage quota exceeded.')
     end
 
+
     it "returns the raw response if :raw => true is provided" do
-      response = mock :code => 200, :body => '{ "something": "more" }'
+      response = double :code => 200, :body => '{ "something": "more" }'
       response = @connection.request(:raw => true) { response }
       response.should == '{ "something": "more" }'
     end
@@ -83,7 +112,7 @@ describe Dropbox::API::Connection do
   describe "errors" do
 
     it "recovers error with rescue statement modifier" do
-      expect { raise Dropbox::API::Error rescue nil }.to_not raise_error(Dropbox::API::Error)
+      expect { raise Dropbox::API::Error rescue nil }.to_not raise_error
     end
 
     it "recovers any kind of errors with the generic error" do

data/spec/lib/dropbox-api/oauth_spec.rb

@@ -5,7 +5,7 @@ describe Dropbox::API::OAuth do
   describe ".consumer" do
 
     it "raises an error if config options are not provided" do
-      Dropbox::API::Config.stub!(:app_key).and_return(nil)
+      Dropbox::API::Config.stub(:app_key).and_return(nil)
       lambda {
         Dropbox::API::OAuth.consumer :main
       }.should raise_error(Dropbox::API::Error::Config)

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: dropbox-api
 version: !ruby/object:Gem::Version
-  version: 0.4.1
-  prerelease: 
+  version: 0.4.2
 platform: ruby
 authors:
 - Marcin Bunsch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-16 00:00:00.000000000 Z
+date: 2014-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: oauth
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: To deliver a more Rubyesque experience when using the DropBox API.
@@ -103,33 +96,26 @@ files:
 - spec/support/jpeg.rb
 homepage: http://github.com/futuresimple/dropbox-api
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -720354913055572093
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -720354913055572093
 requirements: []
 rubyforge_project: dropbox-api
-rubygems_version: 1.8.25
+rubygems_version: 2.0.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Ruby client for the DropBox REST API.
 test_files:
 - spec/connection.sample.yml
@@ -143,3 +129,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/config.rb
 - spec/support/jpeg.rb
+has_rdoc: