vcr 1.7.2 → 1.8.0

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 ## In git
 
-[Full Changelog](http://github.com/myronmarston/vcr/compare/v1.7.2...master)
+[Full Changelog](http://github.com/myronmarston/vcr/compare/v1.8.0...master)
+
+## 1.8.0 (March 31, 2011)
+
+[Full Changelog](http://github.com/myronmarston/vcr/compare/v1.7.2...v1.8.0)
+
+* Updated Faraday middleware to work with newly released Faraday 0.6.0.
 
 ## 1.7.2 (March 26, 2011)
 

data/lib/vcr/http_stubbing_adapters/faraday.rb

@@ -6,8 +6,8 @@ module VCR
       include Common
       extend self
 
-      MINIMUM_VERSION = '0.5.3'
-      MAXIMUM_VERSION = '0.5'
+      MINIMUM_VERSION = '0.6.0'
+      MAXIMUM_VERSION = '0.6'
 
       attr_writer :http_connections_allowed
 

data/lib/vcr/middleware/faraday.rb

@@ -16,13 +16,13 @@ module VCR
             if VCR::HttpStubbingAdapters::Faraday.uri_should_be_ignored?(request.uri)
               @app.call(env)
             elsif response = VCR::HttpStubbingAdapters::Faraday.stubbed_response_for(request_matcher)
-              env.update(
-                :status           => response.status.code,
-                :response_headers => normalized_headers(response.headers),
-                :body             => response.body
-              )
+              headers = env[:response_headers] ||= ::Faraday::Utils::Headers.new
+              headers.update response.headers if response.headers
+              env.update :status => response.status.code, :body => response.body
 
-              env[:response].finish(env)
+              faraday_response = ::Faraday::Response.new
+              faraday_response.finish(env) unless env[:parallel_manager]
+              env[:response] = faraday_response
             elsif VCR::HttpStubbingAdapters::Faraday.http_connections_allowed?
               response = @app.call(env)
 
@@ -63,16 +63,6 @@ module VCR
             '1.1'
           )
         end
-
-        def normalized_headers(headers)
-          hash = {}
-
-          headers.each do |key, values|
-            hash[key] = values.join(', ')
-          end if headers
-
-          hash
-        end
     end
   end
 end

data/lib/vcr/version.rb

@@ -3,7 +3,7 @@ module VCR
 
   def version
     @version ||= begin
-      string = '1.7.2'
+      string = '1.8.0'
 
       def string.parts
         split('.').map { |p| p.to_i }

data/spec/support/http_library_adapters.rb

@@ -127,8 +127,8 @@ end
     end
 
     def get_header(header_key, response)
-      header = response.headers[header_key.downcase]
-      header.split(', ')
+      value = response.headers[header_key]
+      value.split(', ') if value
     end
 
     def make_http_request(method, url, body = nil, headers = {})

data/spec/support/shared_example_groups/http_library.rb

@@ -25,7 +25,6 @@ shared_examples_for "an http library" do |library, supported_request_match_attri
         define_method :should_be_pending do
           if header_count == 2
             [
-              'Faraday (patron)',
               'HTTP Client',
               'EM HTTP Request',
               'Curb'

data/spec/vcr/http_stubbing_adapters/faraday_spec.rb

@@ -7,9 +7,9 @@ describe VCR::HttpStubbingAdapters::Faraday, :without_monkey_patches => :all do
     :status_message_not_exposed, :does_not_support_rotating_responses
 
   it_performs('version checking',
-    :valid    => %w[ 0.5.3 0.5.10 ],
-    :too_low  => %w[ 0.5.2 0.4.99 ],
-    :too_high => %w[ 0.6.0 1.0.0 ]
+    :valid    => %w[ 0.6.0 0.6.10 ],
+    :too_low  => %w[ 0.5.9 0.4.99 ],
+    :too_high => %w[ 0.7.0 1.0.0 ]
   ) do
     before(:each) { @orig_version = Faraday::VERSION }
     after(:each)  { Faraday::VERSION = @orig_version }

data/vcr.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
     'fakeweb'         => '~> 1.3.0',
     'webmock'         => '~> 1.6.0',
 
-    'faraday'         => '~> 0.5.3',
+    'faraday'         => '~> 0.6.0',
     'httpclient'      => '~> 2.1.5.2',
 
     'timecop'         => '~> 0.3.5',

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vcr
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 55
   prerelease: 
   segments: 
   - 1
-  - 7
-  - 2
-  version: 1.7.2
+  - 8
+  - 0
+  version: 1.8.0
 platform: ruby
 authors: 
 - Myron Marston
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-26 00:00:00 -07:00
+date: 2011-03-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 7
         segments: 
         - 0
-        - 5
-        - 3
-        version: 0.5.3
+        - 6
+        - 0
+        version: 0.6.0
   requirement: *id001
 - !ruby/object:Gem::Dependency 
   prerelease: false