raca 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09f97899c1e739f1f0e14a11a4a6ef9d42dd516f
-  data.tar.gz: a2955d1c12e809dc132be52d9564f9e23cdf677d
+  metadata.gz: 1c290f2dd6af19a5ab076f84c52b27387d5f3fd4
+  data.tar.gz: 8040a35b98a4fdb5998c7720e6dc8eed505ef5eb
 SHA512:
-  metadata.gz: d743838723bf414aae9716e8eb87173a814cb0c70fd2dfd3ef60a61c732de574e2111733b1aba69e30f27310d9f02a98bb62b1651824f53903e3c8c32cf4735b
-  data.tar.gz: d16ab2778fe4ae974808015c56be1cc9a4d6463d494c7e591ca949d74b7fa36fb5fea20bb640b0ae400c1df5b66d43fc2b6a7b806dcd9c20cf9833cdd420f51c
+  metadata.gz: 69beeb3f67228cb2a6eeb2a44bd8fc95864c53222698925d45699471b1c7ce796d6822edf49cafbd6fe5a9ae97834f0efdaab1d0c94588802c2f6d2987a8446b
+  data.tar.gz: 3cbb4a824710d81018e40d465603165976ac365eefe470c207f09314f0659ebd903f88c8fb4cd46a74511a5a182193efcd0cf3a019e7b55b4f8f8740b6885f75

data/CHANGELOG

@@ -1,3 +1,7 @@
+v0.3.2 (23rd April 2014)
+* Bugfix: correctly handle a 401 response when a stale token is used for
+  a streaming PUT
+
 v0.3.1(14th April 2014)
 * Add the rackspace transaction ID to HTTP exceptions
 

data/README.markdown

@@ -155,7 +155,8 @@ As of version 1.20.0, fog supports dozens of providers, contains ~152000 lines
 of ruby and adds ~500ms to the boot time of our rails apps. raca is a
 lightweight, rackspace-only alternative with minimal dependencies that should
 have a negligable impact on application boot times. Version 0.3 has ~700 lines of
-ruby (excluding specs).
+ruby (excluding specs). It also does *much* less than fog. We can't have our cake
+and eat it too.
 
 ## Compatibility
 

data/lib/raca/account.rb

@@ -121,6 +121,7 @@ module Raca
     def raise_on_error(response)
       error_klass = case response.code.to_i
       when 400 then BadRequestError
+      when 401 then UnauthorizedError
       when 404 then NotFoundError
       when 500 then ServerError
       else

data/lib/raca/errors.rb

@@ -5,6 +5,9 @@ module Raca
   # for 400 responses from rackspace
   class BadRequestError < HTTPError; end
 
+  # for 401 responses from rackspace
+  class UnauthorizedError < HTTPError; end
+
   # for 404 responses from rackspace
   class NotFoundError < HTTPError; end
 

data/lib/raca/http_client.rb

@@ -21,35 +21,60 @@ module Raca
 
     def get(path, headers = {}, &block)
       cloud_request(Net::HTTP::Get.new(path, headers), &block)
+    rescue Raca::UnauthorizedError
+      @account.refresh_cache
+      cloud_request(Net::HTTP::Get.new(path, headers), &block)
     end
 
     def head(path, headers = {})
       cloud_request(Net::HTTP::Head.new(path, headers))
+    rescue Raca::UnauthorizedError
+      @account.refresh_cache
+      cloud_request(Net::HTTP::Head.new(path, headers))
     end
 
     def delete(path, headers = {})
       cloud_request(Net::HTTP::Delete.new(path, headers))
+    rescue Raca::UnauthorizedError
+      @account.refresh_cache
+      cloud_request(Net::HTTP::Delete.new(path, headers))
     end
 
     def put(path, headers = {})
       cloud_request(Net::HTTP::Put.new(path, headers))
+    rescue Raca::UnauthorizedError
+      @account.refresh_cache
+      cloud_request(Net::HTTP::Put.new(path, headers))
     end
 
     def streaming_put(path, io, byte_count, headers = {})
-      request = Net::HTTP::Put.new(path, headers)
-      request.body_stream = io
-      request.content_length = byte_count
-      cloud_request(request)
+      cloud_request(build_streaming_put_request(path, io, byte_count, headers))
+    rescue Raca::UnauthorizedError
+      @account.refresh_cache
+      io.rewind if io.respond_to?(:rewind)
+      cloud_request(build_streaming_put_request(path, io, byte_count, headers))
     end
 
     def post(path, body, headers = {})
       request = Net::HTTP::Post.new(path, headers)
       request.body = body if body
       cloud_request(request)
+    rescue Raca::UnauthorizedError
+      @account.refresh_cache
+      request = Net::HTTP::Post.new(path, headers)
+      request.body = body if body
+      cloud_request(request)
     end
 
     private
 
+    def build_streaming_put_request(path, io, byte_count, headers)
+      request = Net::HTTP::Put.new(path, headers)
+      request.body_stream = io
+      request.content_length = byte_count
+      request
+    end
+
     # perform an HTTP request to rackpsace.
     #
     # request is a Net::HTTP request object.
@@ -83,16 +108,8 @@ module Raca
     end
 
     def cloud_http(&block)
-      Net::HTTP.new(@hostname, 443).tap {|http|
-        http.use_ssl = true
-        http.read_timeout = 70
-      }.start do |http|
-        response = block.call http
-        if response.is_a?(Net::HTTPUnauthorized)
-          log "Rackspace returned HTTP 401; refreshing auth before retrying."
-          @account.refresh_cache
-          response = block.call http
-        end
+      Net::HTTP.start(@hostname, 443, use_ssl: true, read_timeout: 70) do |http|
+        response = block.call(http)
         if response.is_a?(Net::HTTPSuccess)
           response
         else
@@ -104,6 +121,7 @@ module Raca
     def raise_on_error(response)
       error_klass = case response.code.to_i
       when 400 then BadRequestError
+      when 401 then UnauthorizedError
       when 404 then NotFoundError
       when 500 then ServerError
       else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: raca
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - James Healy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake