webmock 1.4.0 → 1.5.0

data/CHANGELOG.md

@@ -1,5 +1,28 @@
 #Changelog
 
+## 1.5.0
+
+* Support for dynamically evaluated raw responses recorded with `curl -is` <br/>
+  i.e.
+
+		`curl -is www.example.com > /tmp/www.example.com.txt`
+		stub_request(:get, "www.example.com").to_return(lambda { |request| File.new("/tmp/#{request.uri.host.to_s}.txt" }))
+
+* `:net_http_connect_on_start` option can be passed to `WebMock.allow_net_connect!` and `WebMock.disable_net_connect!` methods, i.e.
+
+		WebMock.allow_net_connect!(:net_http_connect_on_start => true)
+
+  This forces WebMock Net::HTTP adapter to always connect on `Net::HTTP.start`. Check 'Connecting on Net::HTTP.start' in README for more information.
+
+  Thanks to Alastair Brunton for reporting the issue and for fix suggestions.
+
+* Fixed an issue where Patron spec tried to remove system temporary directory.
+  Thanks to Hans de Graaff
+
+* WebMock specs now use RSpec 2
+
+* `rake spec NO_CONNECTION=true` can now be used to only run WebMock specs which do not make real network connections
+
 ## 1.4.0
 
 * Curb support!!! Thanks to the awesome work of Pete Higgins!

data/README.md

@@ -207,14 +207,19 @@ You can also use WebMock outside a test framework:
       to_return { |request| {:body => request.body} }
 
     RestClient.post('www.example.net', 'abc')    # ===> "abc\n"
-    
+
 ### Responses dynamically evaluated from lambda
-    
+
     stub_request(:any, 'www.example.net').
       to_return(lambda { |request| {:body => request.body} })
 
     RestClient.post('www.example.net', 'abc')    # ===> "abc\n"	       
 
+### Dynamically evaluated raw responses recorded with `curl -is`
+
+    `curl -is www.example.com > /tmp/www.example.com.txt`
+    stub_request(:get, "www.example.com").to_return(lambda { |request| File.new("/tmp/#{request.uri.host.to_s}.txt" }))
+
 ### Responses with dynamically evaluated parts
 
     stub_request(:any, 'www.example.net').
@@ -305,6 +310,25 @@ You can also use WebMock outside a test framework:
 
 	Net::HTTP.get('www.example.org', '/')      # ===> Allowed.
 
+## Connecting on Net::HTTP.start
+
+HTTP protocol has 3 steps: connect, request and response (or 4 with close). Most Ruby HTTP client libraries
+treat connect as a part of request step, with the exception of `Net::HTTP` which
+allows opening connection to the server separately to the request, by using `Net::HTTP.start`.
+
+WebMock API was also designed with connect being part of request step, and it only allows stubbing
+requests, not connections. When `Net::HTTP.start` is called, WebMock doesn't know yet whether
+a request is stubbed or not. WebMock by default delays a connection until the request is invoked,
+so when there is no request, `Net::HTTP.start` doesn't do anything.
+**This means that WebMock breaks the Net::HTTP behaviour by default!**
+
+To workaround this issue, WebMock offers `:net_http_connect_on_start` option,
+which can be passed to `WebMock.allow_net_connect!` and `WebMock#disable_net_connect!` methods, i.e.
+
+	WebMock.allow_net_connect!(:net_http_connect_on_start => true)
+
+This forces WebMock Net::HTTP adapter to always connect on `Net::HTTP.start`.
+
 ## Setting Expectations
 
 ### Setting expectations in Test::Unit
@@ -532,6 +556,8 @@ People who submitted patches and new features or suggested improvements. Many th
 * Charles Li
 * Ryan Bigg
 * Pete Higgins
+* Hans de Graaff
+* Alastair Brunton
 
 ## Background
 

data/Rakefile

@@ -12,7 +12,7 @@ begin
     gem.authors = ["Bartosz Blimke"]
     gem.add_dependency "addressable", ">= 2.2.2"
     gem.add_dependency "crack", ">=0.1.7"
-    gem.add_development_dependency "rspec", ">= 1.2.9"
+    gem.add_development_dependency "rspec", ">= 2.0.0"
     gem.add_development_dependency "httpclient", ">= 2.1.5.2"
     gem.add_development_dependency "patron", ">= 0.4.9" unless RUBY_PLATFORM =~ /java/
     gem.add_development_dependency "em-http-request", ">= 0.2.14" unless RUBY_PLATFORM =~ /java/
@@ -23,16 +23,10 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb'].exclude("spec/vendor")
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
+require "rspec/core/rake_task"
+RSpec::Core::RakeTask.new do |t|
+  t.rspec_opts = ["-c", "-f progress", "-r ./spec/spec_helper.rb"] 
+  t.pattern = 'spec/**/*_spec.rb'
 end
 
 require 'rake/testtask'

data/VERSION

@@ -1 +1 @@
-1.4.0
+1.5.0

data/lib/webmock/adapters/rspec.rb

@@ -1,15 +1,15 @@
 require 'webmock'
 
 # RSpec 1.x and 2.x compatibility
-if defined?(Rspec)
-  RSPEC_NAMESPACE = RSPEC_CONFIGURER = Rspec
+if defined?(RSpec)
+  RSPEC_NAMESPACE = RSPEC_CONFIGURER = RSpec
 elsif defined?(Spec)
   RSPEC_NAMESPACE = Spec
   RSPEC_CONFIGURER = Spec::Runner
 else  
   begin
     require 'rspec'
-    RSPEC_NAMESPACE = RSPEC_CONFIGURER = Rspec
+    RSPEC_NAMESPACE = RSPEC_CONFIGURER = RSpec
   rescue LoadError
     require 'spec'
     RSPEC_NAMESPACE = Spec
@@ -30,4 +30,4 @@ RSPEC_CONFIGURER.configure { |config|
   end
 }
 
-WebMock::AssertionFailure.error_class = RSPEC_NAMESPACE::Expectations::ExpectationNotMetError
+WebMock::AssertionFailure.error_class = RSPEC_NAMESPACE::Expectations::ExpectationNotMetError

data/lib/webmock/config.rb

@@ -5,5 +5,6 @@ module WebMock
     attr_accessor :allow_net_connect
     attr_accessor :allow_localhost
     attr_accessor :allow
+    attr_accessor :net_http_connect_on_start
   end
 end

data/lib/webmock/http_lib_adapters/net_http.rb

@@ -81,6 +81,9 @@ module Net  #:nodoc: all
         WebMock::NetHTTPUtility.puts_warning_for_right_http_if_needed
         @@alredy_checked_for_right_http_connection = true
       end
+      if WebMock::Config.instance.net_http_connect_on_start
+        return connect_without_webmock
+      end
       nil
     end
     alias_method :connect_without_webmock, :connect

data/lib/webmock/request_registry.rb

@@ -43,8 +43,7 @@ module WebMock
     end
 
     def evaluate_response_for_request(response, request_signature)
-      evaluated_response = response.dup
-      evaluated_response.evaluate!(request_signature)
+      response.evaluate(request_signature)
     end
 
   end

data/lib/webmock/response.rb

@@ -80,7 +80,7 @@ module WebMock
       @should_timeout = options[:should_timeout]
     end
 
-    def evaluate!(request_signature)
+    def evaluate(request_signature)
       self.body = @body.call(request_signature) if @body.is_a?(Proc)
       self.headers = @headers.call(request_signature) if @headers.is_a?(Proc)
       self.status = @status.call(request_signature) if @status.is_a?(Proc)
@@ -136,13 +136,9 @@ module WebMock
       @responder = responder
     end
 
-    def dup
-      self.class.new(@responder)
-    end
-
-    def evaluate!(request_signature)
-      self.options = @responder.call(request_signature)
-      self
+    def evaluate(request_signature)
+      options = @responder.call(request_signature)
+      Response.new(options)
     end
   end
 end

data/lib/webmock/webmock.rb

@@ -27,14 +27,16 @@ module WebMock
     }
   end
 
-  def self.allow_net_connect!
+  def self.allow_net_connect!(options = {})
     Config.instance.allow_net_connect = true
+    Config.instance.net_http_connect_on_start = options[:net_http_connect_on_start]
   end
 
   def self.disable_net_connect!(options = {})
     Config.instance.allow_net_connect = false
     Config.instance.allow_localhost = options[:allow_localhost]
     Config.instance.allow = options[:allow]
+    Config.instance.net_http_connect_on_start = options[:net_http_connect_on_start]
   end
 
   def self.net_connect_allowed?(uri = nil)

data/spec/curb_spec.rb

@@ -1,10 +1,10 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-require 'webmock_spec'
+require 'webmock_shared'
 
 unless RUBY_PLATFORM =~ /java/
   require 'curb_spec_helper'
 
-  describe "Curb", :shared => true do
+  shared_examples_for "Curb" do
     include CurbSpecHelper
     
     it_should_behave_like "WebMock"

data/spec/curb_spec_helper.rb

@@ -21,6 +21,7 @@ module CurbSpecHelper
     curl.username = uri.user
     curl.password = uri.password
     curl.timeout  = 10
+    curl.connect_timeout = 10
 
     if headers = options[:headers]
       headers.each {|k,v| curl.headers[k] = v }

data/spec/em_http_request_spec.rb

@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-require 'webmock_spec'
+require 'webmock_shared'
 require 'ostruct'
 
 unless RUBY_PLATFORM =~ /java/

data/spec/em_http_request_spec_helper.rb

@@ -12,7 +12,7 @@ module EMHttpRequestSpecHelper
     EventMachine.run {
       request = EventMachine::HttpRequest.new("#{uri.omit(:userinfo).normalize.to_s}")
       http = request.send(:setup_request, method, {
-        :timeout => 2, 
+        :timeout => 10, 
         :body => options[:body],
         :query => options[:query],
         'authorization' => [uri.user, uri.password],

data/spec/httpclient_spec.rb

@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-require 'webmock_spec'
+require 'webmock_shared'
 require 'ostruct'
 
 require 'httpclient_spec_helper'

data/spec/net_http_spec.rb

@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-require 'webmock_spec'
+require 'webmock_shared'
 require 'ostruct'
 require 'net_http_spec_helper'
 
@@ -13,7 +13,7 @@ describe "Webmock with Net:HTTP" do
     stub_http_request(:get, "www.example.com").to_return(:body => "abc"*100000)
     Net::HTTP.start("www.example.com") { |query| query.get("/") }.body.should == "abc"*100000
   end
-  
+
   it "should handle multiple values for the same response header" do
     stub_http_request(:get, "www.example.com").to_return(:headers => { 'Set-Cookie' => ['foo=bar', 'bar=bazz'] })
     response = Net::HTTP.get_response(URI.parse("http://www.example.com/"))
@@ -52,23 +52,23 @@ describe "Webmock with Net:HTTP" do
     }.should raise_error("both of body argument and HTTPRequest#body set")
   end
 
-  it "should handle real requests with readable body" do
+  it "should handle real requests with readable body", :net_connect => true do
     WebMock.allow_net_connect!
     req = Net::HTTP::Post.new("/")
     Net::HTTP.start("www.example.com") {|http|
       http.request(req, StringIO.new("my_params"))
     }.body.should =~ /Example Web Page/
   end
-  
-  it "should handle requests with block passed to read_body" do
+
+  it "should handle requests with block passed to read_body", :net_connect => true do
     body = ""
     WebMock.allow_net_connect!
     req = Net::HTTP::Get.new("/")
     Net::HTTP.start("www.example.com") do |http|
-      http.request(req) do |res|  
+      http.request(req) do |res|
         res.read_body do |str|
           body << str
-        end 
+        end
       end
     end
     body.should =~ /Example Web Page/
@@ -80,13 +80,54 @@ describe "Webmock with Net:HTTP" do
     response.body.should be_a(Net::ReadAdapter)
   end
 
-  it "should return a Net::ReadAdapter from response.body when a real request is made with a block and #read_body" do
+  it "should return a Net::ReadAdapter from response.body when a real request is made with a block and #read_body", :net_connect => true do
     WebMock.allow_net_connect!
     response = Net::HTTP.new('example.com', 80).request_get('/') { |r| r.read_body { } }
     response.body.should be_a(Net::ReadAdapter)
   end
 
-  describe 'after_request callback support' do
+  describe "connecting on Net::HTTP.start" do
+    before(:each) do
+      @http = Net::HTTP.new('www.google.com', 443)
+      @http.use_ssl = true
+      @http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    end
+    describe "when net http is allowed" do
+      it "should not connect to the server until the request", :net_connect => true do
+        WebMock.allow_net_connect!
+        @http.start {|conn|
+          conn.peer_cert.should be_nil
+        }
+      end
+
+      it "should connect to the server on start", :net_connect => true do
+        WebMock.allow_net_connect!(:net_http_connect_on_start => true)
+        @http.start {|conn|
+          cert = OpenSSL::X509::Certificate.new conn.peer_cert
+          cert.should be_a(OpenSSL::X509::Certificate)
+        }
+      end
+    end
+
+    describe "when net http is disabled and allowed only for some hosts" do
+      it "should not connect to the server until the request", :net_connect => true do
+        WebMock.disable_net_connect!(:allow => "www.google.com")
+        @http.start {|conn|
+          conn.peer_cert.should be_nil
+        }
+      end
+
+      it "should connect to the server on start", :net_connect => true do
+        WebMock.disable_net_connect!(:allow => "www.google.com", :net_http_connect_on_start => true)
+        @http.start {|conn|
+          cert = OpenSSL::X509::Certificate.new conn.peer_cert
+          cert.should be_a(OpenSSL::X509::Certificate)
+        }
+      end
+    end
+  end
+
+  describe 'after_request callback support', :net_connect => true do
     let(:expected_body_regex) { /You have reached this web page by typing.*example\.com/ }
 
     before(:each) do

data/spec/net_http_spec_helper.rb

@@ -20,7 +20,10 @@ module NetHTTPSpecHelper
 
     req.basic_auth uri.user, uri.password if uri.user
     http = Net::HTTP.new(uri.host, uri.port)
-    http.use_ssl = true if uri.scheme == "https"
+    if uri.scheme == "https"
+      http.use_ssl = true
+      http.ssl_timeout = 10
+    end
     http.verify_mode = OpenSSL::SSL::VERIFY_NONE
     response = http.start {|http|
       http.request(req, options[:body], &block)

data/spec/network_connection.rb

@@ -0,0 +1,25 @@
+module NetworkConnection
+  def self.connect_to(host, port, timeout=nil)
+    addr = Socket.getaddrinfo(host, nil)
+    sock = Socket.new(Socket.const_get(addr[0][0]), Socket::SOCK_STREAM, 0)
+
+    if timeout
+      secs = Integer(timeout)
+      usecs = Integer((timeout - secs) * 1_000_000)
+      optval = [secs, usecs].pack("l_2")
+      sock.setsockopt Socket::SOL_SOCKET, Socket::SO_RCVTIMEO, optval
+      sock.setsockopt Socket::SOL_SOCKET, Socket::SO_SNDTIMEO, optval
+    end
+    sock.connect(Socket.pack_sockaddr_in(port, addr[0][3]))
+    sock
+  end
+
+  def self.is_network_available?
+    begin
+      self.connect_to("192.0.32.10", 80, 5)
+      true
+    rescue
+      false
+    end
+  end
+end

data/spec/patron_spec.rb

@@ -1,6 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-require 'webmock_spec'
-
+require 'webmock_shared'
 
 unless RUBY_PLATFORM =~ /java/
   require 'patron_spec_helper'
@@ -21,7 +20,7 @@ unless RUBY_PLATFORM =~ /java/
       describe "file requests" do
 
         before(:each) do
-          @dir_path = Dir.tmpdir
+          @dir_path = Dir.mktmpdir('webmock-')
           @file_path = File.join(@dir_path, "webmock_temp_test_file")
           FileUtils.rm_rf(@file_path) if File.exists?(@file_path)
         end

data/spec/patron_spec_helper.rb

@@ -7,6 +7,7 @@ module PatronSpecHelper
     sess.username = uri.user
     sess.password = uri.password
 
+    sess.connect_timeout = 10
     sess.timeout = 10
 
     response = sess.request(method, "#{uri.path}#{uri.query ? '?' : ''}#{uri.query}", options[:headers] || {}, {

data/spec/response_spec.rb

@@ -58,14 +58,14 @@ describe WebMock::Response do
         @response.raise_error_if_any
       }.should raise_error(ArgumentError, "Exception from WebMock")
     end
-    
+
     it "should raise error if any assigned as instance" do
       @response = WebMock::Response.new(:exception => ArgumentError.new("hello world"))
       lambda {
         @response.raise_error_if_any
       }.should raise_error(ArgumentError, "hello world")
     end
-    
+
     it "should raise error if any assigned as string" do
       @response = WebMock::Response.new(:exception => "hello world")
       lambda {
@@ -78,7 +78,7 @@ describe WebMock::Response do
     end
 
   end
-  
+
   describe "timeout" do
 
     it "should know if it should timeout" do
@@ -170,7 +170,7 @@ describe WebMock::Response do
           "Date"=>"Sat, 23 Jan 2010 01:01:05 GMT",
           "Content-Type"=>"text/html; charset=UTF-8",
           "Content-Length"=>"438",
-          "Connection"=>"Keep-Alive",          
+          "Connection"=>"Keep-Alive",
           "Accept"=>"image/jpeg, image/png"
           }
       end
@@ -195,17 +195,17 @@ describe WebMock::Response do
 
       it "should have evaluated body" do
         @response = WebMock::Response.new(:body => lambda {|request| request.body})
-        @response.evaluate!(@request_signature).body.should == "abc"
+        @response.evaluate(@request_signature).body.should == "abc"
       end
 
       it "should have evaluated headers" do
         @response = WebMock::Response.new(:headers => lambda {|request| request.headers})
-        @response.evaluate!(@request_signature).headers.should == {'A' => 'a'}
+        @response.evaluate(@request_signature).headers.should == {'A' => 'a'}
       end
 
       it "should have evaluated status" do
         @response = WebMock::Response.new(:status => lambda {|request| 302})
-        @response.evaluate!(@request_signature).status.should == [302, ""]
+        @response.evaluate(@request_signature).status.should == [302, ""]
       end
 
     end
@@ -216,7 +216,7 @@ describe WebMock::Response do
 
     describe "evaluating response options" do
 
-      it "should have evaluated options" do
+      it "should evaluate new response with evaluated options" do
         request_signature = WebMock::RequestSignature.new(:post, "www.example.com", :body => "abc", :headers => {'A' => 'a'})
         response = WebMock::DynamicResponse.new(lambda {|request|
           {
@@ -225,19 +225,41 @@ describe WebMock::Response do
             :status => 302
           }
         })
-        response.evaluate!(request_signature)
-        response.body.should == "abc"
-        response.headers.should == {'A' => 'a'}
-        response.status.should == [302, ""]
+        evaluated_response = response.evaluate(request_signature)
+        evaluated_response.body.should == "abc"
+        evaluated_response.headers.should == {'A' => 'a'}
+        evaluated_response.status.should == [302, ""]
       end
 
       it "should be equal to static response after evaluation" do
         request_signature = WebMock::RequestSignature.new(:post, "www.example.com", :body => "abc")
         response = WebMock::DynamicResponse.new(lambda {|request| {:body => request.body}})
-        response.evaluate!(request_signature)
-        response.should == WebMock::Response.new(:body => "abc")
+        evaluated_response = response.evaluate(request_signature)
+        evaluated_response.should == WebMock::Response.new(:body => "abc")
       end
 
+      describe "when raw response is evaluated" do
+        before(:each) do
+          @files = {
+            "www.example.com" => File.new(File.expand_path(File.dirname(__FILE__)) + "/example_curl_output.txt")
+          }
+          @request_signature = WebMock::RequestSignature.new(:get, "www.example.com")
+        end
+
+        describe "as a file" do
+          it "should return response" do
+            response = WebMock::DynamicResponse.new(lambda {|request| @files[request.uri.host.to_s] })
+            response.evaluate(@request_signature).body.size.should == 438
+          end
+        end
+
+        describe "as a string" do
+          it "should return response" do
+            response = WebMock::DynamicResponse.new(lambda {|request| @files[request.uri.host.to_s].read })
+            response.evaluate(@request_signature).body.size.should == 438
+          end
+        end
+      end
     end
 
   end

data/spec/spec_helper.rb

@@ -8,23 +8,31 @@ end
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
 
 require 'webmock/rspec'
 
+require 'network_connection'
+
 require 'json'
 
-Spec::Runner.configure do |config|
-   config.include WebMock::API
+RSpec.configure do |config|
+  config.include WebMock::API  
+  unless NetworkConnection.is_network_available?
+    warn("No network connectivity. Only examples which do not make real network connections will run.")
+    no_network_connection = true
+  end
+  if ENV["NO_CONNECTION"] || no_network_connection
+    config.filter_run_excluding :net_connect => true
+  end
 end
 
 def fail()
-  raise_error(Spec::Expectations::ExpectationNotMetError)
+  raise_error(RSpec::Expectations::ExpectationNotMetError)
 end
 
 def fail_with(message)
-  raise_error(Spec::Expectations::ExpectationNotMetError, message)
+  raise_error(RSpec::Expectations::ExpectationNotMetError, message)
 end
 
 class Proc
@@ -56,3 +64,4 @@ def client_specific_request_string(string)
   end
   string
 end
+

data/spec/{webmock_spec.rb → webmock_shared.rb}

@@ -18,7 +18,7 @@ describe "WebMock version" do
 end
 
 
-describe "WebMock", :shared => true do
+shared_examples_for "WebMock" do
   before(:each) do
     WebMock.disable_net_connect!
     WebMock::RequestRegistry.instance.reset_webmock
@@ -26,7 +26,7 @@ describe "WebMock", :shared => true do
 
   describe "when web connect" do
 
-    describe "is allowed" do
+    describe "is allowed", :net_connect => true do
       before(:each) do
         WebMock.allow_net_connect!
       end
@@ -122,7 +122,7 @@ describe "WebMock", :shared => true do
         }.should raise_error(WebMock::NetConnectNotAllowedError, client_specific_request_string("Real HTTP connections are disabled. Unregistered request: GET http://www.example.com/"))
       end
 
-      it "should allow a real request to allowed host" do
+      it "should allow a real request to allowed host", :net_connect => true do
         http_request(:get, "http://www.example.org/").status.should == "200"
       end
     end
@@ -691,6 +691,25 @@ describe "WebMock", :shared => true do
           end
         end
 
+        describe "replying raw responses evaluated dynamically" do
+          before(:each) do
+            @files = {
+              "www.example.com" => File.new(File.expand_path(File.dirname(__FILE__)) + "/example_curl_output.txt")
+            }
+          end
+
+          it "should return response from evaluated file" do
+            stub_http_request(:get, "www.example.com").to_return(lambda {|request| @files[request.uri.host.to_s] })
+            http_request(:get, "http://www.example.com/").body.size.should == 438
+          end
+
+          it "should return response from evaluated string" do
+            stub_http_request(:get, "www.example.com").to_return(lambda {|request| @files[request.uri.host.to_s].read })
+            http_request(:get, "http://www.example.com/").body.size.should == 438
+          end
+
+        end
+
         describe "sequences of responses" do
 
           it "should return responses one by one if declared in array" do
@@ -1362,7 +1381,7 @@ describe "WebMock", :shared => true do
             end
 
 
-            describe "when net connect allowed" do
+            describe "when net connect allowed", :net_connect => true do
               before(:each) do
                 WebMock.allow_net_connect!
               end
@@ -1466,7 +1485,7 @@ describe "WebMock", :shared => true do
       
         end
         
-        describe "for real requests" do
+        describe "for real requests", :net_connect => true do
           before(:each) do
             WebMock.reset_webmock
             WebMock.allow_net_connect!
@@ -1500,7 +1519,7 @@ describe "WebMock", :shared => true do
         @called.should == 2
       end
       
-      it "should invoke callbacks only for real requests if requested" do
+      it "should invoke callbacks only for real requests if requested", :net_connect => true do
         WebMock.after_request(:real_requests_only => true) { @called = true }
         http_request(:get, "http://www.example.com/")
         @called.should == nil

data/webmock.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{webmock}
-  s.version = "1.4.0"
+  s.version = "1.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bartosz Blimke"]
-  s.date = %q{2010-10-13}
+  s.date = %q{2010-11-02}
   s.description = %q{WebMock allows stubbing HTTP requests and setting expectations on HTTP requests.}
   s.email = %q{bartosz.blimke@gmail.com}
   s.extra_rdoc_files = [
@@ -63,6 +63,7 @@ Gem::Specification.new do |s|
      "spec/httpclient_spec_helper.rb",
      "spec/net_http_spec.rb",
      "spec/net_http_spec_helper.rb",
+     "spec/network_connection.rb",
      "spec/other_net_http_libs_spec.rb",
      "spec/patron_spec.rb",
      "spec/patron_spec_helper.rb",
@@ -72,7 +73,6 @@ Gem::Specification.new do |s|
      "spec/request_signature_spec.rb",
      "spec/request_stub_spec.rb",
      "spec/response_spec.rb",
-     "spec/spec.opts",
      "spec/spec_helper.rb",
      "spec/util/hash_counter_spec.rb",
      "spec/util/headers_spec.rb",
@@ -87,7 +87,7 @@ Gem::Specification.new do |s|
      "spec/vendor/right_http_connection-1.2.4/lib/net_fix.rb",
      "spec/vendor/right_http_connection-1.2.4/lib/right_http_connection.rb",
      "spec/vendor/right_http_connection-1.2.4/setup.rb",
-     "spec/webmock_spec.rb",
+     "spec/webmock_shared.rb",
      "test/test_helper.rb",
      "test/test_webmock.rb",
      "webmock.gemspec"
@@ -95,7 +95,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/bblimke/webmock}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Library for stubbing HTTP requests in Ruby.}
   s.test_files = [
     "spec/curb_spec.rb",
@@ -106,6 +106,7 @@ Gem::Specification.new do |s|
      "spec/httpclient_spec_helper.rb",
      "spec/net_http_spec.rb",
      "spec/net_http_spec_helper.rb",
+     "spec/network_connection.rb",
      "spec/other_net_http_libs_spec.rb",
      "spec/patron_spec.rb",
      "spec/patron_spec_helper.rb",
@@ -125,7 +126,7 @@ Gem::Specification.new do |s|
      "spec/vendor/right_http_connection-1.2.4/lib/net_fix.rb",
      "spec/vendor/right_http_connection-1.2.4/lib/right_http_connection.rb",
      "spec/vendor/right_http_connection-1.2.4/setup.rb",
-     "spec/webmock_spec.rb",
+     "spec/webmock_shared.rb",
      "test/test_helper.rb",
      "test/test_webmock.rb"
   ]
@@ -134,10 +135,10 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<addressable>, [">= 2.2.2"])
       s.add_runtime_dependency(%q<crack>, [">= 0.1.7"])
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<rspec>, [">= 2.0.0"])
       s.add_development_dependency(%q<httpclient>, [">= 2.1.5.2"])
       s.add_development_dependency(%q<patron>, [">= 0.4.9"])
       s.add_development_dependency(%q<em-http-request>, [">= 0.2.14"])
@@ -145,7 +146,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<addressable>, [">= 2.2.2"])
       s.add_dependency(%q<crack>, [">= 0.1.7"])
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<rspec>, [">= 2.0.0"])
       s.add_dependency(%q<httpclient>, [">= 2.1.5.2"])
       s.add_dependency(%q<patron>, [">= 0.4.9"])
       s.add_dependency(%q<em-http-request>, [">= 0.2.14"])
@@ -154,7 +155,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<addressable>, [">= 2.2.2"])
     s.add_dependency(%q<crack>, [">= 0.1.7"])
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<rspec>, [">= 2.0.0"])
     s.add_dependency(%q<httpclient>, [">= 2.1.5.2"])
     s.add_dependency(%q<patron>, [">= 0.4.9"])
     s.add_dependency(%q<em-http-request>, [">= 0.2.14"])

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
+  hash: 3
   prerelease: false
   segments: 
   - 1
-  - 4
+  - 5
   - 0
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-13 00:00:00 +01:00
+date: 2010-11-02 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: addressable
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 2
         - 2
@@ -35,9 +38,11 @@ dependencies:
   name: crack
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 0
         - 1
@@ -49,23 +54,27 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
-        - 1
         - 2
-        - 9
-        version: 1.2.9
+        - 0
+        - 0
+        version: 2.0.0
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: httpclient
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 119
         segments: 
         - 2
         - 1
@@ -78,9 +87,11 @@ dependencies:
   name: patron
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 0
         - 4
@@ -92,9 +103,11 @@ dependencies:
   name: em-http-request
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 0
         - 2
@@ -106,9 +119,11 @@ dependencies:
   name: curb
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 0
         - 7
@@ -172,6 +187,7 @@ files:
 - spec/httpclient_spec_helper.rb
 - spec/net_http_spec.rb
 - spec/net_http_spec_helper.rb
+- spec/network_connection.rb
 - spec/other_net_http_libs_spec.rb
 - spec/patron_spec.rb
 - spec/patron_spec_helper.rb
@@ -181,7 +197,6 @@ files:
 - spec/request_signature_spec.rb
 - spec/request_stub_spec.rb
 - spec/response_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 - spec/util/hash_counter_spec.rb
 - spec/util/headers_spec.rb
@@ -196,7 +211,7 @@ files:
 - spec/vendor/right_http_connection-1.2.4/lib/net_fix.rb
 - spec/vendor/right_http_connection-1.2.4/lib/right_http_connection.rb
 - spec/vendor/right_http_connection-1.2.4/setup.rb
-- spec/webmock_spec.rb
+- spec/webmock_shared.rb
 - test/test_helper.rb
 - test/test_webmock.rb
 - webmock.gemspec
@@ -210,23 +225,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Library for stubbing HTTP requests in Ruby.
@@ -239,6 +258,7 @@ test_files:
 - spec/httpclient_spec_helper.rb
 - spec/net_http_spec.rb
 - spec/net_http_spec_helper.rb
+- spec/network_connection.rb
 - spec/other_net_http_libs_spec.rb
 - spec/patron_spec.rb
 - spec/patron_spec_helper.rb
@@ -258,6 +278,6 @@ test_files:
 - spec/vendor/right_http_connection-1.2.4/lib/net_fix.rb
 - spec/vendor/right_http_connection-1.2.4/lib/right_http_connection.rb
 - spec/vendor/right_http_connection-1.2.4/setup.rb
-- spec/webmock_spec.rb
+- spec/webmock_shared.rb
 - test/test_helper.rb
 - test/test_webmock.rb

data/spec/spec.opts

@@ -1 +0,0 @@
---color