vcr 1.3.0 → 1.3.1

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.3.1 (November 11, 2010)
+
+[Full Changelog](http://github.com/myronmarston/vcr/compare/v1.3.0...v.1.3.1)
+
+* Update WebMock adapter to work with (and require) newly released WebMock 1.6.0.
+
 ## 1.3.0 (November 11, 2010)
 
 [Full Changelog](http://github.com/myronmarston/vcr/compare/v1.2.0...v.1.3.0)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vcr (1.3.0)
+    vcr (1.3.1)
 
 GEM
   remote: http://rubygems.org/
@@ -83,7 +83,7 @@ GEM
     thor (0.14.4)
     timecop (0.3.5)
     typhoeus (0.2.0)
-    webmock (1.5.0)
+    webmock (1.6.0)
       addressable (>= 2.2.2)
       crack (>= 0.1.7)
 
@@ -113,4 +113,4 @@ DEPENDENCIES
   timecop (~> 0.3.5)
   typhoeus (~> 0.2.0)
   vcr!
-  webmock (>= 1.5.0)
+  webmock (~> 1.6.0)

data/benchmarks/http_stubbing_libraries.rb

@@ -18,7 +18,7 @@ def webmock
   WebMock.stub_request(:get, 'http://example.com').to_return(:body => 'Hello')
   yield
 ensure
-  WebMock.reset_webmock
+  WebMock.reset!
 end
 
 def perform_benchmark(name)

data/lib/vcr/http_stubbing_adapters/common.rb

@@ -11,12 +11,14 @@ module VCR
       def self.add_vcr_info_to_exception_message(exception_klass)
         exception_klass.class_eval do
           def message
-            super + ".  You can use VCR to automatically record this request and replay it later.  " +
-            "For more details, visit the VCR wiki at: http://github.com/myronmarston/vcr/wiki"
+            super + ".  " + VCR::HttpStubbingAdapters::Common::RECORDING_INSTRUCTIONS
           end
         end
       end
 
+      RECORDING_INSTRUCTIONS = "You can use VCR to automatically record this request and replay it later.  " +
+                               "For more details, visit the VCR wiki at: http://github.com/myronmarston/vcr/wiki"
+
       def check_version!
         version_too_low, version_too_high = compare_version
 

data/lib/vcr/http_stubbing_adapters/webmock.rb

@@ -6,8 +6,8 @@ module VCR
       include VCR::HttpStubbingAdapters::Common
       extend self
 
-      MINIMUM_VERSION = '1.4.0'
-      MAXIMUM_VERSION = '1.5'
+      MINIMUM_VERSION = '1.6.0'
+      MAXIMUM_VERSION = '1.6'
 
       def http_connections_allowed=(value)
         ::WebMock::Config.instance.allow_net_connect = value
@@ -37,11 +37,11 @@ module VCR
       end
 
       def create_stubs_checkpoint(checkpoint_name)
-        checkpoints[checkpoint_name] = ::WebMock::RequestRegistry.instance.request_stubs.dup
+        checkpoints[checkpoint_name] = ::WebMock::StubRegistry.instance.request_stubs.dup
       end
 
       def restore_stubs_checkpoint(checkpoint_name)
-        ::WebMock::RequestRegistry.instance.request_stubs = checkpoints.delete(checkpoint_name)
+        ::WebMock::StubRegistry.instance.request_stubs = checkpoints.delete(checkpoint_name)
       end
 
       private
@@ -94,5 +94,8 @@ WebMock.after_request(:real_requests_only => true) do |request, response|
   VCR.record_http_interaction(http_interaction)
 end
 
-VCR::HttpStubbingAdapters::Common.add_vcr_info_to_exception_message(WebMock::NetConnectNotAllowedError)
-
+WebMock::NetConnectNotAllowedError.class_eval do
+  def stubbing_instructions(*args)
+    '.  ' + VCR::HttpStubbingAdapters::Common::RECORDING_INSTRUCTIONS
+  end
+end

data/lib/vcr/version.rb

@@ -3,7 +3,7 @@ module VCR
 
   def version
     @version ||= begin
-      string = '1.3.0'
+      string = '1.3.1'
 
       def string.parts; VCR.version.split('.').map { |p| p.to_i }; end
       def string.major; parts[0]; end

data/spec/http_stubbing_adapters/webmock_spec.rb

@@ -8,9 +8,9 @@ describe VCR::HttpStubbingAdapters::WebMock do
     [:method, :uri, :host, :path, :body, :headers]
 
   it_performs('version checking',
-    :valid    => %w[ 1.4.0 1.4.99 1.5.0 1.5.99 ],
+    :valid    => %w[ 1.6.0 1.6.99 ],
     :too_low  => %w[ 0.9.9 0.9.10 0.1.30 1.0.30 1.2.9 1.3.9 ],
-    :too_high => %w[ 1.6.0 1.10.0 2.0.0 ]
+    :too_high => %w[ 1.7.0 1.10.0 2.0.0 ]
   ) do
     def stub_version(version)
       WebMock.stub(:version).and_return(version)

data/spec/spec_helper.rb

@@ -28,7 +28,7 @@ RSpec.configure do |config|
     VCR::Config.stub_with :fakeweb
 
     WebMock.allow_net_connect!
-    WebMock.reset_webmock
+    WebMock.reset!
 
     FakeWeb.allow_net_connect = true
     FakeWeb.clean_registry

data/vcr.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
     'aruba'           => '~> 0.2.1',
 
     'fakeweb'         => '~> 1.3.0',
-    'webmock'         => '>= 1.5.0',
+    'webmock'         => '~> 1.6.0',
 
     'httpclient'      => '~> 2.1.5.2',
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vcr
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 3
-  - 0
-  version: 1.3.0
+  - 1
+  version: 1.3.1
 platform: ruby
 authors: 
 - Myron Marston
@@ -167,14 +167,14 @@ dependencies:
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
         - 1
-        - 5
+        - 6
         - 0
-        version: 1.5.0
+        version: 1.6.0
   requirement: *id010
   type: :development
   name: webmock