vcr 2.8.0 → 2.9.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmQ3MGMzZTMzMjRhODljMzAzMWYzZGMzMDVhNzc3ZjU4YjE1ZWNjMw==
+    NzZkYzJkMTc5OTlhMGM0ZDZiMzNkZDcwYzA5YTRlZTJiNDRiYjFjYw==
   data.tar.gz: !binary |-
-    NzcwMGUwMWJjY2JjMGVkZTNmMDE0ZDdjODlhNDFhMzFlNGZlMGEyOA==
+    ZmQwMDFiY2JjOWRmYjhjOWM5MTg2MGE4ZTcxMDIwMjk5NzJiMDg1NA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OTcyOWYyM2RkNzU0NDc3NDQ4NmZjYWQ1NjFhYTBiYjM0YTA4MGJjNDBhZDk5
-    MGUxZmNlMzg1MDQ5NWRjMDZkZDliOGNiYWE2YzBlYTM3NzU5NmFhMGU1OGQ5
-    MGZjMDM0NGZjZjZhZGI3MTM2MjZmM2MzNjA1ODU5MmUyMWFmYzU=
+    YzA4NzhmNGE3ODQ1YzcxYTFkNmVmM2E1ZmMxM2JlYjkxNTVmNDk0Yzc4MDZh
+    NjQ3M2Y0ODgwYjA3YjkwM2NkNWU2NGJlYzk3ZWMxMjY1MTRiMGJlNjFmODU3
+    NGZjNWFiNzQ4NzdmYzVhMjdhOGRmMTEyZGQ0NDE2NjE1OGE2ZWM=
   data.tar.gz: !binary |-
-    YzI4MzRmZjM5MTA2ZjRkZDhlZjAxYWE4ZmFlMzkzYzRiNzgyZjc1Nzg2Mjk5
-    ZjdlYzhiYWVlNDczMjdiMzcwZDI4NjBlOWE4ZTRjNzZjNWViNjM1OGExMTI2
-    OGQ2YjM5NjNkZjRlZDZiMGJhZGJlNWEyNjMxMmM5ZjI3MjE0MmQ=
+    OTUxNWE4ZDkzNzMwZGRkNDcyOTRiNjU5MDA3NDRkOTQ1MGVlYzA3MGE5OWRm
+    ZGI0OTAzMzNkNjQ2MjNlNDkyNzg3Nzg2NDk1NGRkYzJjNDY2NGY0NzI3NWY3
+    Zjc5ODQ4ZWY0MmY3ZTNmZWVkZjg5NjA2MTA1NGZkMTk3NDhjZTU=

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 2.9.0 (March 27, 2014)
+
+[Full Changelog](http://github.com/vcr/vcr/compare/v2.8.0...v2.9.0)
+
+Enhancements:
+
+* Update version checking to only assert that a given library is >=
+  a minimum version. (Ryan Foster)
+* Explicitly support the latest Excon release (0.32). (Ryan Foster)
+* Explicitly support the latest Excon release (0.31). (Michiel de Mare)
+* Explicitly support the latest Webmock releases (1.16, 1.17).
+  (Ryan Foster, Lawson Kurtz)
+
 ## 2.8.0 (November 23, 2013)
 
 [Full Changelog](http://github.com/vcr/vcr/compare/v2.7.0...v2.8.0)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vcr (2.8.0)
+    vcr (2.9.0)
 
 GEM
   remote: https://rubygems.org/
@@ -21,8 +21,8 @@ GEM
     coderay (1.0.9)
     columnize (0.3.6)
     cookiejar (0.3.0)
-    crack (0.4.1)
-      safe_yaml (~> 0.9.0)
+    crack (0.4.2)
+      safe_yaml (~> 1.0.0)
     cucumber (1.3.8)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
@@ -49,7 +49,7 @@ GEM
       ffi (>= 1.3.0)
       mime-types (~> 1.18)
     eventmachine (1.0.3)
-    excon (0.29.0)
+    excon (0.32.0)
     fakeweb (1.3.0)
     faraday (0.8.8)
       multipart-post (~> 1.2.0)
@@ -100,7 +100,7 @@ GEM
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
-    safe_yaml (0.9.7)
+    safe_yaml (1.0.1)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
@@ -114,7 +114,7 @@ GEM
     timecop (0.6.1)
     typhoeus (0.6.6)
       ethon (~> 0.6.1)
-    webmock (1.15.0)
+    webmock (1.17.3)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
     yajl-ruby (1.1.0)

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2013 Myron Marston
+Copyright (c) 2010-2014 Myron Marston
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -82,6 +82,8 @@ The docs come in two flavors:
 See the [Upgrade](https://github.com/vcr/vcr/blob/master/Upgrade.md) doc
 for info about what's new and changed in VCR 2.0.
 
+There is also a Railscast, which will get you up and running in no-time http://railscasts.com/episodes/291-testing-with-vcr
+
 ## Release Policy
 
 VCR follows the principles of [semantic versioning](http://semver.org/).
@@ -115,7 +117,7 @@ Note that as of VCR 2, 1.8.6 and 1.9.1 are not supported.
 * See the [Contributing](https://github.com/vcr/vcr/blob/master/CONTRIBUTING.md)
   guide for instructions on running the specs and features.
 * Code quality metrics are checked by [Code Climate](https://codeclimate.com/github/vcr/vcr).
-* Documentation is generated with [YARD](http://yardoc.org/) ([cheat sheet](http://cheat.errtheblog.com/s/yard/)).
+* Documentation is generated with [YARD](http://yardoc.org/) ([cheat sheet](http://cheat.errtheblog.com/s/yard)).
   To generate while developing:
 
 ```
@@ -173,6 +175,7 @@ Thanks also to the following people who have contributed patches or helpful sugg
 * [Mark Burns](https://github.com/markburns)
 * [Max Riveiro](https://github.com/kavu)
 * [Michael Lavrisha](https://github.com/vrish88)
+* [Michiel de Mare](https://github.com/mdemare)
 * [Mike Dalton](https://github.com/kcdragon)
 * [Mislav Marohnić](https://github.com/mislav)
 * [Nathaniel Bibler](https://github.com/nbibler)
@@ -201,12 +204,16 @@ Thanks also to the following people who have contributed patches or helpful sugg
 
 * [Betamax](https://github.com/robfletcher/betamax) (Groovy/JVM)
 * [Betamax](https://github.com/sigmavirus24/betamax) (Python)
+* [Betamax](https://github.com/thegreatape/betamax) (Go)
+* [Betamax](https://github.com/wjlroe/betamax) (Clojure)
+* [Betamax.NET](https://github.com/mfloryan/Betamax.Net) (C#/.NET)
 * [ExVCR](https://github.com/parroty/exvcr) (Elixir)
 * [HAVCR](https://github.com/cordawyn/havcr) (Haskell)
 * [Mimic](https://github.com/acoulton/mimic) (PHP/Kohana)
 * [Nock-VCR](https://github.com/carbonfive/nock-vcr) (JavaScript/Node)
 * [NSURLConnectionVCR](https://bitbucket.org/martijnthe/nsurlconnectionvcr) (Objective-C)
 * [PHP-VCR](https://github.com/php-vcr/php-vcr) (PHP)
+* [Sepia](https://github.com/linkedin/sepia) (Javascript/Node)
 * [TapeDeck.js](https://github.com/EndangeredMassa/TapeDeck.js) (JavaScript)
 * [VCR.js](https://github.com/elcuervo/vcr.js) (JavaScript)
 * [VCR.py](https://github.com/kevin1024/vcrpy) (Python)
@@ -220,11 +227,11 @@ Thanks also to the following people who have contributed patches or helpful sugg
 * [Net::HTTP Spy](http://github.com/martinbtt/net-http-spy)
 * [NetRecorder](https://github.com/chrisyoung/netrecorder)
 * [Puffing Billy](https://github.com/oesmith/puffing-billy)
-* [REST-assured](https://github.com/BBC/REST-assured)
+* [REST-assured](https://github.com/artemave/REST-assured)
 * [Stale Fish](https://github.com/jsmestad/stale_fish)
 * [WebFixtures](http://github.com/trydionel/web_fixtures)
 
 ## Copyright
 
-Copyright (c) 2010-2013 Myron Marston. Released under the terms of the
+Copyright (c) 2010-2014 Myron Marston. Released under the terms of the
 MIT license. See LICENSE for details.

data/features/hooks/before_record.feature

@@ -7,11 +7,11 @@ Feature: before_record hook
   the HTTP interaction that is about to be written to disk.  The second
   argument will be the current cassette.
 
-  You can also call `#ignore!` on the HTTP interaction to prevent VCR
-  from recording it.
+  If you wish to prevent VCR from recording the HTTP interaction you can call
+  `#ignore!` on the interaction.
 
-  If you don't your hook to apply to all cassettes, you can use tags for
-  this purpose.  Consider this code:
+  If you don't want your hook to apply to all cassettes, you can use tags to
+  select which cassettes a given hook applies to.  Consider this code:
 
       VCR.configure do |c|
         c.before_record(:twitter) { ... } # modify the interactions somehow

data/features/http_libraries/net_http.feature

@@ -144,7 +144,7 @@ Feature: Net::HTTP
           c.cassette_library_dir = 'cassettes'
         end
 
-        uri = URI("https://gist.github.com/myronmarston/fb555cb593f3349d53af/raw/6921dd638337d3f6a51b0e02e7f30e3c414f70d6/vcr_gist")
+        uri = URI("https://gist.githubusercontent.com/myronmarston/fb555cb593f3349d53af/raw/6921dd638337d3f6a51b0e02e7f30e3c414f70d6/vcr_gist")
 
         VCR.use_cassette('https') do
           http = Net::HTTP.new(uri.host, uri.port)

data/features/request_matching/headers.feature

@@ -79,7 +79,6 @@ Feature: Matching on Headers
 
     Examples:
       | configuration         | http_lib              |
-      | c.hook_into :webmock  | httpclient            |
       | c.hook_into :webmock  | curb                  |
       | c.hook_into :webmock  | patron                |
       | c.hook_into :webmock  | em-http-request       |

data/features/step_definitions/cli_steps.rb

@@ -36,7 +36,7 @@ module VCRHelpers
       # Remove non-deterministic headers and headers
       # that get added by a particular HTTP library (but not by others)
       i.response.headers.reject! { |k, v| %w[ server date connection ].include?(k) }
-      i.request.headers.reject! { |k, v| %w[ accept user-agent connection expect ].include?(k) }
+      i.request.headers.reject! { |k, v| %w[ accept user-agent connection expect date ].include?(k) }
 
       # Some HTTP libraries include an extra space ("OK " instead of "OK")
       i.response.status.message = i.response.status.message.strip

data/lib/vcr/library_hooks/fakeweb.rb

@@ -5,7 +5,7 @@ require 'vcr/extensions/net_http_response'
 require 'vcr/request_handler'
 require 'set'
 
-VCR::VersionChecker.new('FakeWeb', FakeWeb::VERSION, '1.3.0', '1.3').check_version!
+VCR::VersionChecker.new('FakeWeb', FakeWeb::VERSION, '1.3.0').check_version!
 
 module VCR
   class LibraryHooks

data/lib/vcr/library_hooks/typhoeus.rb

@@ -5,7 +5,7 @@ require 'typhoeus'
 if Float(Typhoeus::VERSION[/^\d+\.\d+/]) < 0.5
   require 'vcr/library_hooks/typhoeus_0.4'
 else
-  VCR::VersionChecker.new('Typhoeus', Typhoeus::VERSION, '0.5.0', '0.6').check_version!
+  VCR::VersionChecker.new('Typhoeus', Typhoeus::VERSION, '0.5.0').check_version!
 
   module VCR
     class LibraryHooks

data/lib/vcr/library_hooks/typhoeus_0.4.rb

@@ -1,4 +1,4 @@
-VCR::VersionChecker.new('Typhoeus', Typhoeus::VERSION, '0.3.2', '0.4').check_version!
+VCR::VersionChecker.new('Typhoeus', Typhoeus::VERSION, '0.3.2').check_version!
 
 module VCR
   class LibraryHooks

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.15').check_version!
+VCR::VersionChecker.new('WebMock', WebMock.version, '1.8.0').check_version!
 
 module VCR
   class LibraryHooks

data/lib/vcr/middleware/excon.rb

@@ -2,7 +2,7 @@ require 'excon'
 require 'vcr/request_handler'
 require 'vcr/util/version_checker'
 
-VCR::VersionChecker.new('Excon', Excon::VERSION, '0.25.2', '0.29').check_version!
+VCR::VersionChecker.new('Excon', Excon::VERSION, '0.25.2').check_version!
 
 module VCR
   # Contains middlewares for use with different libraries.

data/lib/vcr/middleware/faraday.rb

@@ -2,7 +2,7 @@ require 'faraday'
 require 'vcr/util/version_checker'
 require 'vcr/request_handler'
 
-VCR::VersionChecker.new('Faraday', Faraday::VERSION, '0.7.0', '0.9').check_version!
+VCR::VersionChecker.new('Faraday', Faraday::VERSION, '0.7.0').check_version!
 
 module VCR
   # Contains middlewares for use with different libraries.

data/lib/vcr/util/version_checker.rb

@@ -1,30 +1,23 @@
 module VCR
   # @private
   class VersionChecker
-    def initialize(library_name, library_version, min_patch_level, max_minor_version)
-      @library_name, @library_version = library_name, library_version
-      @min_patch_level, @max_minor_version = min_patch_level, max_minor_version
+    def initialize(library_name, library_version, min_version)
+      @library_name    = library_name
+      @library_version = library_version
+      @min_version     = min_version
 
       @major,     @minor,     @patch     = parse_version(library_version)
-      @min_major, @min_minor, @min_patch = parse_version(min_patch_level)
-      @max_major, @max_minor             = parse_version(max_minor_version)
-
-      @comparison_result = compare_version
+      @min_major, @min_minor, @min_patch = parse_version(min_version)
     end
 
     def check_version!
       raise_too_low_error if too_low?
-      warn_about_too_high if too_high?
     end
 
   private
 
     def too_low?
-      @comparison_result == :too_low
-    end
-
-    def too_high?
-      @comparison_result == :too_high
+      compare_version == :too_low
     end
 
     def raise_too_low_error
@@ -33,27 +26,18 @@ module VCR
         "VCR requires version #{version_requirement}."
     end
 
-    def warn_about_too_high
-      Kernel.warn "You are using #{@library_name} #{@library_version}. " +
-                  "VCR #{VCR.version} has been tested against #{@library_name} #{version_requirement}, " +
-                  "and you are using a newer version. If you experience VCR issues, " +
-                  "consider downgrading #{@library_name} as it may fix it."
-    end
-
     def compare_version
       case
         when @major < @min_major then :too_low
-        when @major > @max_major then :too_high
         when @major > @min_major then :ok
         when @minor < @min_minor then :too_low
-        when @minor > @max_minor then :too_high
         when @minor > @min_minor then :ok
         when @patch < @min_patch then :too_low
       end
     end
 
     def version_requirement
-      ">= #{@min_patch_level}, < #{@max_major}.#{@max_minor + 1}"
+      ">= #{@min_version}"
     end
 
     def parse_version(version)

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

data/spec/support/http_library_adapters.rb

@@ -85,7 +85,11 @@ HTTP_LIBRARY_ADAPTERS['httpclient'] = Module.new do
   end
 
   def normalize_request_headers(headers)
-    headers
+    headers.merge({
+      'Accept'     => ["*/*"],
+      'User-Agent' => ["HTTPClient/1.0 (#{HTTPClient::VERSION}, ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}))"],
+      'Date'       => [Time.now.httpdate]
+    })
   end
 end
 

data/spec/vcr/util/version_checker_spec.rb

@@ -3,42 +3,28 @@ require 'spec_helper'
 module VCR
   describe VersionChecker do
     it 'raises an error if the major version is too low' do
-      checker = VersionChecker.new('foo', '0.7.3', '1.0.0', '1.1')
+      checker = VersionChecker.new('foo', '0.7.3', '1.0.0')
       expect { checker.check_version! }.to raise_error(Errors::LibraryVersionTooLowError)
     end
 
     it 'raises an error if the minor version is too low' do
-      checker = VersionChecker.new('foo', '1.0.99', '1.1.3', '1.2')
+      checker = VersionChecker.new('foo', '1.0.99', '1.1.3')
       expect { checker.check_version! }.to raise_error(Errors::LibraryVersionTooLowError)
     end
 
     it 'raises an error if the patch version is too low' do
-      checker = VersionChecker.new('foo', '1.0.8', '1.0.10', '1.2')
+      checker = VersionChecker.new('foo', '1.0.8', '1.0.10')
       expect { checker.check_version! }.to raise_error(Errors::LibraryVersionTooLowError)
     end
 
-    it 'prints a warning if the major version is too high' do
-      checker = VersionChecker.new('foo', '2.0.0', '1.0.0', '1.1')
-      expect(Kernel).to receive(:warn).with(/you are using a newer version/)
-      checker.check_version!
+    it 'does not raise an error when the version is equal' do
+      checker = VersionChecker.new('foo', '1.0.0', '1.0.0')
+      expect { checker.check_version! }.not_to raise_error
     end
 
-    it 'prints a warning if the minor version is too high' do
-      checker = VersionChecker.new('foo', '1.2.0', '1.0.0', '1.1')
-      expect(Kernel).to receive(:warn).with(/you are using a newer version/)
-      checker.check_version!
-    end
-
-    it 'does not raise an error or print a warning when the major version is between the min and max' do
-      checker = VersionChecker.new('foo', '2.0.0', '1.0.0', '3.0')
-      expect(Kernel).not_to receive(:warn)
-      checker.check_version!
-    end
-
-    it 'does not raise an error or print a warning when the min_patch is 0.6.5, the max_minor is 0.7 and the version is 0.7.3' do
-      checker = VersionChecker.new('foo', '0.7.3', '0.6.5', '0.7')
-      expect(Kernel).not_to receive(:warn)
-      checker.check_version!
+    it 'does not raise an error when the version is higher' do
+      checker = VersionChecker.new('foo', '2.0.0', '1.0.0')
+      expect { checker.check_version! }.not_to raise_error
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vcr
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.9.0
 platform: ruby
 authors:
 - Myron Marston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-24 00:00:00.000000000 Z
+date: 2014-03-27 00:00:00.000000000 Z
 dependencies: []
 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