vcr 2.2.0 → 2.2.1

data/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 [Full Changelog](http://github.com/myronmarston/vcr/compare/v2.2.0...master)
 
+## 2.2.1 (June 13, 2012)
+
+[Full Changelog](http://github.com/myronmarston/vcr/compare/v2.2.0...v2.2.1)
+
+Bug Fixes:
+
+* Fix matcher generated by `VCR.request_matchers.uri_without_params` so that
+  it handles URIs w/o query params properly. Previously, it would allow any
+  two URIs w/o query params to match, even if the hosts or paths
+  differed.
+
 ## 2.2.0 (May 31, 2012)
 
 [Full Changelog](http://github.com/myronmarston/vcr/compare/v2.1.1...v2.2.0)

data/README.md

@@ -38,7 +38,7 @@ maintenance) and accurate (the response will contain the same headers and body y
   following are supported:
   * [FakeWeb](https://github.com/chrisk/fakeweb)
   * [WebMock](https://github.com/bblimke/webmock)
-  * [Typhoeus](https://github.com/dbalatero/typhoeus)
+  * [Typhoeus](https://github.com/typhoeus/typhoeus)
   * [Faraday](https://github.com/technoweenie/faraday)
   * [Excon](https://github.com/geemus/excon)
 * Supports multiple HTTP libraries:
@@ -47,7 +47,7 @@ maintenance) and accurate (the response will contain the same headers and body y
   * [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/dbalatero/typhoeus) (Typhoeus::Hydra, but not Typhoeus::Easy or Typhoeus::Multi)
+  * [Typhoeus](https://github.com/typhoeus/typhoeus) (Typhoeus::Hydra, but not Typhoeus::Easy or Typhoeus::Multi)
   * [Excon](https://github.com/geemus/excon)
   * [Faraday](https://github.com/technoweenie/faraday)
   * And of course any library built on Net::HTTP, such as [Mechanize](http://github.com/tenderlove/mechanize),
@@ -127,7 +127,7 @@ yard server --reload
 * [Chris Kampmeier](http://github.com/chrisk) for [FakeWeb](http://github.com/chrisk/fakeweb).
 * [Chris Young](http://github.com/chrisyoung) for [NetRecorder](http://github.com/chrisyoung/netrecorder),
   the inspiration for VCR.
-* [David Balatero](https://github.com/dbalatero) for help with [Typhoeus](https://github.com/pauldix/typhoeus)
+* [David Balatero](https://github.com/dbalatero) for help with [Typhoeus](https://github.com/typhoeus/typhoeus)
   support.
 * [Wesley Beary](https://github.com/geemus) for help with [Excon](https://github.com/geemus/excon)
   support.

data/features/cassettes/format.feature

@@ -40,9 +40,9 @@ Feature: Cassette format
 
   You can also register a custom serializer using:
 
-     VCR.configure do |config|
-       config.cassette_serializers[:my_custom_serializer] = my_serializer
-     end
+       VCR.configure do |config|
+         config.cassette_serializers[:my_custom_serializer] = my_serializer
+       end
 
   Your serializer must implement the following methods:
 

data/features/request_matching/uri_without_param.feature

@@ -9,7 +9,10 @@ Feature: URI without param(s)
   common need to match on a URI and ignore particular query parameters, VCR
   provides an easier way:
 
-      :match_requests_on => [:method, VCR.request_matchers.uri_without_param(:timestamp)]
+      :match_requests_on => [
+        :method,
+        VCR.request_matchers.uri_without_param(:timestamp)
+      ]
 
   `uri_without_param` also has a plural alias (i.e. `uri_without_params(:timestamp, :session)`)
 
@@ -70,7 +73,8 @@ Feature: URI without param(s)
         c.hook_into :fakeweb
         c.cassette_library_dir = 'cassettes'
         c.default_cassette_options = {
-          :match_requests_on => [:method, VCR.request_matchers.uri_without_param(:timestamp)]
+          :match_requests_on => [:method,
+            VCR.request_matchers.uri_without_param(:timestamp)]
         }
       end
 
@@ -79,11 +83,13 @@ Feature: URI without param(s)
       end
 
       VCR.use_cassette('example') do
-        puts "Response for bar: " + response_body_for(:get, search_uri("bar"))
+        puts "Response for bar: " +
+             response_body_for(:get, search_uri("bar"))
       end
 
       VCR.use_cassette('example') do
-        puts "Response for foo: " + response_body_for(:get, search_uri("foo"))
+        puts "Response for foo: " +
+             response_body_for(:get, search_uri("foo"))
       end
       """
     When I run `ruby uri_without_param_matcher.rb`

data/features/test_frameworks/rspec_metadata.feature

@@ -76,7 +76,8 @@ Feature: Usage with RSpec metadata
       """ruby
       require 'spec_helper'
 
-      describe "Using an options hash", :vcr => { :cassette_name => "example", :record => :new_episodes } do
+      vcr_options = { :cassette_name => "example", :record => :new_episodes }
+      describe "Using an options hash", :vcr => vcr_options do
         it 'uses the provided cassette name' do
           VCR.current_cassette.name.should == "example"
         end

data/lib/vcr.rb

@@ -81,7 +81,7 @@ module VCR
   # @option options :allow_playback_repeats [Boolean] Whether or not to
   #  allow a single HTTP interaction to be played back multiple times.
   #  Defaults to false.
-  # @options options :allow_unused_http_interactions [Boolean] If set to
+  # @option options :allow_unused_http_interactions [Boolean] If set to
   #  false, an error will be raised if a cassette is ejected before all
   #  previously recorded HTTP interactions have been used.
   #  Defaults to true.

data/lib/vcr/middleware/faraday.rb

@@ -11,7 +11,7 @@ module VCR
     # Faraday.
     #
     # @note You can either insert this middleware into the Faraday middleware stack
-    #  yourself or configure {VCR::Configuration#hook_into} to hook into +:faraday+.
+    #  yourself or configure {VCR::Configuration#hook_into} to hook into `:faraday`.
     class Faraday
       include VCR::Deprecations::Middleware::Faraday
 

data/lib/vcr/request_matcher_registry.rb

@@ -19,7 +19,7 @@ module VCR
     class URIWithoutParamsMatcher < Struct.new(:params_to_ignore)
       def partial_uri_from(request)
         URI(request.uri).tap do |uri|
-          break unless uri.query # ignore uris without params, e.g. "http://example.com/"
+          return request.uri unless uri.query # ignore uris without params, e.g. "http://example.com/"
 
           uri.query = uri.query.split('&').tap { |params|
             params.map! do |p|

data/lib/vcr/test_frameworks/rspec.rb

@@ -14,7 +14,7 @@ module VCR
     #
     module Macros
 
-      # Sets up a +before+ and +after+ hook that will insert and eject a
+      # Sets up a `before` and `after` hook that will insert and eject a
       # cassette, respectively.
       #
       # @example

data/lib/vcr/version.rb

@@ -10,7 +10,7 @@ module VCR
   #   * `parts` [Array<Integer>] List of the version parts.
   def version
     @version ||= begin
-      string = '2.2.0'
+      string = '2.2.1'
 
       def string.parts
         split('.').map { |p| p.to_i }

data/spec/support/http_library_adapters.rb

@@ -16,6 +16,7 @@ HTTP_LIBRARY_ADAPTERS['net/http'] = Module.new do
   def self.http_library_name; 'Net::HTTP'; end
 
   def get_body_string(response); response.body; end
+  alias get_body_object get_body_string
 
   def get_header(header_key, response)
     response.get_fields(header_key)
@@ -46,6 +47,7 @@ HTTP_LIBRARY_ADAPTERS['patron'] = Module.new do
   def self.http_library_name; 'Patron'; end
 
   def get_body_string(response); response.body; end
+  alias get_body_object get_body_string
 
   def get_header(header_key, response)
     response.headers[header_key]
@@ -69,6 +71,10 @@ HTTP_LIBRARY_ADAPTERS['httpclient'] = Module.new do
     string.respond_to?(:read) ? string.read : string
   end
 
+  def get_body_object(response)
+    response.body
+  end
+
   def get_header(header_key, response)
     response.header[header_key]
   end
@@ -88,6 +94,7 @@ HTTP_LIBRARY_ADAPTERS['em-http-request'] = Module.new do
   def get_body_string(response)
     response.response
   end
+  alias get_body_object get_body_string
 
   def get_header(header_key, response)
     values = response.response_header[header_key.upcase.gsub('-', '_')]
@@ -114,6 +121,7 @@ HTTP_LIBRARY_ADAPTERS['curb'] = Module.new do
   def get_body_string(response)
     response.body_str
   end
+  alias get_body_object get_body_string
 
   def get_header(header_key, response)
     headers = response.header_str.split("\r\n")[1..-1]
@@ -149,6 +157,7 @@ HTTP_LIBRARY_ADAPTERS['typhoeus'] = Module.new do
   def get_body_string(response)
     response.body
   end
+  alias get_body_object get_body_string
 
   def get_header(header_key, response)
     response.headers_hash[header_key]
@@ -169,6 +178,7 @@ HTTP_LIBRARY_ADAPTERS['excon'] = Module.new do
   def get_body_string(response)
     response.body
   end
+  alias get_body_object get_body_string
 
   def get_header(header_key, response)
     response.headers[header_key]
@@ -198,6 +208,7 @@ end
     def get_body_string(response)
       response.body
     end
+    alias get_body_object get_body_string
 
     def get_header(header_key, response)
       value = response.headers[header_key]

data/spec/support/shared_example_groups/hook_into_http_library.rb

@@ -55,6 +55,20 @@ shared_examples_for "a hook into an HTTP library" do |library_hook_name, library
     test_record_and_playback "with spaces encoded as %20",         "q=a%20b"
     test_record_and_playback "with a complex escaped query param", "q=#{CGI.escape("A&(! 234k !@ kasdj232\#$ kjw35")}"
 
+    it 'plays back an empty body response exactly as it was recorded (e.g. nil vs empty string)' do
+      pending "awaiting an external fix", :if => library.gsub('_', '/').include?('net/http') do
+        get_body = lambda do
+          VCR.use_cassette('empty_body', :record => :once) do
+            get_body_object make_http_request(:get, "http://localhost:#{VCR::SinatraApp.port}/204")
+          end
+        end
+
+        recorded = get_body.call
+        played_back = get_body.call
+        played_back.should eq(recorded)
+      end
+    end
+
     describe 'making an HTTP request' do
       let(:status)        { VCR::ResponseStatus.new(200, 'OK') }
       let(:interaction)   { VCR::HTTPInteraction.new(request, response) }

data/spec/support/sinatra_app.rb

@@ -34,6 +34,10 @@ module VCR
       'header set'
     end
 
+    get '/204' do
+      status 204
+    end
+
     # we use a global counter so that every response is different;
     # this ensures that the test demonstrates that the response
     # is being played back (and not running a 2nd real request)

data/spec/vcr/request_matcher_registry_spec.rb

@@ -134,6 +134,13 @@ module VCR
             request_with(:uri => 'http://example.com/search')
           ).should be_true
         end
+
+        it 'does not match two requests with URIs that have no params but different paths' do
+          subject[subject.send(meth, :foo, :bar)].matches?(
+            request_with(:uri => 'http://example.com/foo'),
+            request_with(:uri => 'http://example.com/bar')
+          ).should be_false
+        end
       end
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vcr
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 2
   - 2
-  - 0
-  version: 2.2.0
+  - 1
+  version: 2.2.1
 platform: ruby
 authors: 
 - Myron Marston
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-31 00:00:00 Z
+date: 2012-06-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement