vcr 1.7.0 → 1.7.1

data/.gitignore

@@ -30,4 +30,4 @@ Gemfile.lock
 
 features/README.md
 features/CHANGELOG.md
-features/LICENSE
+features/LICENSE.md

data/CHANGELOG.md

@@ -1,8 +1,13 @@
-# Changelog
-
 ## In git
 
-[Full Changelog](http://github.com/myronmarston/vcr/compare/v1.7.0...master)
+[Full Changelog](http://github.com/myronmarston/vcr/compare/v1.7.1...master)
+
+## 1.7.1 (March 19, 2011)
+
+[Full Changelog](http://github.com/myronmarston/vcr/compare/v1.7.0...v1.7.1)
+
+* Fix Faraday adapter so that it properly normalizes query parameters
+  in the same way that Faraday itself does.
 
 ## 1.7.0 (March 1, 2011)
 

data/README.md

@@ -32,17 +32,17 @@ maintenance) and accurate (the response from example.com will contain the same h
 * Automatically records and replays your HTTP interactions with minimal setup/configuration code.
 * Supports and works with the HTTP stubbing facilities of multiple libraries.  Currently, the
   following are supported:
-  * FakeWeb
-  * WebMock
-  * Typhoeus
-  * Faraday
+  * [FakeWeb](https://github.com/chrisk/fakeweb)
+  * [WebMock](https://github.com/bblimke/webmock)
+  * [Typhoeus](https://github.com/dbalatero/typhoeus)
+  * [Faraday](https://github.com/technoweenie/faraday)
 * Supports multiple HTTP libraries:
   * [Patron](http://github.com/toland/patron) (when using WebMock)
   * [Curb](http://github.com/taf2/curb) (when using WebMock -- only supports Curb::Easy at the moment)
   * [HTTPClient](http://github.com/nahi/httpclient) (when using WebMock)
   * [em-http-request](http://github.com/igrigorik/em-http-request) (when using WebMock)
   * [Net::HTTP](http://www.ruby-doc.org/stdlib/libdoc/net/http/rdoc/index.html) (when using FakeWeb and WebMock)
-  * [Typhoeus](https://github.com/pauldix/typhoeus) (Typhoeus::Hydra, but not Typhoeus::Easy or Typhoeus::Multi)
+  * [Typhoeus](https://github.com/dbalatero/typhoeus) (Typhoeus::Hydra, but not Typhoeus::Easy or Typhoeus::Multi)
   * [Faraday](https://github.com/technoweenie/faraday)
   * And of course any library built on Net::HTTP, such as [Mechanize](http://github.com/tenderlove/mechanize),
     [HTTParty](http://github.com/jnunemaker/httparty) or [Rest Client](http://github.com/archiloque/rest-client).

data/Rakefile

@@ -47,7 +47,9 @@ namespace :ci do
 end
 
 def ensure_relish_doc_symlinked(filename)
-  from = File.expand_path("../features/#{filename}", __FILE__)
+  from_filename = filename.dup
+  from_filename << '.md' unless filename =~ /\.md$/
+  from = File.expand_path("../features/#{from_filename}", __FILE__)
   to = File.expand_path("../#{filename}", __FILE__)
 
   if File.symlink?(from)

data/features/.nav

@@ -1,7 +1,7 @@
-getting_started.md (Getting Started)
-CHANGELOG.md (Changelog)
-about_the_cucumber_features.md (About the Cucumber Features)
-LICENSE (License)
+- getting_started.md (Getting Started)
+- CHANGELOG.md (Changelog)
+- about_these_examples.md (About These Examples)
+- LICENSE.md (License)
 - cassettes:
   - format.feature
   - no_cassette.feature

data/features/{about_the_cucumber_features.md → about_these_examples.md}

@@ -1,5 +1,3 @@
-## About the Cucumber Features
-
 The cucumber features provided here demonstrate all of the major features of
 VCR.  These features are executable documentation for VCR.
 

data/features/cassettes/format.feature

@@ -5,8 +5,18 @@ Feature: Cassette format
   human-readable/editable format.  A cassette contains an array
   of HTTP interactions, each of which has the following:
 
-    - Request method, uri, body, headers
-    - Response status (code & message), headers, body, http version
+    - request
+      - method
+      - uri
+      - body
+      - headers
+    - response
+      - status
+        - code
+        - message
+      - headers
+      - body
+      - http version
 
   Scenario Outline: Request/Response data is saved to disk as YAML
     Given a file named "cassette_format.rb" with:

data/features/cassettes/update_content_length_header.feature

@@ -40,7 +40,7 @@ Feature: Update content_length header
           body: Hello <modified>
           http_version: "1.1"
       """
-    Given a file named "common_stuff.rb" with:
+    And a file named "common_stuff.rb" with:
       """
       require 'vcr'
 

data/features/configuration/allow_http_connections_when_no_cassette.feature

@@ -1,4 +1,4 @@
-Feature: allow_http_connections_when_no_cassette
+Feature: Allow HTTP connections when no cassette
 
   Usually, HTTP requests made when no cassette is inserted will result
   in an error (see cassettes/no_cassette.feature).  You can set the

data/features/getting_started.md

@@ -1,5 +1,3 @@
-## Getting Started
-
 ### Install it
 
     [sudo] gem install vcr

data/lib/vcr/http_stubbing_adapters/faraday.rb

@@ -26,7 +26,8 @@ module VCR
 
       def stub_requests(http_interactions, match_attributes)
         grouped_responses(http_interactions, match_attributes).each do |request_matcher, responses|
-          queue = stub_queues[request_matcher]
+          matcher = request_matcher_with_normalized_uri(request_matcher)
+          queue = stub_queues[matcher]
           responses.each { |res| queue << res }
         end
       end
@@ -82,6 +83,15 @@ module VCR
         def hash_of_arrays
           Hash.new { |h, k| h[k] = [] }
         end
+
+        def request_matcher_with_normalized_uri(matcher)
+          return matcher unless matcher.uri.is_a?(String) && matcher.uri.include?('+')
+
+          request = matcher.request.dup
+          request.uri = request.uri.gsub('+', '%20')
+
+          RequestMatcher.new(request, matcher.match_attributes)
+        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 => correctly_cased_headers(response.headers || {}),
                 :body             => response.body
               )
 

data/lib/vcr/version.rb

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

data/spec/support/http_library_adapters.rb

@@ -11,7 +11,7 @@ HTTP_LIBRARY_ADAPTERS['net/http'] = Module.new do
 
   def make_http_request(method, url, body = nil, headers = {})
     uri = URI.parse(url)
-    Net::HTTP.new(uri.host, uri.port).send_request(method.to_s.upcase, uri.path, body, headers)
+    Net::HTTP.new(uri.host, uri.port).send_request(method.to_s.upcase, uri.request_uri, body, headers)
   end
 end
 

data/spec/support/shared_example_groups/http_library.rb

@@ -1,3 +1,5 @@
+require 'cgi'
+
 NET_CONNECT_NOT_ALLOWED_ERROR = /You can use VCR to automatically record this request and replay it later/
 
 shared_examples_for "an http library" do |library, supported_request_match_attributes, *other|
@@ -12,7 +14,53 @@ 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
 
-    describe '#stub_requests using specific match_attributes' do
+    describe 'making an HTTP request' do
+      let(:status)        { VCR::ResponseStatus.new(200, 'OK') }
+      let(:interaction)   { VCR::HTTPInteraction.new(request, response) }
+      let(:response_body) { "The response body" }
+      let(:match_requests_on) { [:method, :uri] }
+      let(:record_mode) { :none }
+
+      before(:each) do
+        subject.stub_requests([interaction], match_requests_on)
+      end
+
+      context "when the the stubbed request and response has no headers" do
+        let(:request)  { VCR::Request.new(:get, 'http://example.com:80/') }
+        let(:response) { VCR::Response.new(status, nil, response_body, '1.1') }
+
+        it 'returns the response for a matching request' do
+          get_body_string(make_http_request(:get, 'http://example.com/')).should == response_body
+        end
+      end
+
+      def self.test_url(description, url)
+        context "when a URL #{description} has been stubbed" do
+          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
+          end
+        end
+      end
+
+      test_url "that has query params",      "http://example.com/search?q=param"
+      test_url "with spaces encoded as +",   "http://example.com/search?q=a+b"
+      test_url "with spaces encoded as %20", "http://example.com/search?q=a%20b"
+      test_url "with an encoded ampersand",  "http://example.com:80/search?q=#{CGI.escape("Q&A")}"
+      test_url "with a complex escaped query param", "http://example.com:80/search?q=#{CGI.escape("A&(! 234k !@ kasdj232\#$ kjw35")}"
+    end
+
+    describe '.stub_requests using specific match_attributes' do
       before(:each) { subject.http_connections_allowed = false }
       let(:interactions) { VCR::YAML.load_file(File.join(VCR::SPEC_ROOT, 'fixtures', YAML_SERIALIZATION_VERSION, 'match_requests_on.yml')) }
 

data/spec/support/shared_example_groups/http_stubbing_adapter.rb

@@ -43,19 +43,6 @@ shared_examples_for "an http stubbing adapter" do |supported_http_libraries, sup
     end
   end
 
-  describe '.stub_requests' do
-    let(:request)     { VCR::Request.new(:get, 'http://example.com/') }
-    let(:status)      { VCR::ResponseStatus.new(200, 'OK') }
-    let(:response)    { VCR::Response.new(status) }
-    let(:interaction) { VCR::HTTPInteraction.new(request, response) }
-
-    it 'works when the request and response has no headers' do
-      expect {
-        subject.stub_requests([interaction], [:method, :uri])
-      }.not_to raise_error
-    end
-  end
-
   if other.include?(:needs_net_http_extension)
     describe '.request_uri' do
       it 'returns the uri for the given http request' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vcr
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 1
   - 7
-  - 0
-  version: 1.7.0
+  - 1
+  version: 1.7.1
 platform: ruby
 authors: 
 - Myron Marston
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-01 00:00:00 -08:00
+date: 2011-03-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -314,7 +314,7 @@ files:
 - benchmarks/http_stubbing_libraries.rb
 - cucumber.yml
 - features/.nav
-- features/about_the_cucumber_features.md
+- features/about_these_examples.md
 - features/cassettes/automatic_re_recording.feature
 - features/cassettes/dynamic_erb.feature
 - features/cassettes/format.feature
@@ -489,7 +489,7 @@ signing_key:
 specification_version: 3
 summary: Record your test suite's HTTP interactions and replay them during future test runs for fast, deterministic, accurate tests.
 test_files: 
-- features/about_the_cucumber_features.md
+- features/about_these_examples.md
 - features/cassettes/automatic_re_recording.feature
 - features/cassettes/dynamic_erb.feature
 - features/cassettes/format.feature