vcr 1.11.1 → 1.11.2

data/lib/vcr.rb

@@ -166,4 +166,10 @@ module VCR
   def cassettes
     @cassettes ||= []
   end
+
+  def initialize_ivars
+    @turned_off = false
+  end
+
+  initialize_ivars # to avoid warnings
 end

data/lib/vcr/config.rb

@@ -44,7 +44,7 @@ module VCR
 
     def ignore_localhost=(value)
       if value
-        ignore_hosts *VCR::LOCALHOST_ALIASES
+        ignore_hosts(*VCR::LOCALHOST_ALIASES)
       else
         ignored_hosts.reject! { |h| VCR::LOCALHOST_ALIASES.include?(h) }
       end
@@ -73,6 +73,12 @@ module VCR
       uri = URI.parse(uri) unless uri.respond_to?(:host)
       ignored_hosts.include?(uri.host)
     end
+
+    def initialize_ivars
+      @allow_http_connections_when_no_cassette = nil
+    end
+
+    initialize_ivars # to avoid warnings
   end
 end
 

data/lib/vcr/deprecations/cassette.rb

@@ -5,25 +5,25 @@ module VCR
       VCR::Config.uri_should_be_ignored?(uri.to_s)
     end
 
-    private
+  private
 
-      def deprecate_old_cassette_options(options)
-        message = "VCR's :allow_real_http cassette option is deprecated.  Instead, use the ignore_localhost configuration option."
-        if options[:allow_real_http] == :localhost
-          @original_ignored_hosts = VCR::Config.ignored_hosts.dup
-          VCR::Config.ignored_hosts.clear
-          VCR::Config.ignore_hosts *VCR::LOCALHOST_ALIASES
-          Kernel.warn "WARNING: #{message}"
-        elsif options[:allow_real_http]
-          raise ArgumentError.new(message)
-        end
+    def deprecate_old_cassette_options(options)
+      message = "VCR's :allow_real_http cassette option is deprecated.  Instead, use the ignore_localhost configuration option."
+      if options[:allow_real_http] == :localhost
+        @original_ignored_hosts = VCR::Config.ignored_hosts.dup
+        VCR::Config.ignored_hosts.clear
+        VCR::Config.ignore_hosts(*VCR::LOCALHOST_ALIASES)
+        Kernel.warn "WARNING: #{message}"
+      elsif options[:allow_real_http]
+        raise ArgumentError.new(message)
       end
+    end
 
-      def restore_ignore_localhost_for_deprecation
-        if defined?(@original_ignored_hosts)
-          VCR::Config.ignored_hosts.clear
-          VCR::Config.ignore_hosts *@original_ignored_hosts
-        end
+    def restore_ignore_localhost_for_deprecation
+      if defined?(@original_ignored_hosts)
+        VCR::Config.ignored_hosts.clear
+        VCR::Config.ignore_hosts(*@original_ignored_hosts)
       end
     end
+  end
 end

data/lib/vcr/extensions/net_http_response.rb

@@ -12,6 +12,10 @@
 module VCR
   module Net
     module HTTPResponse
+      def self.extended(response)
+        response.instance_variable_set(:@__read_body_previously_called, false)
+      end
+
       def read_body(dest = nil, &block)
         return super if @__read_body_previously_called
         return @body if dest.nil? && block.nil?

data/lib/vcr/http_stubbing_adapters/common.rb

@@ -75,7 +75,7 @@ module VCR
       attr_writer :http_connections_allowed
 
       def http_connections_allowed?
-        !!@http_connections_allowed
+        defined?(@http_connections_allowed) && !!@http_connections_allowed
       end
 
       def ignored_hosts=(hosts)

data/lib/vcr/http_stubbing_adapters/fakeweb.rb

@@ -93,6 +93,12 @@ module VCR
           raise UnsupportedRequestMatchAttributeError.new("FakeWeb does not support matching requests on #{invalid_attributes.join(' or ')}")
         end
       end
+
+      def initialize_ivars
+        @http_connections_allowed = nil
+      end
+
+      initialize_ivars # to avoid warnings
     end
   end
 end

data/lib/vcr/http_stubbing_adapters/webmock.rb

@@ -78,6 +78,12 @@ module VCR
       def checkpoints
         @checkpoints ||= {}
       end
+
+      def initialize_ivars
+        @http_connections_allowed = nil
+      end
+
+      initialize_ivars # to avoid warnings
     end
   end
 end
@@ -107,6 +113,7 @@ WebMock.after_request(:real_requests_only => true) do |request, response|
 end
 
 WebMock::NetConnectNotAllowedError.class_eval do
+  undef stubbing_instructions
   def stubbing_instructions(*args)
     '.  ' + VCR::HttpStubbingAdapters::Common::RECORDING_INSTRUCTIONS
   end

data/lib/vcr/middleware/cassette_arguments.rb

@@ -2,6 +2,7 @@ module VCR
   module Middleware
     class CassetteArguments
       def initialize
+        @name    = nil
         @options = {}
       end
 

data/lib/vcr/structs/http_interaction.rb

@@ -10,6 +10,7 @@ module VCR
     end
 
     def ignored?
+      @ignored = false unless defined?(@ignored)
       @ignored
     end
 

data/lib/vcr/version.rb

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

data/spec/capture_warnings.rb

@@ -0,0 +1,42 @@
+require 'tempfile'
+stderr_file = Tempfile.new("vcr.stderr")
+$stderr.reopen(stderr_file.path)
+current_dir = Dir.pwd
+
+at_exit do
+  stderr_file.rewind
+  lines = stderr_file.read.split("\n").uniq
+  stderr_file.close!
+
+  vcr_warnings, other_warnings = lines.partition { |line| line.include?(current_dir) }
+
+  # For some weird reason, JRuby is giving me some warnings about
+  # `@proxy` not being initialized, and putting a vcr file/line number
+  # in the warning, but it's really happening in excon.
+  if RUBY_PLATFORM == 'java'
+    vcr_warnings.reject! do |line|
+      line.include?('@proxy not initialized') && line.include?('excon')
+    end
+  end
+
+  if vcr_warnings.any?
+    puts
+    puts "-" * 30 + " VCR Warnings: " + "-" * 30
+    puts
+    puts vcr_warnings.join("\n")
+    puts
+    puts "-" * 75
+    puts
+  end
+
+  if other_warnings.any?
+    File.open('tmp/warnings.txt', 'w') { |f| f.write(other_warnings.join("\n")) }
+    puts
+    puts "Non-VCR warnings written to tmp/warnings.txt"
+    puts
+  end
+
+  # fail the build...
+  exit(1) if vcr_warnings.any?
+end
+

data/spec/monkey_patches.rb

@@ -73,7 +73,11 @@ module MonkeyPatches
   end
 
   def realias(klass, method, alias_extension)
-    klass.class_eval { alias_method method, :"#{method}_#{alias_extension}" }
+    klass.class_eval do
+      old_verbose, $VERBOSE = $VERBOSE, nil
+      alias_method method, :"#{method}_#{alias_extension}"
+      $VERBOSE = old_verbose
+    end
   end
 
   def realias_all(alias_extension)

data/spec/spec_helper.rb

@@ -35,13 +35,14 @@ module VCR
       VCR.instance_eval do
         instance_variables.each { |ivar| remove_instance_variable(ivar) }
       end
+      VCR.send(:initialize_ivars)
     end
   end
 end
 
 RSpec.configure do |config|
   config.color_enabled = true
-  config.debug = (using_git && RUBY_INTERPRETER == :mri && RUBY_VERSION != '1.9.1' && !ENV['CI'])
+  config.debug = (using_git && RUBY_INTERPRETER == :mri && !%w[ 1.9.1 1.9.3 ].include?(RUBY_VERSION) && !ENV['CI'])
   config.treat_symbols_as_metadata_keys_with_true_values = true
 
   tmp_dir = File.expand_path('../../tmp/cassette_library_dir', __FILE__)

data/spec/support/shared_example_groups/http_library.rb

@@ -49,7 +49,7 @@ shared_examples_for "an http library" do |library, supported_request_match_attri
             if recorded_val.is_a?(Array) && replayed_val.is_a?(Array)
               replayed_val.should =~ recorded_val
             else
-              replayed_val.should == recorded_val
+              replayed_val.should eq(recorded_val)
             end
           end
         end
@@ -72,7 +72,7 @@ shared_examples_for "an http library" do |library, supported_request_match_attri
         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
+          get_body_string(make_http_request(:get, 'http://example.com/')).should eq(response_body)
         end
       end
 
@@ -82,7 +82,7 @@ shared_examples_for "an http library" do |library, supported_request_match_attri
           let(:response)    { VCR::Response.new(status, nil, response_body, '1.1') }
 
           it 'returns the expected response for the same request' do
-            get_body_string(make_http_request(:get, url)).should == response_body
+            get_body_string(make_http_request(:get, url)).should eq(response_body)
           end
         end
       end
@@ -116,7 +116,7 @@ shared_examples_for "an http library" do |library, supported_request_match_attri
 
             valid.each do |val, response|
               it "returns the expected response for a #{val.inspect} request" do
-                get_body_string(make_http_request(val)).should == response
+                get_body_string(make_http_request(val)).should eq(response)
               end
             end
 
@@ -174,7 +174,7 @@ shared_examples_for "an http library" do |library, supported_request_match_attri
       if http_allowed
 
         it 'allows real http requests' do
-          get_body_string(make_http_request(:get, url)).should == 'FOO!'
+          get_body_string(make_http_request(:get, url)).should eq('FOO!')
         end
 
         describe 'recording new http requests' do
@@ -192,11 +192,11 @@ shared_examples_for "an http library" do |library, supported_request_match_attri
           end
 
           it 'records the request uri' do
-            recorded_interaction.request.uri.should == url
+            recorded_interaction.request.uri.should eq(url)
           end
 
           it 'records the request method' do
-            recorded_interaction.request.method.should == :get
+            recorded_interaction.request.method.should eq(:get)
           end
 
           it 'records the request body' do
@@ -208,19 +208,19 @@ shared_examples_for "an http library" do |library, supported_request_match_attri
           end
 
           it 'records the response status code' do
-            recorded_interaction.response.status.code.should == 200
+            recorded_interaction.response.status.code.should eq(200)
           end
 
           it 'records the response status message' do
-            recorded_interaction.response.status.message.should == 'OK'
+            recorded_interaction.response.status.message.should eq('OK')
           end unless other.include?(:status_message_not_exposed)
 
           it 'records the response body' do
-            recorded_interaction.response.body.should == 'FOO!'
+            recorded_interaction.response.body.should eq('FOO!')
           end
 
           it 'records the response headers' do
-            recorded_interaction.response.headers['content-type'].should == ["text/html;charset=utf-8"]
+            recorded_interaction.response.headers['content-type'].should eq(["text/html;charset=utf-8"])
           end
         end
       else
@@ -234,12 +234,12 @@ shared_examples_for "an http library" do |library, supported_request_match_attri
     end
 
     def test_request_stubbed(method, url, expected)
-      subject.request_stubbed?(VCR::Request.new(method, url), [:method, :uri]).should == expected
+      subject.request_stubbed?(VCR::Request.new(method, url), [:method, :uri]).should eq(expected)
     end
 
     it "returns false from #http_connections_allowed? when http_connections_allowed is set to nil" do
       subject.http_connections_allowed = nil
-      subject.http_connections_allowed?.should == false
+      subject.http_connections_allowed?.should eq(false)
     end
 
     describe '.restore_stubs_checkpoint' do
@@ -255,7 +255,7 @@ shared_examples_for "an http library" do |library, supported_request_match_attri
         before(:each) { subject.http_connections_allowed = http_allowed }
 
         it "returns #{http_allowed} for #http_connections_allowed?" do
-          subject.http_connections_allowed?.should == http_allowed
+          subject.http_connections_allowed?.should eq(http_allowed)
         end
 
         test_real_http_request(http_allowed, *other)
@@ -273,7 +273,7 @@ shared_examples_for "an http library" do |library, supported_request_match_attri
 
               %w[ 127.0.0.1 localhost ].each do |localhost_alias|
                 it "allows requests to #{localhost_alias}" do
-                  get_body_string(make_http_request(:get, "http://#{localhost_alias}:#{VCR::SinatraApp.port}/localhost_test")).should == localhost_response
+                  get_body_string(make_http_request(:get, "http://#{localhost_alias}:#{VCR::SinatraApp.port}/localhost_test")).should eq(localhost_response)
                 end
               end
 
@@ -309,12 +309,12 @@ shared_examples_for "an http library" do |library, supported_request_match_attri
           end
 
           it 'rotates through multiple responses for the same request' do
-            get_body_string(make_http_request(:get, 'http://example.com/foo')).should == 'example.com get response 1 with path=foo'
-            get_body_string(make_http_request(:get, 'http://example.com/foo')).should == 'example.com get response 2 with path=foo'
+            get_body_string(make_http_request(:get, 'http://example.com/foo')).should eq('example.com get response 1 with path=foo')
+            get_body_string(make_http_request(:get, 'http://example.com/foo')).should eq('example.com get response 2 with path=foo')
 
             # subsequent requests keep getting the last one
-            get_body_string(make_http_request(:get, 'http://example.com/foo')).should == 'example.com get response 2 with path=foo'
-            get_body_string(make_http_request(:get, 'http://example.com/foo')).should == 'example.com get response 2 with path=foo'
+            get_body_string(make_http_request(:get, 'http://example.com/foo')).should eq('example.com get response 2 with path=foo')
+            get_body_string(make_http_request(:get, 'http://example.com/foo')).should eq('example.com get response 2 with path=foo')
           end unless other.include?(:does_not_support_rotating_responses)
 
           it "correctly handles stubbing multiple values for the same header" do

data/spec/support/shared_example_groups/http_stubbing_adapter.rb

@@ -27,11 +27,11 @@ shared_examples_for "an http stubbing adapter" do |supported_http_libraries, sup
     VCR::HttpStubbingAdapters::Common.adapters.each do |adapter|
       if adapter == described_class
         it "yields with #{adapter} enabled" do
-          adapter_enabled?(adapter).should == true
+          adapter_enabled?(adapter).should eq(true)
         end
       else
         it "yields without #{adapter} enabled" do
-          adapter_enabled?(adapter).should == false
+          adapter_enabled?(adapter).should eq(false)
         end
       end
     end
@@ -48,14 +48,14 @@ shared_examples_for "an http stubbing adapter" do |supported_http_libraries, sup
       it 'returns the uri for the given http request' do
         net_http = Net::HTTP.new('example.com', 80)
         request = Net::HTTP::Get.new('/foo/bar')
-        subject.request_uri(net_http, request).should == 'http://example.com:80/foo/bar'
+        subject.request_uri(net_http, request).should eq('http://example.com:80/foo/bar')
       end
 
       it 'handles basic auth' do
         net_http = Net::HTTP.new('example.com',80)
         request = Net::HTTP::Get.new('/auth.txt')
         request.basic_auth 'user', 'pass'
-        subject.request_uri(net_http, request).should == 'http://user:pass@example.com:80/auth.txt'
+        subject.request_uri(net_http, request).should eq('http://user:pass@example.com:80/auth.txt')
       end
     end
 
@@ -73,12 +73,12 @@ shared_examples_for "an http stubbing adapter" do |supported_http_libraries, sup
 
             [valid1, valid2].each do |val|
               it "returns true for a #{val.inspect} request" do
-                subject.request_stubbed?(request(val), [attribute]).should == true
+                subject.request_stubbed?(request(val), [attribute]).should eq(true)
               end
             end
 
             it "returns false for another #{attribute}"  do
-              subject.request_stubbed?(request(invalid), [attribute]).should == false
+              subject.request_stubbed?(request(invalid), [attribute]).should eq(false)
             end
           else
             it 'raises an error indicating matching requests on this attribute is not supported' do

data/spec/support/shared_example_groups/ignore_localhost_deprecation.rb

@@ -12,7 +12,7 @@ shared_examples_for '.ignore_localhost? deprecation' do
   it 'returns false when only some localhost aliases are ignored' do
     aliases = VCR::LOCALHOST_ALIASES.dup
     aliases.pop
-    VCR::Config.ignore_hosts *aliases
+    VCR::Config.ignore_hosts(*aliases)
     described_class.ignore_localhost?.should be_false
   end
 

data/spec/support/shared_example_groups/normalizers.rb

@@ -1,13 +1,11 @@
-require 'spec_helper'
-
 shared_examples_for "header normalization" do
   let(:instance) do
     with_headers('Some_Header' => 'value1', 'aNother' => ['a', 'b'], 'third' => [], 'fourth' => nil)
   end
 
   it 'normalizes the hash to lower case keys and arrays of values' do
-    instance.headers['some_header'].should == ['value1']
-    instance.headers['another'].should == ['a', 'b']
+    instance.headers['some_header'].should eq(['value1'])
+    instance.headers['another'].should eq(['a', 'b'])
   end
 
   it 'removes empty headers' do
@@ -17,7 +15,7 @@ shared_examples_for "header normalization" do
 
   it 'filters out unimportant default values set by the HTTP library' do
     instance = with_headers('accept' => ['*/*'], 'connection' => 'close', 'http-user' => ['foo'], 'expect' => ['', 'bar'])
-    instance.headers.should == { 'http-user' => ['foo'], 'expect' => ['bar'] }
+    instance.headers.should eq({ 'http-user' => ['foo'], 'expect' => ['bar'] })
   end
 
   it 'sets empty hash header to nil' do
@@ -28,26 +26,26 @@ shared_examples_for "header normalization" do
     key = 'my-key'
     key.instance_variable_set(:@foo, 7)
     instance = with_headers(key => ['value1'])
-    VCR::YAML.dump(instance.headers).should == VCR::YAML.dump('my-key' => ['value1'])
+    VCR::YAML.dump(instance.headers).should eq(VCR::YAML.dump('my-key' => ['value1']))
   end
 
   it 'ensures header values are serialized to yaml as raw strings' do
     value = 'my-value'
     value.instance_variable_set(:@foo, 7)
     instance = with_headers('my-key' => [value])
-    VCR::YAML.dump(instance.headers).should == VCR::YAML.dump('my-key' => ['my-value'])
+    VCR::YAML.dump(instance.headers).should eq(VCR::YAML.dump('my-key' => ['my-value']))
   end
 
   it 'handles nested arrays' do
     accept_encoding = [["gzip", "1.0"], ["deflate", "1.0"], ["sdch", "1.0"]]
     instance = with_headers('accept-encoding' => accept_encoding)
-    instance.headers['accept-encoding'].should == accept_encoding
+    instance.headers['accept-encoding'].should eq(accept_encoding)
   end
 
   it 'handles nested arrays with floats' do
     accept_encoding = [["gzip", 1.0], ["deflate", 1.0], ["sdch", 1.0]]
     instance = with_headers('accept-encoding' => accept_encoding)
-    instance.headers['accept-encoding'].should == accept_encoding
+    instance.headers['accept-encoding'].should eq(accept_encoding)
   end
 end
 
@@ -59,31 +57,31 @@ shared_examples_for "body normalization" do
   it "ensures the body is serialized to yaml as a raw string" do
     body = "My String"
     body.instance_variable_set(:@foo, 7)
-    VCR::YAML.dump(instance(body).body).should == VCR::YAML.dump("My String")
+    VCR::YAML.dump(instance(body).body).should eq(VCR::YAML.dump("My String"))
   end
 end
 
 shared_examples_for 'uri normalization' do
   it 'adds port 80 to an http URI that lacks a port' do
-    instance('http://example.com/foo').uri.should == 'http://example.com:80/foo'
+    instance('http://example.com/foo').uri.should eq('http://example.com:80/foo')
   end
 
   it 'keeps the existing port for an http URI' do
-    instance('http://example.com:8000/foo').uri.should == 'http://example.com:8000/foo'
+    instance('http://example.com:8000/foo').uri.should eq('http://example.com:8000/foo')
   end
 
   it 'adds port 443 to an https URI that lacks a port' do
-    instance('https://example.com/foo').uri.should == 'https://example.com:443/foo'
+    instance('https://example.com/foo').uri.should eq('https://example.com:443/foo')
   end
 
   it 'keeps the existing port for an https URI' do
-    instance('https://example.com:8000/foo').uri.should == 'https://example.com:8000/foo'
+    instance('https://example.com:8000/foo').uri.should eq('https://example.com:8000/foo')
   end
 end
 
 shared_examples_for 'status message normalization' do
   it 'chomps leading and trailing spaces on the status message' do
-    instance(' OK ').message.should == 'OK'
+    instance(' OK ').message.should eq('OK')
   end
 
   it 'sets status message to nil when it is the empty string' do