vcr 1.2.0 → 1.3.0

data/lib/vcr/http_stubbing_adapters/webmock.rb

@@ -6,24 +6,27 @@ module VCR
       include VCR::HttpStubbingAdapters::Common
       extend self
 
-      VERSION_REQUIREMENT = '1.4.0'
-
-      def http_connections_allowed?
-        ::WebMock::Config.instance.allow_net_connect
-      end
+      MINIMUM_VERSION = '1.4.0'
+      MAXIMUM_VERSION = '1.5'
 
       def http_connections_allowed=(value)
         ::WebMock::Config.instance.allow_net_connect = value
       end
 
-      def stub_requests(http_interactions, match_attributes)
-        requests = Hash.new { |h,k| h[k] = [] }
+      def http_connections_allowed?
+        !!::WebMock::Config.instance.allow_net_connect
+      end
 
-        http_interactions.each do |i|
-          requests[i.request.matcher(match_attributes)] << i.response
-        end
+      def ignore_localhost=(value)
+        ::WebMock::Config.instance.allow_localhost = value
+      end
 
-        requests.each do |request_matcher, responses|
+      def ignore_localhost?
+        !!::WebMock::Config.instance.allow_localhost
+      end
+
+      def stub_requests(http_interactions, match_attributes)
+        grouped_responses(http_interactions, match_attributes).each do |request_matcher, responses|
           stub = ::WebMock.stub_request(request_matcher.method || :any, request_matcher.uri)
 
           with_hash = request_signature_hash(request_matcher)
@@ -41,23 +44,6 @@ module VCR
         ::WebMock::RequestRegistry.instance.request_stubs = checkpoints.delete(checkpoint_name)
       end
 
-      def request_stubbed?(request, match_attributes)
-        matcher = request.matcher(match_attributes)
-        !!::WebMock.registered_request?(::WebMock::RequestSignature.new(matcher.method || :any, request.uri, request_signature_hash(matcher)))
-      end
-
-      def request_uri(net_http, request)
-        ::WebMock::NetHTTPUtility.request_signature_from_request(net_http, request).uri.to_s
-      end
-
-      def ignore_localhost=(value)
-        ::WebMock::Config.instance.allow_localhost = value
-      end
-
-      def ignore_localhost?
-        ::WebMock::Config.instance.allow_localhost
-      end
-
       private
 
       def version
@@ -108,12 +94,5 @@ WebMock.after_request(:real_requests_only => true) do |request, response|
   VCR.record_http_interaction(http_interaction)
 end
 
-if defined?(WebMock::NetConnectNotAllowedError)
-  module WebMock
-    class NetConnectNotAllowedError
-      def message
-        super + ".  You can use VCR to automatically record this request and replay it later.  For more details, see the VCR README at: http://github.com/myronmarston/vcr/tree/v#{VCR.version}"
-      end
-    end
-  end
-end
+VCR::HttpStubbingAdapters::Common.add_vcr_info_to_exception_message(WebMock::NetConnectNotAllowedError)
+

data/lib/vcr/internet_connection.rb

@@ -7,7 +7,8 @@ module VCR
     EXAMPLE_HOST = "example.com"
 
     def available?
-      @available ||= Ping.pingecho(EXAMPLE_HOST, 1, 80)
+      @available = Ping.pingecho(EXAMPLE_HOST, 1, 80) unless defined?(@available)
+      @available
     end
   end
 end

data/lib/vcr/structs.rb

@@ -24,8 +24,40 @@ module VCR
     end
   end
 
+  module URINormalizer
+    DEFAULT_PORTS = {
+      'http'  => 80,
+      'https' => 443
+    }
+
+    def initialize(*args)
+      super
+      normalize_uri
+    end
+
+    private
+
+    def normalize_uri
+      u = begin
+        URI.parse(uri)
+      rescue URI::InvalidURIError
+        return
+      end
+
+      u.port ||= DEFAULT_PORTS[u.scheme]
+
+      # URI#to_s only includes the port if it's not the default
+      # but we want to always include it (since FakeWeb/WebMock
+      # urls have always included it).  We force it to be included
+      # here by redefining default_port so that URI#to_s will include it.
+      def u.default_port; nil; end
+      self.uri = u.to_s
+    end
+  end
+
   class Request < Struct.new(:method, :uri, :body, :headers)
     include HeaderNormalizer
+    include URINormalizer
 
     def self.from_net_http_request(net_http, request)
       new(

data/lib/vcr/version.rb

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

data/spec/config_spec.rb

@@ -28,30 +28,10 @@ describe VCR::Config do
     end
   end
 
-  describe '#http_stubbing_library' do
-    it 'returns the configured value' do
-      [:fakeweb, :webmock].each do |setting|
-        VCR::Config.http_stubbing_library = setting
-        VCR::Config.http_stubbing_library.should == setting
-      end
-    end
-
-    context 'when set to nil' do
-      before(:each) { VCR::Config.http_stubbing_library = nil }
-
-      {
-        [:FakeWeb, :WebMock] => nil,
-        []                   => nil,
-        [:FakeWeb]           => :fakeweb,
-        [:WebMock]           => :webmock
-      }.each do |defined_constants, expected_return_value|
-        it "returns #{expected_return_value.inspect} when these constants are defined: #{defined_constants.inspect}" do
-          [:FakeWeb, :WebMock].each do |const|
-            Object.should_receive(:const_defined?).with(const).and_return(defined_constants.include?(const))
-          end
-          VCR::Config.http_stubbing_library.should == expected_return_value
-        end
-      end
+  describe '.stub_with' do
+    it 'stores the given symbols in http_stubbing_libraries' do
+      VCR::Config.stub_with :fakeweb, :typhoeus
+      VCR::Config.http_stubbing_libraries.should == [:fakeweb, :typhoeus]
     end
   end
 
@@ -73,4 +53,4 @@ describe VCR::Config do
       end
     end
   end
-end
+end

data/spec/deprecations_spec.rb

@@ -1,8 +1,36 @@
 require 'spec_helper'
 
 describe 'Deprecations' do
+  disable_warnings
+
+  describe VCR::Config do
+    describe '.http_stubbing_library' do
+      before(:each) { described_class.stub_with :webmock, :typhoeus }
+
+      it 'returns the first configured stubbing library' do
+        described_class.http_stubbing_library.should == :webmock
+      end
+
+      it 'prints a warning: WARNING: VCR::Config.http_stubbing_library is deprecated.  Use VCR::Config.http_stubbing_libraries instead' do
+        described_class.should_receive(:warn).with("WARNING: `VCR::Config.http_stubbing_library` is deprecated.  Use `VCR::Config.http_stubbing_libraries` instead.")
+        described_class.http_stubbing_library
+      end
+    end
+
+    describe '.http_stubbing_library=' do
+      it 'sets http_stubbing_libraries to an array of the given value' do
+        described_class.http_stubbing_library = :webmock
+        described_class.http_stubbing_libraries.should == [:webmock]
+      end
+
+      it 'prints a warning: WARNING: VCR::Config.http_stubbing_library= is deprecated.  Use VCR::Config.stub_with instead' do
+        described_class.should_receive(:warn).with("WARNING: `VCR::Config.http_stubbing_library = :webmock` is deprecated.  Use `VCR::Config.stub_with :webmock` instead.")
+        described_class.http_stubbing_library = :webmock
+      end
+    end
+  end
+
   describe VCR::Cassette do
-    disable_warnings
     subject { VCR::Cassette.new('cassette name') }
 
     it 'raises an error when an :allow_real_http lambda is given' do
@@ -23,7 +51,7 @@ describe 'Deprecations' do
 
           it "sets the http_stubbing_adapter's ignore_localhost attribute to true" do
             subject
-            VCR.http_stubbing_adapter.ignore_localhost?.should be_true
+            VCR.http_stubbing_adapter.ignore_localhost?.should == true
           end
 
           it "prints a warning: VCR's :allow_real_http cassette option is deprecated.  Instead, use the ignore_localhost configuration option." do
@@ -49,4 +77,4 @@ describe 'Deprecations' do
       end
     end
   end
-end
+end

data/spec/extensions/net_http_spec.rb

@@ -4,6 +4,7 @@ describe "Net::HTTP Extensions" do
   without_webmock_callbacks
 
   let(:uri) { URI.parse('http://example.com') }
+  before(:each) { VCR.stub(:http_stubbing_adapter).and_return(VCR::HttpStubbingAdapters::FakeWeb) }
 
   it 'checks if the request is stubbed using a VCR::Request' do
     VCR.http_stubbing_adapter.should_receive(:request_stubbed?) do |request, _|

data/spec/fixtures/1.9.1/fake_example.com_responses.yml

@@ -57,7 +57,38 @@
       - "3285"
       accept-ranges: 
       - bytes
-    :body: example.com get response with path=foo
+    :body: example.com get response 1 with path=foo
+    :http_version: "1.1"
+- !ruby/struct:VCR::HTTPInteraction 
+  :request: !ruby/struct:VCR::Request 
+    :method: :get
+    :uri: http://example.com:80/foo
+    :body: 
+    :headers: 
+  :response: !ruby/struct:VCR::Response 
+    :status: !ruby/struct:VCR::ResponseStatus 
+      :code: 200
+      :message: OK
+    :headers: 
+      etag: 
+      - "\"24ec5-1b6-4059a80bfd280\""
+      last-modified: 
+      - Tue, 15 Nov 2005 13:24:10 GMT
+      connection: 
+      - Keep-Alive
+      content-type: 
+      - text/html; charset=UTF-8
+      date: 
+      - Wed, 31 Mar 2010 02:43:23 GMT
+      server: 
+      - Apache/2.2.3 (CentOS)
+      content-length: 
+      - "438"
+      age: 
+      - "3285"
+      accept-ranges: 
+      - bytes
+    :body: example.com get response 2 with path=foo
     :http_version: "1.1"
 - !ruby/struct:VCR::HTTPInteraction 
   :request: !ruby/struct:VCR::Request 

data/spec/fixtures/not_1.9.1/fake_example.com_responses.yml

@@ -57,7 +57,38 @@
       - "3285"
       accept-ranges: 
       - bytes
-    body: example.com get response with path=foo
+    body: example.com get response 1 with path=foo
+    http_version: "1.1"
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :get
+    uri: http://example.com:80/foo
+    body: 
+    headers: 
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      last-modified: 
+      - Tue, 15 Nov 2005 13:24:10 GMT
+      connection: 
+      - Keep-Alive
+      etag: 
+      - "\"24ec5-1b6-4059a80bfd280\""
+      content-type: 
+      - text/html; charset=UTF-8
+      date: 
+      - Wed, 31 Mar 2010 02:43:23 GMT
+      server: 
+      - Apache/2.2.3 (CentOS)
+      content-length: 
+      - "438"
+      age: 
+      - "3285"
+      accept-ranges: 
+      - bytes
+    body: example.com get response 2 with path=foo
     http_version: "1.1"
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 

data/spec/http_stubbing_adapters/fakeweb_spec.rb

@@ -3,35 +3,20 @@ require 'spec_helper'
 describe VCR::HttpStubbingAdapters::FakeWeb do
   without_webmock_callbacks
 
-  it_should_behave_like 'an http stubbing adapter', ['net/http'], [:method, :uri, :host, :path]
+  it_behaves_like 'an http stubbing adapter', ['net/http'], [:method, :uri, :host, :path], :needs_net_http_extension
 
-  describe '#check_version!' do
+  it_performs('version checking',
+    :valid    => %w[ 1.3.0 1.3.1 1.3.99 ],
+    :too_low  => %w[ 1.2.8 1.1.30 0.30.30 ],
+    :too_high => %w[ 1.4.0 1.10.0 2.0.0 ]
+  ) do
     disable_warnings
     before(:each) { @orig_version = FakeWeb::VERSION }
     after(:each)  { FakeWeb::VERSION = @orig_version }
 
-    %w( 1.2.8 1.1.30 0.30.30 ).each do |version|
-      it "raises an error when FakeWeb's version is #{version}" do
-        FakeWeb::VERSION = version
-        described_class.should_not_receive(:warn)
-        expect { described_class.check_version! }.to raise_error(/You are using FakeWeb #{version}.  VCR requires version .* or greater/)
-      end
-    end
-
-    %w( 1.3.0 1.3.1 1.3.99 ).each do |version|
-      it "does nothing when FakeWeb's version is #{version}" do
-        FakeWeb::VERSION = version
-        described_class.should_not_receive(:warn)
-        expect { described_class.check_version! }.to_not raise_error
-      end
-    end
-
-    %w( 1.4.0 1.10.0 2.0.0 ).each do |version|
-      it "prints a warning when FakeWeb's version is #{version}" do
-        FakeWeb::VERSION = version
-        described_class.should_receive(:warn).with(/VCR is known to work with FakeWeb ~> .*\./)
-        expect { described_class.check_version! }.to_not raise_error
-      end
+    # Cannot be regular method def as that raises a "dynamic constant assignment" error
+    define_method :stub_version do |version|
+      FakeWeb::VERSION = version
     end
   end
 end

data/spec/http_stubbing_adapters/multi_object_proxy_spec.rb

@@ -0,0 +1,101 @@
+require 'spec_helper'
+
+module VCR
+  module HttpStubbingAdapters
+    describe MultiObjectProxy do
+      let(:mock1) { mock }
+      let(:mock2) { mock }
+      subject { described_class.new(mock1, mock2) }
+
+      it 'raises an error when it is created with no objects' do
+        expect { described_class.new }.to raise_error(ArgumentError)
+      end
+
+      it 'raises an error when one of the objects is nil' do
+        expect { described_class.new(Object.new, nil) }.to raise_error(ArgumentError)
+      end
+
+      it 'is a basic object with very few of its own methods' do
+        inst_methods = described_class.instance_methods.map { |m| m.to_sym }
+        inst_methods.should_not include(:send, :object_id, :__id__)
+      end
+
+      describe '#proxies_objects' do
+        it 'returns the proxied objects' do
+          subject.proxied_objects.should == [mock1, mock2]
+        end
+      end
+
+      describe '#respond_to?' do
+        it 'responds to any method that any of the objects responds to' do
+          mock1.stub(:respond_to?).with(:foo).and_return(true)
+          mock1.stub(:respond_to?).with(:bar).and_return(false)
+          mock2.stub(:respond_to?).with(:bar).and_return(true)
+          mock2.stub(:respond_to?).with(:foo).and_return(false)
+
+          subject.respond_to?(:foo).should be_true
+          subject.respond_to?(:bar).should be_true
+        end
+
+        it 'does not respond to a method that none of the objects respond to' do
+          subject.respond_to?(:bazz).should be_false
+        end
+      end
+
+      describe 'calling a method' do
+        it 'raises a no method error when none of the objects responds to the method' do
+          expect { subject.some_undefined_method }.to raise_error(NoMethodError)
+        end
+
+        it 'properly proxies messages to a single object when only one object responds to the message' do
+          mock1.should_not respond_to(:request_stubbed?)
+          mock2.should_receive(:request_stubbed?).and_return(true)
+
+          subject.request_stubbed?.should == true
+        end
+
+        it 'proxies messages to each object' do
+          mock1.should_receive(:stub_requests).with(:arg1, :arg2)
+          mock2.should_receive(:stub_requests).with(:arg1, :arg2)
+
+          subject.stub_requests(:arg1, :arg2)
+        end
+
+        [:http_connections_allowed?, :request_uri].each do |method|
+          context "for ##{method}" do
+            it 'raises an error if the the objects return different values' do
+              mock1.should_receive(method).and_return(:return_value_1)
+              mock2.should_receive(method).and_return(:return_value_2)
+
+              expect { subject.__send__(method) }.to raise_error(/proxied objects returned different values/)
+            end
+
+            it 'returns the value returned by both objects when they return the same value' do
+              mock1.should_receive(method).and_return(:return_value_1)
+              mock2.should_receive(method).and_return(:return_value_1)
+
+              subject.__send__(method).should == :return_value_1
+            end
+          end
+        end
+
+        context 'for a non-predicate method' do
+          it 'does not raise an error when the objects have different return values' do
+            mock1.should_receive(:stub_requests).and_return(:val1)
+            mock2.should_receive(:stub_requests).and_return(:val2)
+
+            subject.stub_requests
+          end
+
+          it 'returns nil regardless of the return values of the objects' do
+            mock1.should_receive(:stub_requests).and_return(:val1)
+            mock2.should_receive(:stub_requests).and_return(:val1)
+
+            subject.stub_requests.should be_nil
+          end
+        end
+      end
+    end
+  end
+end
+