vcr 2.3.0 → 2.4.0

data/lib/vcr/library_hooks/webmock.rb

@@ -2,7 +2,7 @@ require 'vcr/util/version_checker'
 require 'vcr/request_handler'
 require 'webmock'
 
-VCR::VersionChecker.new('WebMock', WebMock.version, '1.8.0', '1.8').check_version!
+VCR::VersionChecker.new('WebMock', WebMock.version, '1.8.0', '1.9').check_version!
 
 module VCR
   class LibraryHooks

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)
         request.parsed_uri.tap do |uri|
-          return request.uri unless uri.query # ignore uris without params, e.g. "http://example.com/"
+          return uri unless uri.query # ignore uris without params, e.g. "http://example.com/"
 
           uri.query = uri.query.split('&').tap { |params|
             params.map! do |p|
@@ -31,6 +31,8 @@ module VCR
             params.reject! { |p| params_to_ignore.include?(p.first) }
             params.map!    { |p| p.join('=') }
           }.join('&')
+
+          uri.query = nil if uri.query.empty?
         end
       end
 
@@ -118,6 +120,11 @@ module VCR
       register(:path) do |r1, r2|
         r1.parsed_uri.path == r2.parsed_uri.path
       end
+
+      register(:query) do |r1, r2|
+        VCR.configuration.query_parser.call(r1.parsed_uri.query.to_s) ==
+          VCR.configuration.query_parser.call(r2.parsed_uri.query.to_s)
+      end
     end
   end
 end

data/lib/vcr/structs.rb

@@ -170,8 +170,8 @@ module VCR
       end
     end
 
-    if RUBY_VERSION =~ /1.9/
-      # 1.9 hashes are already ordered.
+    if RUBY_VERSION.to_f > 1.8
+      # 1.9+ hashes are already ordered.
       def self.apply_to(*args); end
     else
       def self.apply_to(hash, keys)

data/lib/vcr/test_frameworks/rspec.rb

@@ -1,62 +1,6 @@
 module VCR
   # Integrates VCR with RSpec.
   module RSpec
-
-    # Contains macro methods to assist with VCR usage. These methods are
-    # intended to be used directly in an RSpec example group. To make these
-    # available in your RSpec example groups, extend the module in an individual
-    # example group, or configure RSpec to extend the module in all example groups.
-    #
-    # @example
-    #   RSpec.configure do |c|
-    #     c.extend VCR::RSpec::Macros
-    #   end
-    #
-    module Macros
-
-      # Sets up a `before` and `after` hook that will insert and eject a
-      # cassette, respectively.
-      #
-      # @example
-      #   describe "Some API Client" do
-      #     use_vcr_cassette "some_api", :record => :new_episodes
-      #   end
-      #
-      # @param [(optional) String] name the cassette name; it will be inferred by the example
-      #  group descriptions if not given.
-      # @param [(optional) Hash] options the cassette options
-      def use_vcr_cassette(*args)
-        options = args.last.is_a?(Hash) ? args.pop : {}
-        name    = args.first || infer_cassette_name
-
-        before(:each) do
-          VCR.insert_cassette(name, options)
-        end
-
-        after(:each) do
-          VCR.eject_cassette
-        end
-      end
-
-    private
-
-      def infer_cassette_name
-        # RSpec 1 exposes #description_parts; use that if its available
-        return description_parts.join("/") if respond_to?(:description_parts)
-
-        # Otherwise use RSpec 2 metadata...
-        group_descriptions = []
-        klass = self
-
-        while klass.respond_to?(:metadata) && klass.metadata
-          group_descriptions << klass.metadata[:example_group][:description]
-          klass = klass.superclass
-        end
-
-        group_descriptions.compact.reverse.join('/')
-      end
-    end
-
     # @private
     module Metadata
       extend self

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.3.0'
+      string = '2.4.0'
 
       def string.parts
         split('.').map { |p| p.to_i }

data/script/ci.sh

@@ -2,8 +2,8 @@
 set -e -x
 
 echo "-------- Running Typhoeus 0.4 Specs ---------"
-bundle install --gemfile=gemfiles/typhoeus-old.gemfile
-BUNDLE_GEMFILE=gemfiles/typhoeus-old.gemfile bundle exec rspec spec/vcr/library_hooks/typhoeus_0.4_spec.rb --format progress --backtrace
+bundle install --gemfile=gemfiles/typhoeus_old.gemfile --without extras
+BUNDLE_GEMFILE=gemfiles/typhoeus_old.gemfile bundle exec rspec spec/vcr/library_hooks/typhoeus_0.4_spec.rb --format progress --backtrace
 
 # Setup vendored rspec-1
 git submodule init

data/spec/monkey_patches.rb

@@ -1,4 +1,4 @@
-require 'typhoeus' if RUBY_INTERPRETER == :mri
+require 'typhoeus'
 
 module MonkeyPatches
   extend self

data/spec/spec_helper.rb

@@ -6,6 +6,8 @@ if RUBY_VERSION =~ /1.9/ && RUBY_ENGINE == 'ruby'
   SimpleCov.start do
     add_filter "/spec"
     add_filter "/features"
+    add_filter "/bin"
+    add_filter "/bundle"
 
     # internet_connection mostly contains logic copied from the ruby 1.8.7
     # stdlib for which I haven't written tests.
@@ -21,25 +23,22 @@ if RUBY_VERSION =~ /1.9/ && RUBY_ENGINE == 'ruby'
 end
 
 using_git = File.exist?(File.expand_path('../../.git/', __FILE__))
-if using_git
-  require 'bundler'
-  Bundler.setup
-end
+require 'bundler/setup' if using_git
 
 require 'rspec'
 
-require "support/fixnum_extension.rb"
-require "support/limited_uri.rb"
-require "support/http_library_adapters.rb"
-require "support/ruby_interpreter.rb"
-require "support/shared_example_groups/hook_into_http_library.rb"
-require "support/shared_example_groups/request_hooks.rb"
-require "support/sinatra_app.rb"
-require "support/vcr_localhost_server.rb"
-require "support/vcr_stub_helpers.rb"
+require "support/fixnum_extension"
+require "support/limited_uri"
+require "support/ruby_interpreter"
+require "support/shared_example_groups/hook_into_http_library"
+require "support/shared_example_groups/request_hooks"
+require "support/sinatra_app"
+require "support/vcr_localhost_server"
+require "support/vcr_stub_helpers"
 
 require 'vcr'
 require 'monkey_patches'
+require "support/http_library_adapters"
 
 module VCR
   SPEC_ROOT = File.dirname(__FILE__)

data/spec/support/http_library_adapters.rb

@@ -160,7 +160,15 @@ HTTP_LIBRARY_ADAPTERS['typhoeus'] = Module.new do
   alias get_body_object get_body_string
 
   def get_header(header_key, response)
-    response.headers[header_key]
+    # Due to https://github.com/typhoeus/typhoeus/commit/256c95473d5d40d7ec2f5db603687323ddd73689
+    # headers are now downcased.
+    # ...except when they're not.  I'm not 100% why (I haven't had time to dig into it yet)
+    # but in some situations the headers aren't downcased.  I think it has to do with playback; VCR
+    # isn't sending the headers in downcased to typhoeus. It gets complicated with the interaction
+    # w/ WebMock, and the fact that webmock normalizes headers in a different fashion.
+    #
+    # For now this hack works.
+    response.headers.fetch(header_key.downcase) { response.headers[header_key] }
   end
 
   def make_http_request(method, url, body = nil, headers = {})

data/spec/vcr/deprecations_spec.rb

@@ -14,8 +14,7 @@ describe VCR, 'deprecations', :disable_warnings do
     end
 
     it 'prints a deprecation warning' do
-      VCR.should_receive(:warn).with \
-        "WARNING: `VCR.config` is deprecated.  Use VCR.configure instead."
+      VCR.should_receive(:warn).with(/VCR.config.*deprecated/i)
 
       VCR.config { }
     end
@@ -27,8 +26,7 @@ describe VCR, 'deprecations', :disable_warnings do
     end
 
     it 'prints a deprecation warning' do
-      VCR.should_receive(:warn).with \
-        "WARNING: `VCR::Config` is deprecated.  Use VCR.configuration instead."
+      VCR.should_receive(:warn).with(/VCR::Config.*deprecated/i)
 
       VCR::Config
     end
@@ -46,8 +44,7 @@ describe VCR, 'deprecations', :disable_warnings do
     end
 
     it 'prints a deprecation warning' do
-      VCR::Cassette.should_receive(:warn).with \
-        "WARNING: `VCR::Cassette::MissingERBVariableError` is deprecated.  Use `VCR::Errors::MissingERBVariableError` instead."
+      VCR::Cassette.should_receive(:warn).with(/VCR::Cassette::MissingERBVariableError.*deprecated/i)
 
       VCR::Cassette::MissingERBVariableError
     end
@@ -66,9 +63,7 @@ describe VCR, 'deprecations', :disable_warnings do
     end
 
     it 'prints a deprecation warning' do
-      VCR.configuration.should_receive(:warn).with \
-        "WARNING: `VCR.config { |c| c.stub_with ... }` is deprecated. Use `VCR.configure { |c| c.hook_into ... }` instead."
-
+      VCR.configuration.should_receive(:warn).with(/stub_with.*deprecated/i)
       VCR.configure { |c| c.stub_with :fakeweb, :excon }
     end
   end
@@ -79,5 +74,12 @@ describe VCR, 'deprecations', :disable_warnings do
       VCR::Middleware::Faraday.new(stub) { }
     end
   end
+
+  describe "VCR::RSpec::Macros" do
+    it 'prints a deprecation warning' do
+      Kernel.should_receive(:warn).with(/VCR::RSpec::Macros is deprecated/)
+      Class.new.extend(VCR::RSpec::Macros)
+    end
+  end
 end
 

data/spec/vcr/library_hooks/fakeweb_spec.rb

@@ -125,6 +125,11 @@ describe "FakeWeb hook", :with_monkey_patches => :fakeweb do
       it 'does not raise an error' do
         run_hook # should not raise an error
       end
+
+      it "warns about FakeWeb deprecation" do
+        ::Kernel.should_receive(:warn).with("WARNING: VCR's FakeWeb integration is deprecated and will be removed in VCR 3.0.")
+        run_hook
+      end
     end
   end
 

data/spec/vcr/library_hooks/typhoeus_spec.rb

@@ -27,5 +27,60 @@ describe "Typhoeus hook", :with_monkey_patches => :typhoeus do
       $typhoeus_after_loaded_hook.conditionally_invoke
     end
   end
+
+  context 'when there are nested hydra queues' do
+    def make_requests
+      VCR.use_cassette("nested") do
+        response_1 = response_2 = nil
+
+        hydra   = Typhoeus::Hydra.new
+        request = Typhoeus::Request.new("http://localhost:#{VCR::SinatraApp.port}/")
+
+        request.on_success do |r1|
+          response_1 = r1
+
+          nested = Typhoeus::Request.new("http://localhost:#{VCR::SinatraApp.port}/foo")
+          nested.on_success { |r2| response_2 = r2 }
+
+          hydra.queue(nested)
+        end
+
+        hydra.queue(request)
+        hydra.run
+
+        return body_for(response_1), body_for(response_2)
+      end
+    end
+
+    def body_for(response)
+      return :no_response if response.nil?
+      response.body
+    end
+
+    it 'records and plays back properly' do
+      recorded = make_requests
+      played_back = make_requests
+
+      played_back.should eq(recorded)
+    end
+  end
+
+  context '#effective_url' do
+    def make_single_request
+      VCR.use_cassette('single') do
+        response = Typhoeus::Request.new("http://localhost:#{VCR::SinatraApp.port}/").run
+
+        response.effective_url
+      end
+    end
+
+    it 'recorded and played back properly' do
+      recorded = make_single_request
+      played_back = make_single_request
+      recorded.should_not be_nil
+
+      played_back.should eq(recorded)
+    end
+  end
 end
 

data/spec/vcr/request_matcher_registry_spec.rb

@@ -1,10 +1,12 @@
 require 'vcr/request_matcher_registry'
 require 'vcr/structs'
 require 'support/limited_uri'
+require 'cgi'
 
 module VCR
   describe RequestMatcherRegistry do
     before { VCR.stub_chain(:configuration, :uri_parser) { LimitedURI } }
+    before { VCR.stub_chain(:configuration, :query_parser) { CGI.method(:parse) } }
 
     def request_with(values)
       VCR::Request.new.tap do |request|
@@ -143,6 +145,13 @@ module VCR
             request_with(:uri => 'http://example.com/bar')
           ).should be_false
         end
+
+        it 'matches a second request when all parameters are filtered' do
+          subject[subject.send(meth, :q, :oq)].matches?(
+            request_with(:uri => 'http://example.com/search'),
+            request_with(:uri => 'http://example.com/search?q=vcr&oq=vcr')
+          ).should be_true
+        end
       end
     end
 
@@ -242,6 +251,36 @@ module VCR
           ).should be_false
         end
       end
+
+      describe ":query" do
+        it 'matches when it is identical' do
+          subject[:query].matches?(
+            request_with(:uri => 'http://foo.com/bar?a=8'),
+            request_with(:uri => 'http://goo.com/car?a=8')
+          ).should be_true
+        end
+
+        it 'matches when empty' do
+          subject[:query].matches?(
+            request_with(:uri => 'http://foo.com/bar'),
+            request_with(:uri => 'http://goo.com/car')
+          ).should be_true
+        end
+
+        it 'matches when parameters are reordered' do
+          subject[:query].matches?(
+            request_with(:uri => 'http://foo.com/bar?a=8&b=9'),
+            request_with(:uri => 'http://goo.com/car?b=9&a=8')
+          ).should be_true
+        end
+
+        it 'does not match when it is not the same' do
+          subject[:query].matches?(
+            request_with(:uri => 'http://foo.com/bar?a=8'),
+            request_with(:uri => 'http://goo.com/car?b=8')
+          ).should be_false
+        end
+      end
     end
   end
 end

data/vcr.gemspec

@@ -3,7 +3,8 @@ require "vcr/version"
 
 Gem::Specification.new do |s|
   s.name = "vcr"
-  s.homepage = "http://github.com/myronmarston/vcr"
+  s.homepage = "http://github.com/vcr/vcr"
+  s.license = "MIT"
   s.authors = ["Myron Marston"]
   s.summary = "Record your test suite's HTTP interactions and replay them during future test runs for fast, deterministic, accurate tests."
   s.description = "VCR provides a simple API to record and replay your test suite's HTTP interactions.  It works with a variety of HTTP client libraries, HTTP stubbing libraries and testing frameworks."
@@ -27,7 +28,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'shoulda', '~> 2.9.2'
 
   s.add_development_dependency 'fakeweb', '~> 1.3.0'
-  s.add_development_dependency 'webmock', '~> 1.8.3'
+  s.add_development_dependency 'webmock', '~> 1.9'
 
   s.add_development_dependency 'faraday', '~> 0.8'
   s.add_development_dependency 'httpclient', '~> 2.2'
@@ -40,12 +41,12 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'json', '~> 1.6.5'
   s.add_development_dependency 'simplecov', '~> 0.5.3'
   s.add_development_dependency 'redis', '~> 2.2.2'
+  s.add_development_dependency 'typhoeus', '~> 0.5.3'
 
   unless RUBY_PLATFORM == 'java'
     s.add_development_dependency 'patron', '~> 0.4.15'
     s.add_development_dependency 'em-http-request', '~> 1.0.2'
     s.add_development_dependency 'curb', '~> 0.8.0'
-    s.add_development_dependency 'typhoeus', '>= 0.3.3', '< 0.5.0'
     s.add_development_dependency 'yajl-ruby', '~> 1.1.0'
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vcr
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 31
   prerelease: 
   segments: 
   - 2
-  - 3
+  - 4
   - 0
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors: 
 - Myron Marston
@@ -15,10 +15,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-30 00:00:00 Z
+date: 2013-01-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: bundler
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -30,11 +29,11 @@ dependencies:
         - 0
         - 7
         version: 1.0.7
-  type: :development
   prerelease: false
+  type: :development
+  name: bundler
   requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: rake
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -46,11 +45,11 @@ dependencies:
         - 9
         - 2
         version: 0.9.2
-  type: :development
   prerelease: false
+  type: :development
+  name: rake
   requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: cucumber
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -62,11 +61,11 @@ dependencies:
         - 1
         - 4
         version: 1.1.4
-  type: :development
   prerelease: false
+  type: :development
+  name: cucumber
   requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: aruba
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -78,11 +77,11 @@ dependencies:
         - 4
         - 11
         version: 0.4.11
-  type: :development
   prerelease: false
+  type: :development
+  name: aruba
   requirement: *id004
 - !ruby/object:Gem::Dependency 
-  name: rspec
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -93,11 +92,11 @@ dependencies:
         - 2
         - 11
         version: "2.11"
-  type: :development
   prerelease: false
+  type: :development
+  name: rspec
   requirement: *id005
 - !ruby/object:Gem::Dependency 
-  name: shoulda
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -109,11 +108,11 @@ dependencies:
         - 9
         - 2
         version: 2.9.2
-  type: :development
   prerelease: false
+  type: :development
+  name: shoulda
   requirement: *id006
 - !ruby/object:Gem::Dependency 
-  name: fakeweb
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -125,27 +124,26 @@ dependencies:
         - 3
         - 0
         version: 1.3.0
-  type: :development
   prerelease: false
+  type: :development
+  name: fakeweb
   requirement: *id007
 - !ruby/object:Gem::Dependency 
-  name: webmock
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 49
+        hash: 29
         segments: 
         - 1
-        - 8
-        - 3
-        version: 1.8.3
-  type: :development
+        - 9
+        version: "1.9"
   prerelease: false
+  type: :development
+  name: webmock
   requirement: *id008
 - !ruby/object:Gem::Dependency 
-  name: faraday
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -156,11 +154,11 @@ dependencies:
         - 0
         - 8
         version: "0.8"
-  type: :development
   prerelease: false
+  type: :development
+  name: faraday
   requirement: *id009
 - !ruby/object:Gem::Dependency 
-  name: httpclient
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -171,11 +169,11 @@ dependencies:
         - 2
         - 2
         version: "2.2"
-  type: :development
   prerelease: false
+  type: :development
+  name: httpclient
   requirement: *id010
 - !ruby/object:Gem::Dependency 
-  name: excon
   version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -194,11 +192,11 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  type: :development
   prerelease: false
+  type: :development
+  name: excon
   requirement: *id011
 - !ruby/object:Gem::Dependency 
-  name: timecop
   version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -210,11 +208,11 @@ dependencies:
         - 3
         - 5
         version: 0.3.5
-  type: :development
   prerelease: false
+  type: :development
+  name: timecop
   requirement: *id012
 - !ruby/object:Gem::Dependency 
-  name: rack
   version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -226,11 +224,11 @@ dependencies:
         - 3
         - 6
         version: 1.3.6
-  type: :development
   prerelease: false
+  type: :development
+  name: rack
   requirement: *id013
 - !ruby/object:Gem::Dependency 
-  name: sinatra
   version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -242,11 +240,11 @@ dependencies:
         - 3
         - 2
         version: 1.3.2
-  type: :development
   prerelease: false
+  type: :development
+  name: sinatra
   requirement: *id014
 - !ruby/object:Gem::Dependency 
-  name: multi_json
   version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -258,11 +256,11 @@ dependencies:
         - 0
         - 3
         version: 1.0.3
-  type: :development
   prerelease: false
+  type: :development
+  name: multi_json
   requirement: *id015
 - !ruby/object:Gem::Dependency 
-  name: json
   version_requirements: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -274,11 +272,11 @@ dependencies:
         - 6
         - 5
         version: 1.6.5
-  type: :development
   prerelease: false
+  type: :development
+  name: json
   requirement: *id016
 - !ruby/object:Gem::Dependency 
-  name: simplecov
   version_requirements: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -290,11 +288,11 @@ dependencies:
         - 5
         - 3
         version: 0.5.3
-  type: :development
   prerelease: false
+  type: :development
+  name: simplecov
   requirement: *id017
 - !ruby/object:Gem::Dependency 
-  name: redis
   version_requirements: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -306,83 +304,75 @@ dependencies:
         - 2
         - 2
         version: 2.2.2
-  type: :development
   prerelease: false
+  type: :development
+  name: redis
   requirement: *id018
 - !ruby/object:Gem::Dependency 
-  name: patron
   version_requirements: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 13
         segments: 
         - 0
-        - 4
-        - 15
-        version: 0.4.15
-  type: :development
+        - 5
+        - 3
+        version: 0.5.3
   prerelease: false
+  type: :development
+  name: typhoeus
   requirement: *id019
 - !ruby/object:Gem::Dependency 
-  name: em-http-request
   version_requirements: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 17
         segments: 
-        - 1
         - 0
-        - 2
-        version: 1.0.2
-  type: :development
+        - 4
+        - 15
+        version: 0.4.15
   prerelease: false
+  type: :development
+  name: patron
   requirement: *id020
 - !ruby/object:Gem::Dependency 
-  name: curb
   version_requirements: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 63
+        hash: 19
         segments: 
+        - 1
         - 0
-        - 8
-        - 0
-        version: 0.8.0
-  type: :development
+        - 2
+        version: 1.0.2
   prerelease: false
+  type: :development
+  name: em-http-request
   requirement: *id021
 - !ruby/object:Gem::Dependency 
-  name: typhoeus
   version_requirements: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 0
-        - 3
-        - 3
-        version: 0.3.3
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 63
         segments: 
         - 0
-        - 5
+        - 8
         - 0
-        version: 0.5.0
-  type: :development
+        version: 0.8.0
   prerelease: false
+  type: :development
+  name: curb
   requirement: *id022
 - !ruby/object:Gem::Dependency 
-  name: yajl-ruby
   version_requirements: &id023 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -394,8 +384,9 @@ dependencies:
         - 1
         - 0
         version: 1.1.0
-  type: :development
   prerelease: false
+  type: :development
+  name: yajl-ruby
   requirement: *id023
 description: VCR provides a simple API to record and replay your test suite's HTTP interactions.  It works with a variety of HTTP client libraries, HTTP stubbing libraries and testing frameworks.
 email: myron.marston@gmail.com
@@ -417,6 +408,7 @@ files:
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -443,6 +435,7 @@ files:
 - features/configuration/hook_into.feature
 - features/configuration/ignore_request.feature
 - features/configuration/preserve_exact_body_bytes.feature
+- features/configuration/query_parser.feature
 - features/configuration/uri_parser.feature
 - features/getting_started.md
 - features/hooks/after_http_request.feature
@@ -467,6 +460,7 @@ files:
 - features/request_matching/method.feature
 - features/request_matching/path.feature
 - features/request_matching/playback_repeats.feature
+- features/request_matching/query.feature
 - features/request_matching/uri.feature
 - features/request_matching/uri_without_param.feature
 - features/step_definitions/cli_steps.rb
@@ -478,10 +472,8 @@ files:
 - features/test_frameworks/rspec_metadata.feature
 - features/test_frameworks/shoulda.feature
 - features/test_frameworks/test_unit.feature
-- gemfiles/typhoeus-new.gemfile
-- gemfiles/typhoeus-new.gemfile.lock
-- gemfiles/typhoeus-old.gemfile
-- gemfiles/typhoeus-old.gemfile.lock
+- gemfiles/typhoeus_old.gemfile
+- gemfiles/typhoeus_old.gemfile.lock
 - lib/vcr.rb
 - lib/vcr/cassette.rb
 - lib/vcr/cassette/erb_renderer.rb
@@ -571,9 +563,9 @@ files:
 - spec/vcr/version_spec.rb
 - spec/vcr_spec.rb
 - vcr.gemspec
-homepage: http://github.com/myronmarston/vcr
-licenses: []
-
+homepage: http://github.com/vcr/vcr
+licenses: 
+- MIT
 post_install_message: 
 rdoc_options: []
 
@@ -628,6 +620,7 @@ test_files:
 - features/configuration/hook_into.feature
 - features/configuration/ignore_request.feature
 - features/configuration/preserve_exact_body_bytes.feature
+- features/configuration/query_parser.feature
 - features/configuration/uri_parser.feature
 - features/getting_started.md
 - features/hooks/after_http_request.feature
@@ -652,6 +645,7 @@ test_files:
 - features/request_matching/method.feature
 - features/request_matching/path.feature
 - features/request_matching/playback_repeats.feature
+- features/request_matching/query.feature
 - features/request_matching/uri.feature
 - features/request_matching/uri_without_param.feature
 - features/step_definitions/cli_steps.rb