faraday 0.6.0 → 0.6.1

data/faraday.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'faraday'
-  s.version           = '0.6.0'
-  s.date              = '2011-03-31'
+  s.version           = '0.6.1'
+  s.date              = '2011-04-13'
   s.rubyforge_project = 'faraday'
 
   ## Make sure your summary is short. The description may be as long

data/lib/faraday.rb

@@ -1,5 +1,5 @@
 module Faraday
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 
   class << self
     attr_accessor :default_adapter

data/lib/faraday/adapter.rb

@@ -31,8 +31,13 @@ module Faraday
       end
     end
 
-    def response_headers(env)
-      env[:response_headers] ||= Utils::Headers.new
+    def save_response(env, status, body, headers = nil)
+      env[:status] = status
+      env[:body] = body
+      env[:response_headers] = Utils::Headers.new.tap do |response_headers|
+        response_headers.update headers unless headers.nil?
+        yield response_headers if block_given?
+      end
     end
   end
 end

data/lib/faraday/adapter/action_dispatch.rb

@@ -21,8 +21,7 @@ module Faraday
         super
         @session.__send__(env[:method], env[:url].request_uri, env[:body], env[:request_headers])
         resp = @session.response
-        env.update :status => resp.status, :body => resp.body
-        response_headers(env).update resp.headers
+        save_response(env, resp.status, resp.body, resp.headers)
         @app.call env
       end
     end

data/lib/faraday/adapter/em_synchrony.rb

@@ -51,10 +51,11 @@ module Faraday
           client = block.call
         end
 
-        client.response_header.each do |name, value|
-          response_headers(env)[name.to_sym] = value
+        save_response(env, client.response_header.status, client.response) do |response_headers|
+          client.response_header.each do |name, value|
+            response_headers[name.to_sym] = value
+          end
         end
-        env.update :status => client.response_header.status, :body => client.response
 
         @app.call env
       rescue Errno::ECONNREFUSED

data/lib/faraday/adapter/excon.rb

@@ -17,8 +17,7 @@ module Faraday
           :headers => env[:request_headers],
           :body    => env[:body]
 
-        env.update :status => resp.status.to_i, :body => resp.body
-        response_headers(env).update resp.headers
+        save_response(env, resp.status.to_i, resp.body, resp.headers)
 
         @app.call env
       rescue ::Excon::Errors::SocketError

data/lib/faraday/adapter/net_http.rb

@@ -22,6 +22,7 @@ module Faraday
           http.cert        = ssl[:client_cert] if ssl[:client_cert]
           http.key         = ssl[:client_key]  if ssl[:client_key]
           http.ca_file     = ssl[:ca_file]     if ssl[:ca_file]
+          http.ca_path     = ssl[:ca_path]     if ssl[:ca_path]
           http.cert_store  = ssl[:cert_store]  if ssl[:cert_store]
         end
 
@@ -53,10 +54,11 @@ module Faraday
           raise Error::ConnectionFailed, $!
         end
 
-        http_response.each_header do |key, value|
-          response_headers(env)[key] = value
+        save_response(env, http_response.code.to_i, http_response.body) do |response_headers|
+          http_response.each_header do |key, value|
+            response_headers[key] = value
+          end
         end
-        env.update :status => http_response.code.to_i, :body => http_response.body
 
         @app.call env
       end

data/lib/faraday/adapter/patron.rb

@@ -21,8 +21,7 @@ module Faraday
           raise Error::ConnectionFailed, $!
         end
 
-        env.update :status => response.status, :body => response.body
-        response_headers(env).update response.headers
+        save_response(env, response.status, response.body, response.headers)
 
         @app.call env
       end

data/lib/faraday/adapter/test.rb

@@ -110,8 +110,7 @@ module Faraday
 
         if stub = stubs.match(env[:method], normalized_path, env[:body])
           status, headers, body = stub.block.call(env)
-          env.update :status => status, :body => body
-          response_headers(env).update headers
+          save_response(env, status, body, headers)
         else
           raise "no stubbed request for #{env[:method]} #{normalized_path} #{env[:body]}"
         end

data/lib/faraday/adapter/typhoeus.rb

@@ -27,8 +27,10 @@ module Faraday
 
         is_parallel = !!env[:parallel_manager]
         req.on_complete do |resp|
-          env.update :status => resp.code, :body => resp.body
-          response_headers(env).parse resp.headers
+          save_response(env, resp.code, resp.body) do |response_headers|
+            response_headers.parse resp.headers
+          end
+          # in async mode, :response is initialized at this point
           env[:response].finish(env) if is_parallel
         end
 

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: faraday
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
-  segments: 
-  - 0
-  - 6
-  - 0
-  version: 0.6.0
+  prerelease: 
+  version: 0.6.1
 platform: ruby
 authors: 
 - Rick Olson
@@ -15,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-31 00:00:00 -07:00
-default_executable: 
+date: 2011-04-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -26,10 +20,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 8
         version: "0.8"
   type: :development
   version_requirements: *id001
@@ -41,11 +31,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 2
-        - 4
         version: 2.2.4
   type: :runtime
   version_requirements: *id002
@@ -57,11 +42,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
         version: 1.1.0
   type: :runtime
   version_requirements: *id003
@@ -73,17 +53,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
         version: 1.1.0
     - - <
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
         version: "2"
   type: :runtime
   version_requirements: *id004
@@ -134,7 +106,6 @@ files:
 - test/middleware_stack_test.rb
 - test/request_middleware_test.rb
 - test/response_middleware_test.rb
-has_rdoc: true
 homepage: http://github.com/technoweenie/faraday
 licenses: []
 
@@ -148,25 +119,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 17
-      segments: 
-      - 1
-      - 3
-      - 5
       version: 1.3.5
 requirements: []
 
 rubyforge_project: faraday
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 2
 summary: HTTP/REST API client library.
@@ -180,3 +143,4 @@ test_files:
 - test/middleware_stack_test.rb
 - test/request_middleware_test.rb
 - test/response_middleware_test.rb
+has_rdoc: