faraday_middleware 0.8.5 → 0.8.6

data/.travis.yml

@@ -1,7 +1,9 @@
+language: ruby
 rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - jruby
-  - rbx
-  - ree
+  - jruby-18mode
+  - jruby-19mode
+  - rbx-18mode
+  - rbx-19mode

data/lib/faraday_middleware/rack_compatible.rb

@@ -67,13 +67,14 @@ module FaradayMiddleware
 
     def finalize_response(env, rack_response)
       status, headers, body = rack_response
-      body = body.inject('') { |str, part| str << part }
+      body = body.inject() { |str, part| str << part }
       headers = Faraday::Utils::Headers.new(headers) unless Faraday::Utils::Headers === headers
 
-      response_env = { :status => status, :body => body, :response_headers => headers }
+      env.update :status => status.to_i,
+                 :body => body,
+                 :response_headers => headers
 
-      env[:response] ||= Faraday::Response.new({})
-      env[:response].env.update(response_env)
+      env[:response] ||= Faraday::Response.new(env)
       env[:response]
     end
   end

data/lib/faraday_middleware/version.rb

@@ -1,3 +1,3 @@
 module FaradayMiddleware
-  VERSION = "0.8.5"
+  VERSION = "0.8.6"
 end

data/spec/caching_test.rb

@@ -117,10 +117,17 @@ class HttpCachingTest < Test::Unit::TestCase
   def_delegators :@conn, :get, :post
 
   def test_cache_get
-    assert_equal 'request:1', get('/', :user_agent => 'test').body
+    response = get('/', :user_agent => 'test')
+    assert_equal 'request:1', response.body
+    assert_equal :get, response.env[:method]
+    assert_equal 200, response.status
+
     response = get('/', :user_agent => 'test')
     assert_equal 'request:1', response.body
     assert_equal 'text/plain', response['content-type']
+    assert_equal :get, response.env[:method]
+    assert response.env[:request].respond_to?(:fetch)
+    assert_equal 200, response.status
 
     assert_equal 'request:2', post('/').body
   end

data/spec/helper.rb

@@ -1,15 +1,14 @@
 if ENV['COVERAGE']
   require 'simplecov'
 
-  class SimpleCov::Formatter::QualityFormatter
+  SimpleCov.formatter = Class.new do
     def format(result)
-      SimpleCov::Formatter::HTMLFormatter.new.format(result)
+      SimpleCov::Formatter::HTMLFormatter.new.format(result) unless ENV['CI']
       File.open('coverage/covered_percent', 'w') do |f|
         f.puts result.source_files.covered_percent.to_i
       end
     end
   end
-  SimpleCov.formatter = SimpleCov::Formatter::QualityFormatter
 
   SimpleCov.start do
     # add_filter 'faraday_middleware.rb'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faraday_middleware
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-11 00:00:00.000000000 Z
+date: 2012-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70319499815400 !ruby/object:Gem::Requirement
+  requirement: &70323858414060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -25,10 +25,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70319499815400
+  version_requirements: *70323858414060
 - !ruby/object:Gem::Dependency
   name: multi_xml
-  requirement: &70319499836420 !ruby/object:Gem::Requirement
+  requirement: &70323858413240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -36,10 +36,10 @@ dependencies:
         version: '0.2'
   type: :development
   prerelease: false
-  version_requirements: *70319499836420
+  version_requirements: *70323858413240
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70319499834040 !ruby/object:Gem::Requirement
+  requirement: &70323858412680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -47,10 +47,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70319499834040
+  version_requirements: *70323858412680
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70319499847520 !ruby/object:Gem::Requirement
+  requirement: &70323858412120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -58,10 +58,10 @@ dependencies:
         version: '1.2'
   type: :development
   prerelease: false
-  version_requirements: *70319499847520
+  version_requirements: *70323858412120
 - !ruby/object:Gem::Dependency
   name: rash
-  requirement: &70319499843360 !ruby/object:Gem::Requirement
+  requirement: &70323858411460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -69,10 +69,10 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *70319499843360
+  version_requirements: *70323858411460
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70319499841140 !ruby/object:Gem::Requirement
+  requirement: &70323858410680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -80,10 +80,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70319499841140
+  version_requirements: *70323858410680
 - !ruby/object:Gem::Dependency
   name: simple_oauth
-  requirement: &70319499852100 !ruby/object:Gem::Requirement
+  requirement: &70323858410200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -91,10 +91,10 @@ dependencies:
         version: '0.1'
   type: :development
   prerelease: false
-  version_requirements: *70319499852100
+  version_requirements: *70323858410200
 - !ruby/object:Gem::Dependency
   name: rack-cache
-  requirement: &70319499897100 !ruby/object:Gem::Requirement
+  requirement: &70323858409700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -102,7 +102,7 @@ dependencies:
         version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *70319499897100
+  version_requirements: *70323858409700
 description: Various middleware for Faraday
 email:
 - sferik@gmail.com
@@ -171,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Various middleware for Faraday
@@ -188,4 +188,3 @@ test_files:
 - spec/parse_xml_spec.rb
 - spec/parse_yaml_spec.rb
 - spec/rashify_spec.rb
-has_rdoc: