ruby-satisfaction 0.6.5 → 0.6.7

data/Gemfile.lock

@@ -47,9 +47,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activesupport (~> 2.3)
   bundler (>= 1.0.0)
   fakeweb (~> 1.3)
   gemcutter (>= 0.6.1)
+  json (>= 1.4.6)
+  memcache-client (>= 1.5.0)
+  nokogiri (>= 1.4.2)
+  oauth (>= 0.3.5)
   open_gem (>= 1.4)
   rr (= 1.0.2)
   rspec (~> 2.2)

data/README.markdown

@@ -11,6 +11,14 @@ For questions, please visit the [Get Satisfaction API community][3]
 
 Changelog
 =========
+0.6.7
+
+* Fixed Sfn::Loader#get so it uses cached content when a 304 Not Modified is received.
+
+0.6.6
+
+* Handle HTTP 502/504 for unicorn.
+
 0.6.5
 
 * Fixed a divide-by-zero bug.

data/lib/satisfaction/exceptions.rb

@@ -7,4 +7,6 @@ module Sfn
   class NotFound < Sfn::Error; end
   class SiteMaintenance < Sfn::Error; end
   class MethodNotAllowed < Sfn::Error; end
+  class BadGateway < Sfn::Error; end
+  class GatewayTimeOut < Sfn::Error; end
 end

data/lib/satisfaction/loader.rb

@@ -36,17 +36,19 @@ class Sfn::Loader
     http = Net::HTTP.new(uri.host, uri.port)
     add_authentication(request, http, options)
     response = execute(http, request)
-    
+
     case response
     when Net::HTTPSuccess
       cache.put(uri, response)
       [:ok, response.body]
+    when Net::HTTPNotModified
+      [:ok, cache_record.body]
     when Net::HTTPMovedPermanently, Net::HTTPMovedTemporarily
       limit = options[:redirect_limit] || 3
       raise Sfn::TooManyRedirects, "Too many redirects" unless limit > 0
       get(response['location'], options.merge(:redirect_limit => limit - 1))
     when Net::HTTPBadRequest
-      raise Sfn::BadRequest, "Bad request. Response body:\n" + response.body
+      raise Sfn::BadRequest, "Bad request. Response body:\n#{response.body}"
     when Net::HTTPForbidden, Net::HTTPUnauthorized
       message = "Not authorized"
       if restricted_provider = response['X-Sfn-Restricted-Identity-Provider']
@@ -60,8 +62,12 @@ class Sfn::Loader
       raise Sfn::NotFound, "Not found"
     when Net::HTTPServiceUnavailable
       raise Sfn::SiteMaintenance, maintenance_message(response.body)
+    when Net::HTTPBadGateway
+      raise Sfn::BadGateway, "Bad Gateway"
+    when Net::HTTPGatewayTimeOut
+      raise Sfn::GatewayTimeOut, "Gateway TimeOut"
     else
-      raise Sfn::Error, "Encountered error. Body of response:\n" + response.body
+      raise Sfn::Error, "Encountered error. Body of response:\n#{response.body}"
     end
   end
 
@@ -96,7 +102,7 @@ class Sfn::Loader
     when Net::HTTPNotFound
       raise Sfn::NotFound, "Not found"
     when Net::HTTPBadRequest
-      raise Sfn::BadRequest, "Bad request. Response body:\n" + response.body
+      raise Sfn::BadRequest, "Bad request. Response body:\n#{response.body}"
     when Net::HTTPSuccess
       [:ok, response.body]
     when Net::HTTPMethodNotAllowed
@@ -107,8 +113,12 @@ class Sfn::Loader
       raise Sfn::MethodNotAllowed, "Method not allowed"
     when Net::HTTPServiceUnavailable
       raise Sfn::SiteMaintenance, maintenance_message(response.body)
+    when Net::HTTPBadGateway
+      raise Sfn::BadGateway, "Bad Gateway"
+    when Net::HTTPGatewayTimeOut
+      raise Sfn::GatewayTimeOut, "Gateway TimeOut"
     else
-      raise Sfn::Error, "Encountered error. Body of response:\n" + response.body
+      raise Sfn::Error, "Encountered error. Body of response:\n#{response.body}"
     end
   end
   

data/lib/satisfaction/version.rb

@@ -2,7 +2,7 @@ module Satisfaction
   module VERSION
     MAJOR = 0
     MINOR = 6
-    PATCH = 5
+    PATCH = 7
     PRE   = nil
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

data/spec/satisfaction/loader_spec.rb

@@ -8,6 +8,7 @@ describe Sfn::Loader do
     before(:each) do
       @response = nil
       @status_code = '200'
+      @loader = Sfn::Loader.new
       @get = lambda do
         FakeWeb.register_uri(
           :get,
@@ -15,9 +16,8 @@ describe Sfn::Loader do
           :body => @response_body,
           :status => [@status_code]
         )
-        loader = Sfn::Loader.new
-        stub(loader).add_authentication {}
-        @response = loader.get('http://test')
+        stub(@loader).add_authentication {}
+        @response = @loader.get('http://test')
       end
     end
 
@@ -33,6 +33,21 @@ describe Sfn::Loader do
       end
     end
 
+    describe "when the status is not modified (304)" do
+      before(:each) do
+        @status_code = '304'
+        @cached_body = {:id => "123", :domain => "foo.bar"}.to_json
+        @response_body = nil
+        stub(@loader.cache).get(anything) { Sfn::Loader::CacheRecord.new('http://test', 'etag-foo', @cached_body) }
+
+        @get.call
+      end
+
+      it "should return a status of :ok and the cached response body" do
+        @response.should == [:ok, @cached_body]
+      end
+    end
+
     describe "when we are in a redirect loop" do
       attr_reader :loader
 
@@ -154,6 +169,27 @@ describe Sfn::Loader do
         end
       end
     end
+
+  # ---- GATEWAY -----------------------------------------------------------------------------------------------
+    describe "when the status is 502 (Bad Gateway, returned when a Unicorn worker is killed)" do
+      before(:each) do
+        @status_code = '502'
+      end
+
+      it "should raise an Sfn::BadGateway error" do
+        @get.should raise_error(Sfn::BadGateway, "Bad Gateway")
+      end
+    end
+
+    describe "when the status is 504 (GatewayTimeOut)" do
+      before(:each) do
+        @status_code = '504'
+      end
+
+      it "should raise an Sfn::GatewayTimeOut error" do
+        @get.should raise_error(Sfn::GatewayTimeOut, "Gateway TimeOut")
+      end
+    end
   end
 
   # ==== POST ==================================================================================================
@@ -302,6 +338,27 @@ describe Sfn::Loader do
       end
     end
 
+  # ---- GATEWAY -----------------------------------------------------------------------------------------------
+    describe "when the status is 502 (Bad Gateway, returned when a Unicorn worker is killed)" do
+      before(:each) do
+        @status_code = '502'
+      end
+
+      it "should raise an Sfn::BadGateway error" do
+        @post.should raise_error(Sfn::BadGateway, "Bad Gateway")
+      end
+    end
+
+    describe "when the status is 504 (GatewayTimeOut)" do
+      before(:each) do
+        @status_code = '504'
+      end
+
+      it "should raise an Sfn::GatewayTimeOut error" do
+        @post.should raise_error(Sfn::GatewayTimeOut, "Gateway TimeOut")
+      end
+    end
+
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-satisfaction
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 6
-  - 5
-  version: 0.6.5
+  - 7
+  version: 0.6.7
 platform: ruby
 authors: 
 - Get Satisfaction
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-09 00:00:00 -07:00
+date: 2011-07-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency