vcr 1.1.2 → 1.2.0

data/spec/fixtures/not_1.9.1/cassette_spec/with_localhost_requests.yml

@@ -53,6 +53,29 @@
       - "277"
     body: 127.0.0.1 response
     http_version: "1.1"
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :get
+    uri: http://0.0.0.0:80/
+    body: 
+    headers: 
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 404
+      message: Not Found
+    headers: 
+      content-type: 
+      - text/html; charset=iso-8859-1
+      connection: 
+      - close
+      server: 
+      - Apache/2.2.3 (CentOS)
+      date: 
+      - Thu, 25 Feb 2010 07:53:52 GMT
+      content-length: 
+      - "277"
+    body: 127.0.0.1 response
+    http_version: "1.1"
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :get

data/spec/http_stubbing_adapters/fakeweb_spec.rb

@@ -1,15 +1,9 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe VCR::HttpStubbingAdapters::FakeWeb do
-  it_should_behave_like 'an http stubbing adapter', ['net/http'], [:method, :uri, :host, :path]
-
-  describe '#should_unwind_response?' do
-    let(:response) { ::Net::HTTPOK.new('1.1', 200, 'OK') }
+  without_webmock_callbacks
 
-    it 'returns true' do
-      described_class.should_unwind_response?(response).should be_true
-    end
-  end
+  it_should_behave_like 'an http stubbing adapter', ['net/http'], [:method, :uri, :host, :path]
 
   describe '#check_version!' do
     disable_warnings

data/spec/http_stubbing_adapters/webmock_spec.rb

@@ -1,27 +1,16 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe VCR::HttpStubbingAdapters::WebMock do
+  without_monkey_patches :vcr
+
   it_should_behave_like 'an http stubbing adapter',
-    %w[net/http patron httpclient em-http-request],
+    %w[net/http patron httpclient em-http-request curb],
     [:method, :uri, :host, :path, :body, :headers]
 
-  describe '#should_unwind_response?' do
-    let(:response) { ::Net::HTTPOK.new('1.1', 200, 'OK') }
-
-    it 'returns true when the response has not been extended with WebMock::Net::HTTPResponse' do
-      described_class.should_unwind_response?(response).should be_true
-    end
-
-    it 'returns false when the response has been extended with WebMock::Net::HTTPResponse' do
-      response.extend WebMock::Net::HTTPResponse
-      described_class.should_unwind_response?(response).should be_false
-    end
-  end
-
   describe '#check_version!' do
     before(:each) { WebMock.should respond_to(:version) }
 
-    %w( 0.9.9 0.9.10 0.1.30 1.0.30 1.2.9 1.3.2 ).each do |version|
+    %w( 0.9.9 0.9.10 0.1.30 1.0.30 1.2.9 1.3.9 ).each do |version|
       it "raises an error when WebMock's version is #{version}" do
         WebMock.stub!(:version).and_return(version)
         described_class.should_not_receive(:warn)
@@ -29,7 +18,7 @@ describe VCR::HttpStubbingAdapters::WebMock do
       end
     end
 
-    %w( 1.3.3 1.3.10 1.3.99 ).each do |version|
+    %w( 1.4.0 1.4.10 1.4.99 ).each do |version|
       it "does nothing when WebMock's version is #{version}" do
         WebMock.stub!(:version).and_return(version)
         described_class.should_not_receive(:warn)
@@ -37,7 +26,7 @@ describe VCR::HttpStubbingAdapters::WebMock do
       end
     end
 
-    %w( 1.4.0 1.10.0 2.0.0 ).each do |version|
+    %w( 1.5.0 1.10.0 2.0.0 ).each do |version|
       it "does nothing when WebMock's version is #{version}" do
         WebMock.stub!(:version).and_return(version)
         described_class.should_receive(:warn).with(/VCR is known to work with WebMock ~> .*\./)

data/spec/internet_connection_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe VCR::InternetConnection do
+  describe '.available?' do
+    before(:each) do
+      described_class.instance_variable_set(:@available, nil)
+    end
+
+    it 'returns true when pinging example.com succeeds' do
+      Ping.stub(:pingecho).with("example.com", anything, anything).and_return(true)
+      described_class.available?.should be_true
+    end
+
+    it 'returns false when pinging example.com fails' do
+      Ping.stub(:pingecho).with("example.com", anything, anything).and_return(false)
+      described_class.available?.should be_false
+    end
+  end
+end

data/spec/monkey_patches.rb

@@ -1,6 +1,13 @@
 module MonkeyPatches
   extend self
 
+  module RSpecMacros
+    def without_monkey_patches(scope)
+      before(:each) { MonkeyPatches.disable!(scope) }
+      after(:each)  { MonkeyPatches.enable!(scope)  }
+    end
+  end
+
   NET_HTTP_SINGLETON = class << Net::HTTP; self; end
 
   MONKEY_PATCHES = [
@@ -10,15 +17,27 @@ module MonkeyPatches
     [NET_HTTP_SINGLETON, :socket_type]
   ]
 
-  def enable!
-    MONKEY_PATCHES.each do |mp|
-      realias mp.first, mp.last, :with_monkeypatches
+  def enable!(scope)
+    case scope
+      when :all
+        MONKEY_PATCHES.each do |mp|
+          realias mp.first, mp.last, :with_monkeypatches
+        end
+      when :vcr
+        realias Net::HTTP, :request, :with_vcr
+      else raise ArgumentError.new("Unexpected scope: #{scope}")
     end
   end
 
-  def disable!
-    MONKEY_PATCHES.each do |mp|
-      realias mp.first, mp.last, :without_monkeypatches
+  def disable!(scope)
+    case scope
+      when :all
+        MONKEY_PATCHES.each do |mp|
+          realias mp.first, mp.last, :without_monkeypatches
+        end
+      when :vcr
+        realias Net::HTTP, :request, :without_vcr
+      else raise ArgumentError.new("Unexpected scope: #{scope}")
     end
   end
 
@@ -68,3 +87,23 @@ module MonkeyPatches
   end
 end
 
+# Require all the HTTP libraries--these must be required before WebMock
+# for WebMock to work with them.
+require 'httpclient'
+
+if RUBY_INTERPRETER == :mri
+  require 'patron'
+  require 'em-http-request'
+  require 'curb'
+end
+
+# The FakeWeb adapter must be required after WebMock's so
+# that VCR's Net::HTTP monkey patch is loaded last.
+# This allows us to disable it (i.e. by realiasing to
+# the version of Net::HTTP's methods before it was loaded)
+require 'vcr/http_stubbing_adapters/webmock'
+require 'vcr/http_stubbing_adapters/fakeweb'
+
+# All Net::HTTP monkey patches have now been loaded, so capture the
+# appropriate method definitions so we can disable them later.
+MonkeyPatches.init

data/spec/request_matcher_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 describe VCR::RequestMatcher do
   it 'raises an error when given invalid match attributes' do

data/spec/rspec_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+describe VCR::RSpec::Macros do
+  extend described_class
+
+  describe '#use_vcr_cassette' do
+    def self.perform_test(context_name, expected_cassette_name, *args, &block)
+      context context_name do
+        after(:each) do
+          if @test_ejection
+            VCR.current_cassette.should be_nil
+          end
+        end
+
+        use_vcr_cassette *args
+
+        it 'ejects the cassette in an after hook' do
+          VCR.current_cassette.should be_a(VCR::Cassette)
+          @test_ejection = true
+        end
+
+        it "creates a cassette named '#{expected_cassette_name}" do
+          VCR.current_cassette.name.should == expected_cassette_name
+        end
+
+        module_eval(&block) if block
+      end
+    end
+
+    perform_test 'when called with an explicit name', 'explicit_name', 'explicit_name'
+
+    perform_test 'when called with an explicit name and some options', 'explicit_name', 'explicit_name', :match_requests_on => [:method, :host] do
+      it 'uses the provided cassette options' do
+        VCR.current_cassette.match_requests_on.should == [:method, :host]
+      end
+    end
+
+    perform_test 'when called with nothing', 'VCR::RSpec::Macros/#use_vcr_cassette/when called with nothing'
+
+    perform_test 'when called with some options', 'VCR::RSpec::Macros/#use_vcr_cassette/when called with some options', :match_requests_on => [:method, :host] do
+      it 'uses the provided cassette options' do
+        VCR.current_cassette.match_requests_on.should == [:method, :host]
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -2,14 +2,6 @@ require 'rubygems'
 require 'bundler'
 Bundler.setup
 
-require 'monkey_patches'
-
-require 'patron' unless RUBY_PLATFORM =~ /java/
-require 'httpclient'
-require 'em-http-request' unless RUBY_PLATFORM =~ /java/
-require 'vcr'
-require 'vcr/http_stubbing_adapters/fakeweb'
-require 'vcr/http_stubbing_adapters/webmock'
 require 'rspec'
 
 # Ruby 1.9.1 has a different yaml serialization format.
@@ -19,12 +11,17 @@ YAML_SERIALIZATION_VERSION = RUBY_VERSION == '1.9.1' ? '1.9.1' : 'not_1.9.1'
 # in ./support/ and its subdirectories.
 Dir[File.expand_path(File.join(File.dirname(__FILE__),'support','**','*.rb'))].each {|f| require f}
 
+require 'vcr'
+require 'monkey_patches'
+
 RSpec.configure do |config|
   config.extend TempCassetteLibraryDir
   config.extend DisableWarnings
+  config.extend MonkeyPatches::RSpecMacros
+  config.extend WebMockMacros
 
   config.color_enabled = true
-  config.debug = RUBY_PLATFORM != 'java'
+  config.debug = RUBY_INTERPRETER == :mri
 
   config.before(:each) do
     VCR::Config.default_cassette_options = { :record => :new_episodes }
@@ -41,5 +38,3 @@ RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
 end
 
-MonkeyPatches.init
-

data/spec/structs_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 shared_examples_for "a header normalizer" do
   let(:instance) do

data/spec/support/fixnum_extension.rb

@@ -0,0 +1,10 @@
+unless 7.respond_to?(:days)
+  class Fixnum
+    def days
+      self *
+      24 * # hours
+      60 * # minutes
+      60   # seconds
+    end
+  end
+end

data/spec/support/http_library_adapters.rb

@@ -67,12 +67,41 @@ HTTP_LIBRARY_ADAPTERS['em-http-request'] = Module.new do
   end
 end
 
+HTTP_LIBRARY_ADAPTERS['curb'] = Module.new do
+  def self.http_library_name; "Curb"; end
+
+  def get_body_string(response)
+    response.body_str
+  end
+
+  def get_header(header_key, response)
+    headers = response.header_str.split("\r\n")[1..-1]
+    headers.each do |h|
+      if h =~ /^#{Regexp.escape(header_key)}: (.*)$/
+        return $1.split(', ')
+      end
+    end
+  end
+
+  def make_http_request(method, url, body = nil, headers = {})
+    Curl::Easy.new(url) do |c|
+      c.headers = headers
+
+      if [:post, :put].include?(method)
+        c.send("http_#{method}", body)
+      else
+        c.send("http_#{method}")
+      end
+    end
+  end
+end
+
 NET_CONNECT_NOT_ALLOWED_ERROR = /You can use VCR to automatically record this request and replay it later/
 
 module HttpLibrarySpecs
   def test_http_library(library, supported_request_match_attributes)
-    # patron and em-http-client cannot be installed on jruby
-    return if %w[patron em-http-request].include?(library) && RUBY_PLATFORM == 'java'
+    # curb, patron and em-http-client cannot be installed on jruby
+    return if %w[curb patron em-http-request].include?(library) && RUBY_INTERPRETER != :mri
 
     unless adapter_module = HTTP_LIBRARY_ADAPTERS[library]
       raise ArgumentError.new("No http library adapter module could be found for #{library}")

data/spec/support/ruby_interpreter.rb

@@ -0,0 +1,7 @@
+RUBY_INTERPRETER = if RUBY_PLATFORM == 'java'
+  :jruby
+elsif defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
+  :rubinius
+else
+  :mri
+end

data/spec/support/vcr_localhost_server.rb

@@ -1,53 +1,95 @@
-require 'capybara'
-require 'capybara/wait_until'
-
-# This uses a separate process rather than a separate thread to run the server.
-# Patron always times out when this is running in a thread in the same process.
-#
-# However, jruby doesn't support forking, and patron doesn't work on jruby...
-# so we just leave Capybara::Server's definition of #boot.
-class VCR::LocalhostServer < Capybara::Server
-
-  def boot
-    return self unless @app
-    find_available_port
-    Capybara.log "application has already booted" and return self if responsive?
-    Capybara.log "booting Rack applicartion on port #{port}"
-
-    pid = Process.fork do
-      trap(:INT) { Rack::Handler::WEBrick.shutdown }
-      Rack::Handler::WEBrick.run(Identify.new(@app), :Port => port, :AccessLog => [], :Logger => WEBrick::BasicLog.new(StringIO.new))
-      exit # manually exit; otherwise this sub-process will re-run the specs that haven't run yet.
-    end
-    Capybara.log "checking if application has booted"
-
-    Capybara::WaitUntil.timeout(10) do
-      if responsive?
-        Capybara.log("application has booted")
-        true
-      else
-        sleep 0.5
-        false
+require 'rack'
+require 'rack/handler/webrick'
+
+# The code for this is inspired by Capybara's server:
+#   http://github.com/jnicklas/capybara/blob/0.3.9/lib/capybara/server.rb
+module VCR
+  class LocalhostServer
+    class Identify
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        if env["PATH_INFO"] == "/__identify__"
+          [200, {}, @app.object_id.to_s]
+        else
+          @app.call(env)
+        end
       end
     end
 
-    at_exit do
-      Process.kill('INT', pid)
-      begin
-        Process.wait(pid)
-      rescue Errno::ECHILD
-        # ignore this error...I think it means the child process has already exited.
+    attr_reader :port
+
+    def initialize(rack_app)
+      @port = find_available_port
+      @rack_app = rack_app
+      concurrently { boot }
+      wait_until(10, "Boot failed.") { booted? }
+    end
+
+    private
+
+    def find_available_port
+      server = TCPServer.new('127.0.0.1', 0)
+      server.addr[1]
+    ensure
+      server.close if server
+    end
+
+    def boot
+      # Use WEBrick since it's part of the ruby standard library and is available on all ruby interpreters.
+      Rack::Handler::WEBrick.run(Identify.new(@rack_app), :Port => port, :AccessLog => [], :Logger => WEBrick::BasicLog.new(StringIO.new))
+    end
+
+    def booted?
+      res = ::Net::HTTP.get_response("localhost", '/__identify__', port)
+
+      if res.is_a?(::Net::HTTPSuccess) or res.is_a?(::Net::HTTPRedirection)
+        return res.body == @rack_app.object_id.to_s
+      end
+    rescue Errno::ECONNREFUSED, Errno::EBADF
+      return false
+    end
+
+    def concurrently
+      if RUBY_INTERPRETER == :mri
+        # Patron times out when the server is running in a separate thread in the same process,
+        # so use a separate process.
+        pid = Process.fork do
+          yield
+          exit # manually exit; otherwise this sub-process will re-run the specs that haven't run yet.
+        end
+
+        at_exit do
+          Process.kill('INT', pid)
+          begin
+            Process.wait(pid)
+          rescue Errno::ECHILD
+            # ignore this error...I think it means the child process has already exited.
+          end
+        end
+      else
+        # JRuby doesn't support forking.
+        # Rubinius does, but there's a weird issue with the booted? check not working,
+        # so we're just using a thread for now.
+        Thread.new { yield }
       end
     end
 
-    self
-  rescue Timeout::Error
-    Capybara.log "Rack application timed out during boot"
-    exit
-  end unless RUBY_PLATFORM =~ /java/
+    def wait_until(timeout, error_message, &block)
+      start_time = Time.now
 
-  STATIC_SERVERS = Hash.new do |h, k|
-    h[k] = server = new(lambda { |env| [200, {}, StringIO.new(k)] })
-    server.boot
+      while true
+        return if yield
+        raise TimeoutError.new(error_message) if (Time.now - start_time) > timeout
+        sleep(0.05)
+      end
+    end
+
+    STATIC_SERVERS = Hash.new do |h, k|
+      h[k] = new(lambda { |env| [200, {}, StringIO.new(k)] })
+    end
   end
 end
+