saddle 0.0.46 → 0.0.48

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    Yjk4ZjdjM2Y4ZGM5NDk1ZjI0MzA5M2ZjY2EyZTA0ODRlMTA0YjY0MQ==
+  data.tar.gz: !binary |-
+    Yjk0ZWYwMjVkNmE0MDgzZmE4MDYyOWZlYjJkOTcyMTllZTcyN2E1Mw==
+SHA512:
+  metadata.gz: !binary |-
+    ZjBjZWI3Y2RjZWNhZGQwMmExODY2NzVkMzRiMDBlMGQ1MzRlZWVlNzc1Y2Jm
+    NTA3MjAxODk2YjE1ZTgyYjU4MjEwODkxMWE4ZDEyZWY4ZTNmOGVmMjMyNmRl
+    MGRlMDYzNzQxMjZkNzlhMzcwNWJhMWYwYTU3OGUyZDVhMTQ5OWQ=
+  data.tar.gz: !binary |-
+    OGFmNWY3MWY3MmMxMDM2MjBiMDY0NDMxMTEwZjZmYjFmYmY2ZWRhYTcwYmMw
+    YWEyZGJmYWJjMGFkZGVkMjRhN2Q2MDBmODFiZGZmMjY2Yzg4Y2UzZThiNWMy
+    OTI4OTI2YWUxODVjOGQ1MTM4ZjgyMjg5N2RhNjBjYjgyMjQzMmE=

data/.gitignore

@@ -5,6 +5,9 @@
 # RVM
 .rvmrc
 
+# rbenv
+.ruby-version
+
 # Gems
 *.gem
 Gemfile.lock

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.0.48
+* Optionally return the full response object using `:return_full_response`
+
+# 0.0.47
+* Pass arguments to the underlying HTTP adapter via `:http_adapter`
+
 # 0.0.46
 * Moving the path_prefix and user-agent middlewares before the custom middleware block.
 ** This is needed for OAuth 1.0 middleware to work.

data/lib/saddle/options.rb

@@ -16,7 +16,8 @@ module Saddle
         :timeout => timeout,
         :http_adapter => http_adapter,
         :stubs => stubs,
-        :additional_middlewares => self.additional_middlewares,
+        :return_full_response => return_full_response,
+        :additional_middlewares => self.additional_middlewares
       }
     end
 
@@ -56,7 +57,8 @@ module Saddle
       30
     end
 
-    # Support specification of the HTTP adapter being used
+    # Support specification of the HTTP adapter being used. Returns a symbol or
+    # hash of the form { :key => :net_http, :args => [ ... ] }.
     def http_adapter
       :net_http
     end
@@ -66,7 +68,10 @@ module Saddle
       nil
     end
 
-
+    # Should the client return the full response object, or just the body?
+    def return_full_response
+      false
+    end
 
     # Use this to add additional middleware to the request stack
     # ex:

data/lib/saddle/requester.rb

@@ -58,12 +58,18 @@ module Saddle
       raise ':additional_middleware must be an Array' unless @additional_middlewares.is_a?(Array)
       raise 'invalid middleware found' unless @additional_middlewares.all? { |m| m[:klass] < Faraday::Middleware }
       raise 'middleware arguments must be an array' unless @additional_middlewares.all? { |m| m[:args].nil? || m[:args].is_a?(Array) }
+
       @http_adapter = opt[:http_adapter] || :net_http
-      raise ':http_adapter must be a symbol' unless @http_adapter.is_a?(Symbol)
+      raise ':http_adapter must be a symbol or a hash' unless @http_adapter.is_a?(Symbol) || @http_adapter.is_a?(Hash)
+      @http_adapter = { :key => @http_adapter } if @http_adapter.is_a?(Symbol)
+      raise 'adapter key must be a symbol' unless @http_adapter[:key].is_a?(Symbol)
+      raise 'adapter arguments must be an array' unless @http_adapter[:args].nil? || @http_adapter[:args].is_a?(Array)
+
       @stubs = opt[:stubs] || nil
       unless @stubs.nil?
         raise ':stubs must be a Faraday::Adapter::Test::Stubs' unless @stubs.is_a?(Faraday::Adapter::Test::Stubs)
       end
+      @return_full_response = opt[:return_full_response] || false
     end
 
 
@@ -73,7 +79,7 @@ module Saddle
         req.options.deep_merge!(options)
         req.url(url, params)
       end
-      response.body
+      handle_response(response)
     end
 
     # Make a POST request
@@ -83,7 +89,7 @@ module Saddle
         req.url(url)
         req.body = data
       end
-      response.body
+      handle_response(response)
     end
 
     # Make a PUT request
@@ -93,7 +99,7 @@ module Saddle
         req.url(url)
         req.body = data
       end
-      response.body
+      handle_response(response)
     end
 
     # Make a DELETE request
@@ -102,13 +108,18 @@ module Saddle
         req.options.deep_merge!(options)
         req.url(url, params)
       end
-      response.body
+      handle_response(response)
     end
 
 
 
     private
 
+    # Return the appropriate response format based on options
+    def handle_response response
+      @return_full_response ? response : response.body
+    end
+
     # Construct a base url using this requester's settings
     def base_url
       "http#{'s' if @use_ssl}://#{@host}#{":#{@port}" if @port}"
@@ -164,7 +175,7 @@ module Saddle
         # Set up our adapter
         if @stubs.nil?
           # Use the default adapter
-          builder.adapter(@http_adapter)
+          builder.adapter(@http_adapter[:key], *@http_adapter[:args])
         else
           # Use the test adapter
           builder.adapter(:test, @stubs)

data/lib/saddle/version.rb

@@ -1,3 +1,3 @@
 module Saddle
-  VERSION = '0.0.46'
+  VERSION = '0.0.48'
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: saddle
 version: !ruby/object:Gem::Version
-  version: 0.0.46
-  prerelease: 
+  version: 0.0.48
 platform: ruby
 authors:
 - Mike Lewis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-08 00:00:00.000000000 Z
+date: 2013-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -127,27 +120,26 @@ files:
 homepage: https://github.com/mLewisLogic/saddle
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A full-featured, generic consumer layer for you to build API client implementations
   with.
 test_files: