vcr 1.7.1 → 1.7.2

data/.travis.yml

@@ -1 +1,4 @@
 script: "rake ci:build"
+rvm:
+  - 1.8.7
+  - 1.9.2

data/CHANGELOG.md

@@ -1,6 +1,16 @@
 ## In git
 
-[Full Changelog](http://github.com/myronmarston/vcr/compare/v1.7.1...master)
+[Full Changelog](http://github.com/myronmarston/vcr/compare/v1.7.2...master)
+
+## 1.7.2 (March 26, 2011)
+
+[Full Changelog](http://github.com/myronmarston/vcr/compare/v1.7.1...v1.7.2)
+
+* Fixed Typhoeus adapter so headers are returned in the same form during
+  playback as they would be without VCR.  Bug reported by
+  [Avdi Grimm](https://github.com/avdi).
+* Fixed Faraday adapter so it treats response headers in the same way
+  Faraday itself does (i.e. with lowercase keys).
 
 ## 1.7.1 (March 19, 2011)
 

data/Gemfile

@@ -5,7 +5,7 @@ group :development do
   # patron and em-http-request can't install on JRuby, so we have to limit their platform here.
   platforms :ruby do
     gem 'patron',           '0.4.9'
-    gem 'em-http-request',  '~> 0.2.7'
+    gem 'em-http-request',  '~> 0.3.0'
     gem 'curb',             '0.7.8'
     gem 'typhoeus',         '~> 0.2.1'
   end

data/lib/vcr/http_stubbing_adapters/typhoeus.rb

@@ -32,7 +32,7 @@ module VCR
               ::Typhoeus::Response.new(
                 :code         => response.status.code,
                 :body         => response.body,
-                :headers_hash => response.headers
+                :headers_hash => normalized_response_headers(response)
               )
             end
           )
@@ -65,6 +65,16 @@ module VCR
 
         hash
       end
+
+      def normalized_response_headers(response)
+        hash = {}
+
+        response.headers.each do |key, values|
+          hash[key] = values.size == 1 ? values.first : values
+        end if response.headers
+
+        hash
+      end
     end
   end
 end

data/lib/vcr/middleware/faraday.rb

@@ -18,7 +18,7 @@ module VCR
             elsif response = VCR::HttpStubbingAdapters::Faraday.stubbed_response_for(request_matcher)
               env.update(
                 :status           => response.status.code,
-                :response_headers => correctly_cased_headers(response.headers || {}),
+                :response_headers => normalized_headers(response.headers),
                 :body             => response.body
               )
 
@@ -64,15 +64,14 @@ module VCR
           )
         end
 
-        def correctly_cased_headers(headers)
-          correctly_cased_hash = {}
+        def normalized_headers(headers)
+          hash = {}
 
-          headers.each do |key, value|
-            key = key.to_s.split('-').map { |segment| segment.capitalize }.join("-")
-            correctly_cased_hash[key] = value
-          end
+          headers.each do |key, values|
+            hash[key] = values.join(', ')
+          end if headers
 
-          correctly_cased_hash
+          hash
         end
     end
   end

data/lib/vcr/version.rb

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

data/spec/support/http_library_adapters.rb

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

data/spec/support/shared_example_groups/http_library.rb

@@ -14,6 +14,41 @@ shared_examples_for "an http library" do |library, supported_request_match_attri
     # so this gives us another alias we can use for the original method.
     alias make_request make_http_request
 
+    1.upto(2) do |header_count|
+      describe "making an HTTP request that responds with #{header_count} Set-Cookie header(s)" do
+        define_method :get_set_cookie_header do
+          VCR.use_cassette('header_test', :record => :once) do
+            get_header 'Set-Cookie', make_http_request(:get, "http://localhost:#{VCR::SinatraApp.port}/set-cookie-headers/#{header_count}")
+          end
+        end
+
+        define_method :should_be_pending do
+          if header_count == 2
+            [
+              'Faraday (patron)',
+              'HTTP Client',
+              'EM HTTP Request',
+              'Curb'
+            ].include?(adapter_module.http_library_name)
+          end
+        end
+
+        it 'returns the same header value when recording and replaying' do
+          pending "There appears to be a bug in the the HTTP stubbing library", :if => should_be_pending do
+            (recorded_val = get_set_cookie_header).should_not be_nil
+            replayed_val = get_set_cookie_header
+
+            # we don't care about order differences if the values are arrays
+            if recorded_val.is_a?(Array) && replayed_val.is_a?(Array)
+              replayed_val.should =~ recorded_val
+            else
+              replayed_val.should == recorded_val
+            end
+          end
+        end
+      end
+    end
+
     describe 'making an HTTP request' do
       let(:status)        { VCR::ResponseStatus.new(200, 'OK') }
       let(:interaction)   { VCR::HTTPInteraction.new(request, response) }
@@ -39,16 +74,8 @@ shared_examples_for "an http library" do |library, supported_request_match_attri
           let(:request)     { VCR::Request.new(:get, url) }
           let(:response)    { VCR::Response.new(status, nil, response_body, '1.1') }
 
-          def should_be_pending?
-            return false unless described_class == VCR::HttpStubbingAdapters::WebMock
-            return false unless request.uri.include?(CGI.escape('&'))
-            self.class.included_modules.first.http_library_name == 'EM HTTP Request'
-          end
-
           it 'returns the expected response for the same request' do
-            pending "WebMock/EM-HTTP bug", :if => should_be_pending? do
-              get_body_string(make_http_request(:get, url)).should == response_body
-            end
+            get_body_string(make_http_request(:get, url)).should == response_body
           end
         end
       end

data/spec/support/sinatra_app.rb

@@ -14,6 +14,16 @@ module VCR
       "FOO!"
     end
 
+    get '/set-cookie-headers/1' do
+      headers 'Set-Cookie' => 'foo'
+      'header set'
+    end
+
+    get '/set-cookie-headers/2' do
+      headers 'Set-Cookie' => %w[ foo bar ]
+      'header set'
+    end
+
     def self.port
       server.port
     end

data/vcr.gemspec

@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
 
   {
     'patron'          => '0.4.9',
-    'em-http-request' => '~> 0.2.7',
+    'em-http-request' => '~> 0.3.0',
     'curb'            => '0.7.8',
     'typhoeus'        => '~> 0.2.1'
   }.each do |lib, version|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vcr
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 1
   - 7
-  - 1
-  version: 1.7.1
+  - 2
+  version: 1.7.2
 platform: ruby
 authors: 
 - Myron Marston
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-19 00:00:00 -07:00
+date: 2011-03-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -267,12 +267,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 19
         segments: 
         - 0
-        - 2
-        - 7
-        version: 0.2.7
+        - 3
+        - 0
+        version: 0.3.0
   requirement: *id016
 - !ruby/object:Gem::Dependency 
   prerelease: false