saddle 0.0.36 → 0.0.37

data/lib/saddle/middleware/request/retry.rb

@@ -8,7 +8,7 @@ module Saddle
 
       # Catches exceptions and retries each request a limited number of times.
       #
-      # By default, it retries 2 times and performs exponential backoff, starting
+      # By default, it retries 0 times and performs exponential backoff, starting
       # at 50ms
       class Retry < Faraday::Middleware
         def initialize(app, ignored_exceptions=[])
@@ -17,7 +17,7 @@ module Saddle
         end
 
         def call(env)
-          retries = env[:request][:num_retries] || 2
+          retries = env[:request][:num_retries] || 0
           backoff = env[:request][:retry_backoff] || 0.050 # in seconds
           begin
             @app.call(self.class.deep_copy(env))

data/lib/saddle/middleware/response/raise_error.rb

@@ -0,0 +1,29 @@
+require 'faraday'
+
+
+module Saddle
+  module Middleware
+    module Response
+      class RaiseError < Faraday::Middleware
+
+        def call(env)
+          result = @app.call(env)
+
+          case result.status
+          when 404
+            raise Faraday::Error::ResourceNotFound, response_values(result)
+          when 400...600
+            raise Faraday::Error::ClientError, response_values(result)
+          end
+
+          result
+        end
+
+        def response_values(result)
+          {:status => result.status, :headers => result.headers, :body => result.body}
+        end
+
+      end
+    end
+  end
+end

data/lib/saddle/options.rb

@@ -47,7 +47,7 @@ module Saddle
 
     # Default number of retries per request
     def num_retries
-      3
+      1
     end
 
     # Default timeout per request (in seconds)

data/lib/saddle/requester.rb

@@ -12,6 +12,7 @@ require 'saddle/middleware/request/user_agent'
 
 require 'saddle/middleware/response/default_response'
 require 'saddle/middleware/response/parse_json'
+require 'saddle/middleware/response/raise_error'
 
 require 'saddle/middleware/ruby_timeout'
 
@@ -154,7 +155,7 @@ module Saddle
         builder.use(Saddle::Middleware::Request::Retry)
 
         # Raise exceptions on 4xx and 5xx errors
-        builder.use(Faraday::Response::RaiseError)
+        builder.use(Saddle::Middleware::Response::RaiseError)
 
         # Handle parsing out the response if it's JSON
         builder.use(Saddle::Middleware::Response::ParseJson)

data/lib/saddle/version.rb

@@ -1,3 +1,3 @@
 module Saddle
-  VERSION = '0.0.36'
+  VERSION = '0.0.37'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saddle
 version: !ruby/object:Gem::Version
-  version: 0.0.36
+  version: 0.0.37
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-26 00:00:00.000000000 Z
+date: 2013-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -90,6 +90,7 @@ files:
 - lib/saddle/middleware/request/user_agent.rb
 - lib/saddle/middleware/response/default_response.rb
 - lib/saddle/middleware/response/parse_json.rb
+- lib/saddle/middleware/response/raise_error.rb
 - lib/saddle/middleware/ruby_timeout.rb
 - lib/saddle/options.rb
 - lib/saddle/requester.rb