social-avatar-proxy 1.0.1 → 1.1.0

data/README.md

@@ -2,10 +2,12 @@
 
 This gem acts as a proxy for avatars on Twitter & Facebook.
 
-[![Build Status][2]][1]
+[![Build Status][2]][1] [![Code Climate][3]][4]
 
   [1]: http://travis-ci.org/platformq/social-avatar-proxy
   [2]: https://secure.travis-ci.org/platformq/social-avatar-proxy.png?branch=master
+  [3]: https://codeclimate.com/badge.png
+  [4]: https://codeclimate.com/github/platformq/social-avatar-proxy
 
 ## Installation
 

data/lib/social_avatar_proxy/app.rb

@@ -1,6 +1,8 @@
 require "social_avatar_proxy/facebook_avatar"
 require "social_avatar_proxy/twitter_avatar"
 require "social_avatar_proxy/routes"
+require "social_avatar_proxy/timeout_error"
+require "social_avatar_proxy/too_many_redirects_error"
 require "rack"
 
 module SocialAvatarProxy
@@ -28,8 +30,13 @@ module SocialAvatarProxy
     
     def call(env)
       @request = Rack::Request.new(env)
-      # return the response
-      response.finish
+      begin
+        response.finish
+      rescue TimeoutError => e
+        timeout
+      rescue TooManyRedirectsError => e
+        bad_gateway
+      end
     end
     
     def path_prefix
@@ -77,6 +84,14 @@ module SocialAvatarProxy
       Rack::Response.new("Not Found", 404)
     end
     
+    def timeout
+      Rack::Response.new("Remote server timeout", 504)
+    end
+    
+    def bad_gateway
+      Rack::Response.new("Bad response from remote server", 502)
+    end
+    
     def routes
       Routes.new(self)
     end

data/lib/social_avatar_proxy/remote_file_resolver.rb

@@ -1,16 +1,15 @@
+require "social_avatar_proxy/timeout_error"
+require "social_avatar_proxy/too_many_redirects_error"
 require "net/https"
 require "net/http"
 require "uri"
 require "timeout"
 
-module SocialAvatarProxy
-  class TooManyRedirects < StandardError; end
-  class TimeoutError < Timeout::Error; end
-  
+module SocialAvatarProxy  
   class RemoteFileResolver
     def initialize(url, limit = 5)
       # timeout if we have no redirects left
-      raise TooManyRedirects if limit <= 0
+      raise TooManyRedirectsError if limit <= 0
       # store the limit and URL
       @url, @redirect_limit = url, limit
     end

data/lib/social_avatar_proxy/timeout_error.rb

@@ -0,0 +1,5 @@
+require "timeout"
+
+module SocialAvatarProxy
+  class TimeoutError < Timeout::Error; end
+end

data/lib/social_avatar_proxy/too_many_redirects_error.rb

@@ -0,0 +1,3 @@
+module SocialAvatarProxy
+  class TooManyRedirectsError < StandardError; end
+end

data/lib/social_avatar_proxy/version.rb

@@ -1,3 +1,3 @@
 module SocialAvatarProxy
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/spec/social_avatar_proxy/app_spec.rb

@@ -64,6 +64,26 @@ describe SocialAvatarProxy::App do
   end
   
   context "given a valid path" do
+    context "when the remote server times out" do
+      before(:each) do
+        app.should_receive(:response).and_raise(SocialAvatarProxy::TimeoutError)
+      end
+      
+      it "should return a 504 response" do
+        expect(subject.get("/facebook/61413673").status).to eq(504)
+      end
+    end
+    
+    context "when the remote server has too many redirects" do
+      before(:each) do
+        app.should_receive(:response).and_raise(SocialAvatarProxy::TooManyRedirectsError)
+      end
+      
+      it "should return a 502 response" do
+        expect(subject.get("/facebook/61413673").status).to eq(502)
+      end
+    end
+    
     context "that finds an existing avatar" do
       let(:response) { successful_response }
       let(:path) { "/facebook/61413673" }

data/spec/social_avatar_proxy/remote_file_resolver_spec.rb

@@ -29,7 +29,7 @@ describe SocialAvatarProxy::RemoteFileResolver do
     it "should throw an exception" do
       expect {
         subject.resolve
-      }.to raise_error(SocialAvatarProxy::TooManyRedirects)
+      }.to raise_error(SocialAvatarProxy::TooManyRedirectsError)
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social-avatar-proxy
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-03 00:00:00.000000000 Z
+date: 2012-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -131,6 +131,8 @@ files:
 - lib/social_avatar_proxy/path_helpers.rb
 - lib/social_avatar_proxy/remote_file_resolver.rb
 - lib/social_avatar_proxy/routes.rb
+- lib/social_avatar_proxy/timeout_error.rb
+- lib/social_avatar_proxy/too_many_redirects_error.rb
 - lib/social_avatar_proxy/twitter_avatar.rb
 - lib/social_avatar_proxy/version.rb
 - social-avatar-proxy.gemspec
@@ -158,21 +160,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1989247330318419261
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1989247330318419261
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: This gem acts as a proxy for avatars on Twitter & Facebook.