faraday_middleware 0.8.3 → 0.8.4

data/lib/faraday_middleware/response/caching.rb

@@ -68,8 +68,13 @@ module FaradayMiddleware
     end
 
     def finalize_response(response, env)
-      response = env[:response] = response.dup if response.frozen?
-      response.apply_request env unless response.env[:method]
+      response = response.dup if response.frozen?
+      env[:response] = response
+      unless env[:response_headers]
+        env.update response.env
+        # FIXME: omg hax
+        response.instance_variable_set('@env', env)
+      end
       response
     end
   end

data/lib/faraday_middleware/response_middleware.rb

@@ -26,8 +26,8 @@ module FaradayMiddleware
       @content_types = Array(options[:content_type])
     end
 
-    def call(env)
-      @app.call(env).on_complete do
+    def call(environment)
+      @app.call(environment).on_complete do |env|
         if process_response_type?(response_type(env)) and parse_response?(env)
           process_response(env)
         end

data/lib/faraday_middleware/version.rb

@@ -1,3 +1,3 @@
 module FaradayMiddleware
-  VERSION = "0.8.3"
+  VERSION = "0.8.4"
 end

data/spec/caching_test.rb

@@ -22,6 +22,16 @@ class CachingTest < Test::Unit::TestCase
     end
   end
 
+  class Lint < Struct.new(:app)
+    def call(env)
+      app.call(env).on_complete do
+        raise "no headers" unless env[:response_headers].is_a? Hash
+        raise "no response" unless env[:response].is_a? Faraday::Response
+        raise "env not identical" unless env[:response].env.object_id == env.object_id
+      end
+    end
+  end
+
   def setup
     @cache = TestCache.new
 
@@ -31,6 +41,7 @@ class CachingTest < Test::Unit::TestCase
     }
 
     @conn = Faraday.new do |b|
+      b.use Lint
       b.use FaradayMiddleware::Caching, @cache
       b.adapter :test do |stub|
         stub.get('/', &response)
@@ -55,7 +66,7 @@ class CachingTest < Test::Unit::TestCase
     get('/') # make cache
     response = get('/')
     assert_equal :get, response.env[:method]
-    assert_equal '/', response.env[:url].to_s
+    assert_equal '/', response.env[:url].request_uri
   end
 
   def test_cache_query_params

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faraday_middleware
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-29 00:00:00.000000000 Z
+date: 2012-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70166886053120 !ruby/object:Gem::Requirement
+  requirement: &70176520423440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -25,10 +25,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70166886053120
+  version_requirements: *70176520423440
 - !ruby/object:Gem::Dependency
   name: multi_xml
-  requirement: &70166886068140 !ruby/object:Gem::Requirement
+  requirement: &70176520413280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -36,10 +36,10 @@ dependencies:
         version: '0.2'
   type: :development
   prerelease: false
-  version_requirements: *70166886068140
+  version_requirements: *70176520413280
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70166886066400 !ruby/object:Gem::Requirement
+  requirement: &70176520410400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -47,10 +47,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70166886066400
+  version_requirements: *70176520410400
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70166886064880 !ruby/object:Gem::Requirement
+  requirement: &70176520395720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -58,10 +58,10 @@ dependencies:
         version: '1.2'
   type: :development
   prerelease: false
-  version_requirements: *70166886064880
+  version_requirements: *70176520395720
 - !ruby/object:Gem::Dependency
   name: rash
-  requirement: &70166886062240 !ruby/object:Gem::Requirement
+  requirement: &70176520393980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -69,10 +69,10 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *70166886062240
+  version_requirements: *70176520393980
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70166886080220 !ruby/object:Gem::Requirement
+  requirement: &70176520392900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -80,10 +80,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70166886080220
+  version_requirements: *70176520392900
 - !ruby/object:Gem::Dependency
   name: simple_oauth
-  requirement: &70166886078240 !ruby/object:Gem::Requirement
+  requirement: &70176520391440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -91,10 +91,10 @@ dependencies:
         version: '0.1'
   type: :development
   prerelease: false
-  version_requirements: *70166886078240
+  version_requirements: *70176520391440
 - !ruby/object:Gem::Dependency
   name: rack-cache
-  requirement: &70166886075580 !ruby/object:Gem::Requirement
+  requirement: &70176520390140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -102,7 +102,7 @@ dependencies:
         version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *70166886075580
+  version_requirements: *70176520390140
 description: Various middleware for Faraday
 email:
 - sferik@gmail.com