saddle 0.0.44 → 0.0.45

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.0.45
+* DefaultResponse is now the top-level middleware
+* DefaultResponse now catches *all* exceptions
+* Some cleanup in the requester's connection builder
+
 # 0.0.44
 * Fixed a bug where child endpoints were being attached to the parent's class. This would
   cause problems because the root node's class is always TraversalEndpoint, and would be shared

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

@@ -12,7 +12,7 @@ module Saddle
         def call(env)
           begin
             @app.call(env)
-          rescue Faraday::Error::ClientError
+          rescue
             if res = env[:request][:default_response]
               return ::Faraday::Response.new(:body => res)
             else

data/lib/saddle/requester.rb

@@ -120,35 +120,31 @@ module Saddle
         # Include the requester level options
         builder.options[:client_options] = @options
 
-        # Include a saddle hash
+        # Config options
+        builder.options[:timeout] = @timeout
+        builder.options[:request_style] = @request_style
+        builder.options[:num_retries] = @num_retries
         builder.options[:saddle] = {
           :client => @parent_client,
         }
 
-        # Config options
-        unless @timeout.nil?
-          builder.options[:timeout] = @timeout
-          builder.options[:request_style] = @request_style
-          builder.options[:num_retries] = @num_retries
-        end
+        # Support default return values upon exception
+        builder.use(Saddle::Middleware::Response::DefaultResponse)
 
         # Hard timeout on the entire request
         builder.use(Saddle::Middleware::RubyTimeout)
 
+        # Apply additional implementation-specific middlewares
+        @additional_middlewares.each do |m|
+          builder.use(m[:klass], *m[:args])
+        end
+
         # Set up a user agent
         builder.use(Saddle::Middleware::Request::UserAgent)
 
         # Set up the path prefix if needed
         builder.use(Saddle::Middleware::Request::PathPrefix)
 
-        # Support default return values upon exception
-        builder.use(Saddle::Middleware::Response::DefaultResponse)
-
-        # Apply additional implementation-specific middlewares
-        @additional_middlewares.each do |m|
-          builder.use(m[:klass], *m[:args])
-        end
-
         # Request encoding
         builder.use(Saddle::Middleware::Request::JsonEncoded)
         builder.use(Saddle::Middleware::Request::UrlEncoded)

data/lib/saddle/version.rb

@@ -1,3 +1,3 @@
 module Saddle
-  VERSION = '0.0.44'
+  VERSION = '0.0.45'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saddle
 version: !ruby/object:Gem::Version
-  version: 0.0.44
+  version: 0.0.45
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-16 00:00:00.000000000 Z
+date: 2013-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport