webmock 1.6.4 → 1.7.0

data/spec/util/uri_spec.rb

@@ -171,7 +171,7 @@ describe WebMock::Util::URI do
       uri = 'http://www.example.com:80/path?a[]=b&a[]=c'
       lambda { WebMock::Util::URI.normalize_uri(uri) }.should_not raise_error(ArgumentError)
     end
-    
+
   end
 
   describe "stripping default port" do

data/spec/vendor/addressable/lib/uri.rb

@@ -0,0 +1 @@
+

data/spec/vendor/crack/lib/crack.rb

@@ -0,0 +1 @@
+

data/spec/vendor/right_http_connection-1.2.4/History.txt

@@ -26,8 +26,8 @@ Initial public release
 == 1.2.0 2007-10-05
 
 * r1867, konstantin, 2007-10-05 06:19:45
-  * # 220, (re)open connection to server if none exists or connection params 
-    have changed 
+  * # 220, (re)open connection to server if none exists or connection params
+    have changed
 
 == 1.2.1
 
@@ -37,7 +37,7 @@ Initial public release
 
 * r2764, konstantin, 02-08-08 00:05:00 +03:00
   * "RightAws: incompatible Net::HTTP monkey-patch" exception is raised if our net_fix
-    patch was overriden (by attachment_fu for example, to avoid this load attachment_fu 
+    patch was overriden (by attachment_fu for example, to avoid this load attachment_fu
     before loading the right_http_connection gem).
 
 == 1.2.2
@@ -51,7 +51,7 @@ Initial public release
 - Improve handling of data streams during upload: if there is a failure and a retry, reset
   the seek pointer for the subsequent re-request
 
-== 1.2.4 
+== 1.2.4
 
 *  r4984, konstantin, 2008-08-11 14:49:18 +0400
   * fixed a bug: <NoMethodError: You have a nil object when you didn't expect it!

data/spec/vendor/right_http_connection-1.2.4/README.txt

@@ -1,6 +1,6 @@
 RightScale::HttpConnection
     by RightScale, Inc.
-    www.RightScale.com 
+    www.RightScale.com
 
 == DESCRIPTION:
 
@@ -12,7 +12,7 @@ algorithm for low-level network errors.
 - provides put/get streaming
 - does configurable retries on connect and read timeouts, DNS failures, etc.
 - HTTPS certificate checking
-  
+
 == SYNOPSIS:
 
 
@@ -20,7 +20,7 @@ algorithm for low-level network errors.
 
 - 2/11/08: If you use RightScale::HttpConnection in conjunction with attachment_fu, the
   HttpConnection gem must be included (using the require statement) AFTER
-  attachment_fu.  
+  attachment_fu.
   This is due to a conflict between the HttpConnection gem and another
   gem required by attachment_fu.
 
@@ -32,7 +32,7 @@ sudo gem install right_http_connection
 
 == LICENSE:
 
-Copyright (c) 2007-2008 RightScale, Inc. 
+Copyright (c) 2007-2008 RightScale, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/spec/vendor/right_http_connection-1.2.4/Rakefile

@@ -25,7 +25,7 @@ VERS = RightHttpConnection::VERSION::STRING + (REV ? ".#{REV}" : "")
 CLEAN.include ['**/.*.sw?', '*.gem', '.config', '**/.DS_Store']
 RDOC_OPTS = ['--quiet', '--title', 'right_http_connection documentation',
     "--opname", "index.html",
-    "--line-numbers", 
+    "--line-numbers",
     "--main", "README",
     "--inline-source"]
 
@@ -51,7 +51,7 @@ end
 # Generate all the Rake tasks
 # Run 'rake -T' to see list of generated tasks (from gem root directory)
 hoe = Hoe.new(GEM_NAME, VERS) do |p|
-  p.author = AUTHOR 
+  p.author = AUTHOR
   p.description = DESCRIPTION
   p.email = EMAIL
   p.summary = DESCRIPTION
@@ -60,7 +60,7 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
   p.test_globs = ["test/**/test_*.rb"]
   p.clean_globs = CLEAN  #An array of file patterns to delete on clean.
   p.remote_rdoc_dir = "right_http_gem_doc"
-  
+
   # == Optional
   p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
   #p.extra_deps = []     # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]

data/spec/vendor/right_http_connection-1.2.4/lib/net_fix.rb

@@ -22,12 +22,12 @@
 #
 #
 
-# Net::HTTP and Net::HTTPGenericRequest fixes to support 100-continue on 
+# Net::HTTP and Net::HTTPGenericRequest fixes to support 100-continue on
 # POST and PUT. The request must have 'expect' field set to '100-continue'.
 
 
 module Net
-  
+
   class BufferedIO #:nodoc:
     # Monkey-patch Net::BufferedIO to read > 1024 bytes from the socket at a time
 
@@ -117,12 +117,12 @@ module Net
           end
         end
       end
-    end    
+    end
   end
 
 
   #-- Net::HTTP --
-  
+
   class HTTP
     def request(req, body = nil, &block)  # :yield: +response+
       unless started?

data/spec/vendor/right_http_connection-1.2.4/setup.rb

@@ -659,7 +659,7 @@ module FileOperations
   def ruby(*args)
     command config('rubyprog'), *args
   end
-  
+
   def make(task = nil)
     command(*[config('makeprog'), task].compact)
   end
@@ -722,7 +722,7 @@ module HookScriptAPI
   def srcdirectory?(path)
     File.dir?(srcfile(path))
   end
-  
+
   def srcfile?(path)
     File.file?(srcfile(path))
   end
@@ -826,7 +826,7 @@ class ToplevelInstaller
       __send__ "exec_#{task}"
     end
   end
-  
+
   def run_metaconfigs
     @config.load_script "#{@ardir}/metaconfig"
   end
@@ -1404,7 +1404,7 @@ class Installer
   end
 
   # picked up many entries from cvs-1.11.1/src/ignore.c
-  JUNK_FILES = %w( 
+  JUNK_FILES = %w(
     core RCSLOG tags TAGS .make.state
     .nse_depinfo #* .#* cvslog.* ,* .del-* *.olb
     *~ *.old *.bak *.BAK *.orig *.rej _$* *$

data/spec/webmock_shared.rb

@@ -4,18 +4,12 @@ unless defined? SAMPLE_HEADERS
   SAMPLE_HEADERS = { "Content-Length" => "8888", "Accept" => "application/json" }
   ESCAPED_PARAMS = "x=ab%20c&z=%27Stop%21%27%20said%20Fred"
   NOT_ESCAPED_PARAMS = "z='Stop!' said Fred&x=ab c"
-  WWW_EXAMPLE_COM_CONTENT_LENGTH = 0
 end
 
 class MyException < StandardError; end;
 
-describe "WebMock version" do
-  it "should report version" do
-    WebMock.version.should == WebMock::VERSION
-  end
-end
-
 shared_examples_for "WebMock" do
+  let(:webmock_server_url) {"http://#{WebMockServer.instance.host_with_port}/"}
   before(:each) do
     WebMock.disable_net_connect!
     WebMock.reset!
@@ -29,21 +23,14 @@ shared_examples_for "WebMock" do
       end
 
       it "should make a real web request if request is not stubbed" do
-        setup_expectations_for_real_example_com_request
-        http_request(:get, "http://www.example.com/").status.should == "302"
+        http_request(:get, webmock_server_url).status.should == "200"
       end
 
       it "should make a real https request if request is not stubbed" do
-        setup_expectations_for_real_example_com_request(
-         :host => "www.paypal.com",
-         :port => 443,
-         :path => "/uk/cgi-bin/webscr",
-         :response_code => 200,
-         :response_message => "OK",
-         :response_body => "hello paypal"
-        )
-        http_request(:get, "https://www.paypal.com/uk/cgi-bin/webscr").
-          body.should =~ /.*paypal.*/
+        unless http_library == :httpclient
+          http_request(:get, "https://www.paypal.com/uk/cgi-bin/webscr").
+            body.should =~ /.*paypal.*/
+        end
       end
 
       it "should return stubbed response if request was stubbed" do
@@ -61,7 +48,7 @@ shared_examples_for "WebMock" do
         stub_http_request(:get, "www.example.com").to_return(:body => "abc")
         http_request(:get, "http://www.example.com/").body.should == "abc"
       end
-      
+
       it "should return stubbed response if request with path was stubbed" do
         stub_http_request(:get, "www.example.com/hello_world").to_return(:body => "abc")
         http_request(:get, "http://www.example.com/hello_world").body.should == "abc"
@@ -108,25 +95,64 @@ shared_examples_for "WebMock" do
           }.should raise_error(connection_refused_exception_class)
         end
     end
-    
+
    describe "is not allowed with exception for allowed domains" do
+     let(:host_with_port){ WebMockServer.instance.host_with_port }
+
       before(:each) do
-        WebMock.disable_net_connect!(:allow => ["www.example.org"])
+        WebMock.disable_net_connect!(:allow => ["www.example.org", host_with_port])
       end
 
-      it "should return stubbed response if request was stubbed" do
-        stub_http_request(:get, "www.example.com").to_return(:body => "abc")
-        http_request(:get, "http://www.example.com/").body.should == "abc"
+      context "when the host is not allowed" do
+        it "should return stubbed response if request was stubbed" do
+          stub_http_request(:get, "www.example.com").to_return(:body => "abc")
+          http_request(:get, "http://www.example.com/").body.should == "abc"
+        end
+
+        it "should raise exception if request was not stubbed" do
+          lambda {
+            http_request(:get, "http://www.example.com/")
+          }.should raise_error(WebMock::NetConnectNotAllowedError, %r(Real HTTP connections are disabled. Unregistered request: GET http://www.example.com/))
+        end
       end
 
-      it "should raise exception if request was not stubbed" do
-        lambda {
-          http_request(:get, "http://www.example.com/")
-        }.should raise_error(WebMock::NetConnectNotAllowedError, %r(Real HTTP connections are disabled. Unregistered request: GET http://www.example.com/))
+      context "when the host with port is not allowed" do
+        it "should return stubbed response if request was stubbed" do
+          stub_http_request(:get, "http://localhost:2345").to_return(:body => "abc")
+          http_request(:get, "http://localhost:2345/").body.should == "abc"
+        end
+
+        it "should raise exception if request was not stubbed" do
+          lambda {
+            http_request(:get, "http://localhost:2345/")
+          }.should raise_error(WebMock::NetConnectNotAllowedError, %r(Real HTTP connections are disabled. Unregistered request: GET http://localhost:2345/))
+        end
       end
 
-      it "should allow a real request to allowed host", :net_connect => true do
-        http_request(:get, "http://www.example.org/").status.should == "302"
+      context "when the host is allowed" do
+        it "should raise exception if request was not stubbed" do
+          lambda {
+            http_request(:get, "http://www.example.com/")
+          }.should raise_error(WebMock::NetConnectNotAllowedError, %r(Real HTTP connections are disabled. Unregistered request: GET http://www.example.com/))
+        end
+
+        it "should allow a real request to allowed host", :net_connect => true do
+          http_request(:get, "http://www.example.org/").status.should == "302"
+        end
+      end
+
+      context "when the host with port is allowed" do
+        it "should allow a real request to allowed host", :net_connect => true do
+          http_request(:get, "http://#{host_with_port}/").status.should == "200"
+        end
+      end
+
+      context "when the host is allowed but not port" do
+        it "should allow a real request to allowed host", :net_connect => true do
+          lambda {
+            http_request(:get, "http://localhost:123/")
+          }.should raise_error(WebMock::NetConnectNotAllowedError, %r(Real HTTP connections are disabled. Unregistered request: GET http://localhost:123/))
+        end
       end
     end
   end
@@ -149,26 +175,26 @@ shared_examples_for "WebMock" do
         stub_http_request(:get, /.*x=ab c.*/).to_return(:body => "abc")
         http_request(:get, "http://www.example.com/hello/?#{ESCAPED_PARAMS}").body.should == "abc"
       end
-        
+
     end
 
     describe "on query params" do
-      
+
       it "should match the request by query params declared as a hash" do
         stub_http_request(:get, "www.example.com").with(:query => {"a" => ["b", "c"]}).to_return(:body => "abc")
         http_request(:get, "http://www.example.com/?a[]=b&a[]=c").body.should == "abc"
       end
-      
+
       it "should match the request by query declared as a string" do
         stub_http_request(:get, "www.example.com").with(:query => "a[]=b&a[]=c").to_return(:body => "abc")
         http_request(:get, "http://www.example.com/?a[]=b&a[]=c").body.should == "abc"
       end
-      
+
       it "should match the request by query params declared both in uri and query option" do
         stub_http_request(:get, "www.example.com/?x=3").with(:query => {"a" => ["b", "c"]}).to_return(:body => "abc")
         http_request(:get, "http://www.example.com/?x=3&a[]=b&a[]=c").body.should == "abc"
       end
-    
+
     end
 
     describe "on method" do
@@ -229,27 +255,27 @@ shared_examples_for "WebMock" do
         end
 
       end
-      
-      describe "when body is declared as a hash" do        
+
+      describe "when body is declared as a hash" do
         before(:each) do
           stub_http_request(:post, "www.example.com").
             with(:body => {:a => '1', :b => 'five', 'c' => {'d' => ['e', 'f']} })
         end
-      
+
         describe "for request with url encoded body" do
-      
+
           it "should match request if hash matches body" do
             http_request(
               :post, "http://www.example.com/",
               :body => 'a=1&c[d][]=e&c[d][]=f&b=five').status.should == "200"
           end
-        
+
           it "should match request if hash matches body in different order of params" do
             http_request(
               :post, "http://www.example.com/",
               :body => 'a=1&c[d][]=e&b=five&c[d][]=f').status.should == "200"
           end
-        
+
           it "should not match if hash doesn't match url encoded body" do
             lambda {
               http_request(
@@ -257,47 +283,64 @@ shared_examples_for "WebMock" do
                 :body => 'c[d][]=f&a=1&c[d][]=e').status.should == "200"
             }.should raise_error(WebMock::NetConnectNotAllowedError, %r(Real HTTP connections are disabled. Unregistered request: POST http://www.example.com/ with body 'c\[d\]\[\]=f&a=1&c\[d\]\[\]=e'))
           end
-        
+
         end
-        
-        
+
+
         describe "for request with json body and content type is set to json" do
-          
+
           it "should match if hash matches body" do
             http_request(
               :post, "http://www.example.com/", :headers => {'Content-Type' => 'application/json'},
               :body => "{\"a\":\"1\",\"c\":{\"d\":[\"e\",\"f\"]},\"b\":\"five\"}").status.should == "200"
           end
-        
+
           it "should match if hash matches body in different form" do
             http_request(
               :post, "http://www.example.com/", :headers => {'Content-Type' => 'application/json'},
               :body => "{\"a\":\"1\",\"b\":\"five\",\"c\":{\"d\":[\"e\",\"f\"]}}").status.should == "200"
           end
-        
+
+          it "should match if hash contains date string" do #Crack creates date object
+            WebMock.reset!
+            stub_http_request(:post, "www.example.com").
+              with(:body => {"foo" => "2010-01-01"})
+            http_request(
+              :post, "http://www.example.com/", :headers => {'Content-Type' => 'application/json'},
+              :body => "{\"foo\":\"2010-01-01\"}").status.should == "200"
+          end
         end
-        
+
         describe "for request with xml body and content type is set to xml" do
           before(:each) do
             WebMock.reset!
             stub_http_request(:post, "www.example.com").
               with(:body => { "opt" => {:a => '1', :b => 'five', 'c' => {'d' => ['e', 'f']} }})
           end
-        
+
           it "should match if hash matches body" do
             http_request(
-              :post, "http://www.example.com/", :headers => {'Content-Type' => 'application/xml'}, 
+              :post, "http://www.example.com/", :headers => {'Content-Type' => 'application/xml'},
               :body => "<opt a=\"1\" b=\"five\">\n  <c>\n    <d>e</d>\n    <d>f</d>\n  </c>\n</opt>\n").status.should == "200"
           end
-        
+
           it "should match if hash matches body in different form" do
             http_request(
-              :post, "http://www.example.com/", :headers => {'Content-Type' => 'application/xml'}, 
+              :post, "http://www.example.com/", :headers => {'Content-Type' => 'application/xml'},
               :body => "<opt b=\"five\" a=\"1\">\n  <c>\n    <d>e</d>\n    <d>f</d>\n  </c>\n</opt>\n").status.should == "200"
           end
-        
+
+          it "should match if hash contains date string" do #Crack creates date object
+            WebMock.reset!
+            stub_http_request(:post, "www.example.com").
+              with(:body => {"opt" => {"foo" => "2010-01-01"}})
+            http_request(
+              :post, "http://www.example.com/", :headers => {'Content-Type' => 'application/xml'},
+              :body => "<opt foo=\"2010-01-01\">\n</opt>\n").status.should == "200"
+          end
+
         end
-      
+
       end
 
     end
@@ -310,30 +353,30 @@ shared_examples_for "WebMock" do
           :get, "http://www.example.com/",
           :headers => SAMPLE_HEADERS).status.should == "200"
       end
-      
+
       it "should match requests if headers are the same and declared as array" do
         stub_http_request(:get, "www.example.com").with(:headers => {"a" => ["b"]} )
         http_request(
           :get, "http://www.example.com/",
           :headers => {"a" => "b"}).status.should == "200"
       end
-      
+
       describe "when multiple headers with the same key are used" do
-      
+
         it "should match requests if headers are the same" do
           stub_http_request(:get, "www.example.com").with(:headers => {"a" => ["b", "c"]} )
           http_request(
             :get, "http://www.example.com/",
             :headers => {"a" => ["b", "c"]}).status.should == "200"
         end
-      
+
         it "should match requests if headers are the same  but in different order" do
           stub_http_request(:get, "www.example.com").with(:headers => {"a" => ["b", "c"]} )
           http_request(
             :get, "http://www.example.com/",
             :headers => {"a" => ["c", "b"]}).status.should == "200"
         end
-        
+
         it "should not match requests if headers are different" do
           stub_http_request(:get, "www.example.com").with(:headers => {"a" => ["b", "c"]})
 
@@ -343,7 +386,7 @@ shared_examples_for "WebMock" do
             :headers => {"a" => ["b", "d"]})
           }.should raise_error(WebMock::NetConnectNotAllowedError, %r(Real HTTP connections are disabled. Unregistered request: GET http://www.example.com/ with headers))
         end
-      
+
       end
 
       it "should match requests if request headers are not stubbed" do
@@ -376,19 +419,19 @@ shared_examples_for "WebMock" do
       describe "with regular expressions" do
 
         it "should match requests if header values match regular expression" do
-          stub_http_request(:get, "www.example.com").with(:headers => { :user_agent => /^MyAppName$/ })
+          stub_http_request(:get, "www.example.com").with(:headers => { :some_header => /^MyAppName$/ })
           http_request(
             :get, "http://www.example.com/",
-            :headers => { 'user-agent' => 'MyAppName' }).status.should == "200"
+            :headers => { 'some-header' => 'MyAppName' }).status.should == "200"
         end
 
         it "should not match requests if headers values do not match regular expression" do
-          stub_http_request(:get, "www.example.com").with(:headers => { :user_agent => /^MyAppName$/ })
+          stub_http_request(:get, "www.example.com").with(:headers => { :some_header => /^MyAppName$/ })
 
           lambda {
             http_request(
               :get, "http://www.example.com/",
-            :headers => { 'user-agent' => 'xMyAppName' })
+            :headers => { 'some-header' => 'xMyAppName' })
           }.should raise_error(WebMock::NetConnectNotAllowedError, %r(Real HTTP connections are disabled. Unregistered request: GET http://www.example.com/ with headers))
         end
 
@@ -461,14 +504,14 @@ shared_examples_for "WebMock" do
           http_request(:get, "http://www.example.com/")
         }.should raise_error(MyException, "Exception from WebMock")
       end
-      
+
       it "should raise exception if declared in a stubbed response as exception instance" do
         stub_http_request(:get, "www.example.com").to_raise(MyException.new("hello world"))
         lambda {
           http_request(:get, "http://www.example.com/")
         }.should raise_error(MyException, "hello world")
       end
-      
+
       it "should raise exception if declared in a stubbed response as exception instance" do
         stub_http_request(:get, "www.example.com").to_raise("hello world")
         lambda {
@@ -488,7 +531,7 @@ shared_examples_for "WebMock" do
 
 
    describe "raising timeout errors" do
-          
+
         it "should raise timeout exception if declared in a stubbed response" do
           stub_http_request(:get, "www.example.com").to_timeout
           lambda {
@@ -518,7 +561,7 @@ shared_examples_for "WebMock" do
           response = http_request(:get, "http://www.example.com/")
           response.headers["Content-Length"].should == "8888"
         end
-        
+
         it "should return declared headers when there are multiple headers with the same key" do
           stub_http_request(:get, "www.example.com").to_return(:headers => {"a" => ["b", "c"]})
           response = http_request(:get, "http://www.example.com/")
@@ -529,21 +572,29 @@ shared_examples_for "WebMock" do
           stub_http_request(:get, "www.example.com").to_return(:status => 500)
           http_request(:get, "http://www.example.com/").status.should == "500"
         end
-        
+
         it "should return declared status message" do
           stub_http_request(:get, "www.example.com").to_return(:status => [500, "Internal Server Error"])
-          http_request(:get, "http://www.example.com/").message.should == "Internal Server Error"
+          response = http_request(:get, "http://www.example.com/")
+          # not supported by em-http-request, it always returns "unknown" for http_reason
+          unless http_library == :em_http_request
+            response.message.should == "Internal Server Error"
+          end
         end
-        
+
         it "should return default status code" do
           stub_http_request(:get, "www.example.com")
           http_request(:get, "http://www.example.com/").status.should == "200"
         end
-        
+
         it "should return default empty message" do
           stub_http_request(:get, "www.example.com")
-          http_request(:get, "http://www.example.com/").message.should == ""
-        end      
+          response = http_request(:get, "http://www.example.com/")
+          # not supported by em-http-request, it always returns "unknown" for http_reason
+          unless http_library == :em_http_request
+            response.message.should == ""
+          end
+        end
 
         it "should return body declared as IO" do
           stub_http_request(:get, "www.example.com").to_return(:body => File.new(__FILE__))
@@ -625,22 +676,25 @@ shared_examples_for "WebMock" do
             @response.headers.should == {
               "Date"=>"Sat, 23 Jan 2010 01:01:05 GMT",
               "Content-Type"=>"text/html; charset=UTF-8",
-              "Content-Length"=>"438",
+              "Content-Length"=>"419",
               "Connection"=>"Keep-Alive",
               "Accept"=>"image/jpeg, image/png"
               }
           end
 
           it "should return recorded body" do
-            @response.body.size.should == 438
+            @response.body.size.should == 419
           end
 
           it "should return recorded status" do
             @response.status.should == "202"
           end
-          
+
           it "should return recorded status message" do
-            @response.message.should == "OK"
+            # not supported by em-http-request, it always returns "unknown" for http_reason
+            unless http_library == :em_http_request
+              @response.message.should == "OK"
+            end
           end
 
           it "should ensure file is closed" do
@@ -661,22 +715,25 @@ shared_examples_for "WebMock" do
             @response.headers.should == {
               "Date"=>"Sat, 23 Jan 2010 01:01:05 GMT",
               "Content-Type"=>"text/html; charset=UTF-8",
-              "Content-Length"=>"438",
+              "Content-Length"=>"419",
               "Connection"=>"Keep-Alive",
               "Accept"=>"image/jpeg, image/png"
               }
           end
 
           it "should return recorded body" do
-            @response.body.size.should == 438
+            @response.body.size.should == 419
           end
 
           it "should return recorded status" do
             @response.status.should == "202"
           end
-          
+
           it "should return recorded status message" do
-            @response.message.should == "OK"
+            # not supported by em-http-request, it always returns "unknown" for http_reason
+            unless http_library == :em_http_request
+              @response.message.should == "OK"
+            end
           end
         end
 
@@ -689,18 +746,26 @@ shared_examples_for "WebMock" do
 
           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
+            http_request(:get, "http://www.example.com/").body.size.should == 419
           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
+            http_request(:get, "http://www.example.com/").body.size.should == 419
+          end
+        end
+
+        describe "rack responses" do
+          before(:each) do
+            stub_request(:any, "http://www.example.com/greet").to_rack(MyRackApp)
           end
 
+          it "should return response returned by rack app" do
+            http_request(:post, 'http://www.example.com/greet', :body => 'name=Jimmy').body.should == 'Good to meet you, Jimmy!'
+          end
         end
 
         describe "sequences of responses" do
-
           it "should return responses one by one if declared in array" do
             stub_http_request(:get, "www.example.com").to_return([ {:body => "1"}, {:body => "2"}, {:body => "3"} ])
             http_request(:get, "http://www.example.com/").body.should == "1"
@@ -870,7 +935,7 @@ shared_examples_for "WebMock" do
                   a_request(:get, "http://www.example.com").should_not have_been_made
                 }.should fail_with(%r(The request GET http://www.example.com/ was expected to execute 0 times but it executed 1 time))
               end
-              
+
               it "should fail with message with executed requests listed" do
                 lambda {
                   http_request(:get, "http://www.example.com/")
@@ -960,14 +1025,14 @@ shared_examples_for "WebMock" do
                     a_request(:get, /.*example.*/).should have_been_made
                   }.should_not raise_error
                 end
-                
+
               end
 
               describe "when matching requests with query params" do
                 before(:each) do
                   stub_http_request(:any, /.*example.*/)
                 end
-              
+
                 it "should pass if the request was executed with query params declared in a hash in query option" do
                   lambda {
                     http_request(:get, "http://www.example.com/?a[]=b&a[]=c")
@@ -988,7 +1053,7 @@ shared_examples_for "WebMock" do
                     a_request(:get, "www.example.com/?x=3").with(:query => {"a" => ["b", "c"]}).should have_been_made
                   }.should_not raise_error
                 end
-              
+
               end
 
               it "should fail if requested more times than expected" do
@@ -1039,27 +1104,27 @@ shared_examples_for "WebMock" do
 
                 it "should fail if request was executed with different body" do
                   lambda {
-                    http_request(:get, "http://www.example.com/", :body => /^abc/)
+                    http_request(:get, "http://www.example.com/", :body => "abc")
                     a_request(:get, "www.example.com").
-                    with(:body => "xabc").should have_been_made
-                  }.should fail_with(%r(The request GET http://www.example.com/ with body "xabc" was expected to execute 1 time but it executed 0 times))
+                    with(:body => /^xabc/).should have_been_made
+                  }.should fail_with(%r(The request GET http://www.example.com/ with body /\^xabc/ was expected to execute 1 time but it executed 0 times))
                 end
-              
+
               end
-              
+
               describe "when expected body is declared as a hash" do
                 let(:body_hash) { {:a => '1', :b => 'five', 'c' => {'d' => ['e', 'f']}} }
                 let(:fail_message) {%r(The request POST http://www.example.com/ with body \{"a"=>"1", "b"=>"five", "c"=>\{"d"=>\["e", "f"\]\}\} was expected to execute 1 time but it executed 0 times)}
 
                 describe "when request is executed with url encoded body matching hash" do
-                
+
                   it "should succeed" do
                     lambda {
                       http_request(:post, "http://www.example.com/", :body => 'a=1&c[d][]=e&c[d][]=f&b=five')
                       a_request(:post, "www.example.com").with(:body => body_hash).should have_been_made
                     }.should_not raise_error
                   end
-                  
+
                   it "should succeed if url encoded params have different order" do
                     lambda {
                       http_request(:post, "http://www.example.com/", :body => 'a=1&c[d][]=e&b=five&c[d][]=f')
@@ -1073,7 +1138,7 @@ shared_examples_for "WebMock" do
                       a_request(:post, "www.example.com").with(:body => body_hash).should have_been_made
                     }.should fail_with(fail_message)
                   end
-                
+
                 end
 
                 describe "when request is executed with json body matching hash and content type is set to json" do
@@ -1085,7 +1150,7 @@ shared_examples_for "WebMock" do
                       a_request(:post, "www.example.com").with(:body => body_hash).should have_been_made
                     }.should_not raise_error
                   end
-                  
+
                   it "should succeed if json body is in different form" do
                     lambda {
                       http_request(:post, "http://www.example.com/", :headers => {'Content-Type' => 'application/json'},
@@ -1093,13 +1158,20 @@ shared_examples_for "WebMock" do
                       a_request(:post, "www.example.com").with(:body => body_hash).should have_been_made
                     }.should_not raise_error
                   end
-                
+
+                 it "should succeed if json body contains date string" do
+                    lambda {
+                      http_request(:post, "http://www.example.com/", :headers => {'Content-Type' => 'application/json'},
+                        :body => "{\"foo\":\"2010-01-01\"}")
+                      a_request(:post, "www.example.com").with(:body => {"foo" => "2010-01-01"}).should have_been_made
+                    }.should_not raise_error
+                 end
                 end
 
 
                 describe "when request is executed with xml body matching hash and content type is set to xml" do
                   let(:body_hash) { { "opt" => {:a => "1", :b => 'five', 'c' => {'d' => ['e', 'f']}} }}
-                  
+
                   it "should succeed" do
                     lambda {
                       http_request(:post, "http://www.example.com/", :headers => {'Content-Type' => 'application/xml'},
@@ -1107,7 +1179,7 @@ shared_examples_for "WebMock" do
                       a_request(:post, "www.example.com").with(:body => body_hash).should have_been_made
                     }.should_not raise_error
                   end
-                
+
                   it "should succeed if xml body is in different form" do
                     lambda {
                       http_request(:post, "http://www.example.com/", :headers => {'Content-Type' => 'application/xml'},
@@ -1115,9 +1187,17 @@ shared_examples_for "WebMock" do
                       a_request(:post, "www.example.com").with(:body => body_hash).should have_been_made
                     }.should_not raise_error
                   end
-              
+
+                  it "should succeed if xml body contains date string" do
+                    lambda {
+                      http_request(:post, "http://www.example.com/", :headers => {'Content-Type' => 'application/xml'},
+                        :body => "<opt foo=\"2010-01-01\">\n</opt>\n")
+                      a_request(:post, "www.example.com").with(:body => {"opt" => {"foo" => "2010-01-01"}}).should have_been_made
+                    }.should_not raise_error
+                  end
+
                 end
-                
+
               end
 
               it "should succeed if request was executed with the same headers" do
@@ -1127,7 +1207,7 @@ shared_examples_for "WebMock" do
                   with(:headers => SAMPLE_HEADERS).should have_been_made
                 }.should_not raise_error
               end
-              
+
                it "should succeed if request was executed with the same headers with value declared as array" do
                   lambda {
                     http_request(:get, "http://www.example.com/", :headers => {"a" => "b"})
@@ -1135,9 +1215,9 @@ shared_examples_for "WebMock" do
                     with(:headers => {"a" => ["b"]}).should have_been_made
                   }.should_not raise_error
                 end
-              
+
               describe "when multiple headers with the same key are passed" do
-                
+
                 it "should succeed if request was executed with the same headers" do
                   lambda {
                     http_request(:get, "http://www.example.com/", :headers => {"a" => ["b", "c"]})
@@ -1145,7 +1225,7 @@ shared_examples_for "WebMock" do
                     with(:headers =>  {"a" => ["b", "c"]}).should have_been_made
                   }.should_not raise_error
                 end
-                
+
                 it "should succeed if request was executed with the same headers but different order" do
                   lambda {
                     http_request(:get, "http://www.example.com/", :headers => {"a" => ["b", "c"]})
@@ -1153,7 +1233,7 @@ shared_examples_for "WebMock" do
                     with(:headers =>  {"a" => ["c", "b"]}).should have_been_made
                   }.should_not raise_error
                 end
-                
+
                 it "should fail if request was executed with different headers" do
                   lambda {
                     http_request(:get, "http://www.example.com/", :headers => {"a" => ["b", "c"]})
@@ -1161,7 +1241,7 @@ shared_examples_for "WebMock" do
                     with(:headers => {"a" => ["b", "d"]}).should have_been_made
                   }.should fail_with(%r(The request GET http://www.example.com/ with headers \{'A'=>\['b', 'd'\]\} was expected to execute 1 time but it executed 0 times))
                 end
-                
+
               end
 
               it "should fail if request was executed with different headers" do
@@ -1202,18 +1282,18 @@ shared_examples_for "WebMock" do
 
               it "should succeed if request was executed with headers matching regular expressions" do
                 lambda {
-                  http_request(:get, "http://www.example.com/", :headers => { 'user-agent' => 'MyAppName' })
+                  http_request(:get, "http://www.example.com/", :headers => { 'some-header' => 'MyAppName' })
                   a_request(:get, "www.example.com").
-                  with(:headers => { :user_agent => /^MyAppName$/ }).should have_been_made
+                  with(:headers => { :some_header => /^MyAppName$/ }).should have_been_made
                 }.should_not raise_error
               end
 
               it "should fail if request was executed with headers not matching regular expression" do
                 lambda {
-                  http_request(:get, "http://www.example.com/", :headers => { 'user_agent' => 'xMyAppName' })
+                  http_request(:get, "http://www.example.com/", :headers => { 'some-header' => 'xMyAppName' })
                   a_request(:get, "www.example.com").
-                  with(:headers => { :user_agent => /^MyAppName$/ }).should have_been_made
-                }.should fail_with(%r(The request GET http://www.example.com/ with headers \{'User-Agent'=>/\^MyAppName\$/\} was expected to execute 1 time but it executed 0 times))
+                  with(:headers => { :some_header => /^MyAppName$/ }).should have_been_made
+                }.should fail_with(%r(The request GET http://www.example.com/ with headers \{'Some-Header'=>/\^MyAppName\$/\} was expected to execute 1 time but it executed 0 times))
               end
 
              it "should suceed if request was executed and block evaluated to true" do
@@ -1376,13 +1456,66 @@ shared_examples_for "WebMock" do
             end
 
 
+            describe "using matchers on the RequestStub" do
+
+              it "should verify expected requests occured" do
+                stub = stub_request(:get, "http://www.example.com/")
+                http_request(:get, "http://www.example.com/")
+                stub.should have_been_requested.once
+              end
+
+              it "should verify subsequent requests" do
+                stub = stub_request(:get, "http://www.example.com/")
+                http_request(:get, "http://www.example.com/")
+                stub.should have_been_requested.once
+                http_request(:get, "http://www.example.com/")
+                stub.should have_been_requested.twice
+              end
+
+              it "should verify expected requests occured" do
+                stub = stub_request(:post, "http://www.example.com").with(:body => "abc", :headers => {'A' => 'a'})
+                http_request(:post, "http://www.example.com/", :body => "abc", :headers => {'A' => 'a'})
+                stub.should have_been_requested.once
+              end
+
+              it "should verify that non expected requests didn't occur" do
+                lambda {
+                  stub = stub_request(:get, "http://www.example.com")
+                  http_request(:get, "http://www.example.com/")
+                  stub.should_not have_been_requested
+                }.should fail_with(%r(The request GET http://www.example.com/ was expected to execute 0 times but it executed 1 time))
+              end
+
+              it "should verify if non expected request executed and block evaluated to true" do
+                 lambda {
+                   stub = stub_request(:post, "www.example.com").with { |req| req.body == "wadus" }
+                   http_request(:post, "http://www.example.com/", :body => "wadus")
+                   stub.should_not have_been_requested
+                 }.should fail_with(%r(The request POST http://www.example.com/ with given block was expected to execute 0 times but it executed 1 time))
+               end
+
+              it "should verify if request was executed and block evaluated to true" do
+                stub = stub_request(:post, "www.example.com").with { |req| req.body == "wadus" }
+                http_request(:post, "http://www.example.com/", :body => "wadus")
+                stub.should have_been_requested
+              end
+
+              it "should verify if request was executed and block evaluated to false" do
+                lambda {
+                  stub_request(:any, /.+/) #stub any request
+                  stub = stub_request(:post, "www.example.com").with { |req| req.body == "wadus" }
+                  http_request(:post, "http://www.example.com/", :body => "abc")
+                  stub.should have_been_requested
+                }.should fail_with(%r(The request POST http://www.example.com/ with given block was expected to execute 1 time but it executed 0 times))
+              end
+            end
+
             describe "when net connect allowed", :net_connect => true do
               before(:each) do
                 WebMock.allow_net_connect!
               end
 
               it "should verify expected requests occured" do
-                setup_expectations_for_real_example_com_request
                 lambda {
                   http_request(:get, "http://www.example.com/")
                   a_request(:get, "http://www.example.com").should have_been_made
@@ -1401,20 +1534,20 @@ shared_examples_for "WebMock" do
 
 
   describe "callbacks" do
-    
+
     describe "after_request" do
       before(:each) do
         WebMock.reset_callbacks
         stub_request(:get, "http://www.example.com")
       end
-  
+
       it "should not invoke callback unless request is made" do
         WebMock.after_request {
           @called = true
         }
         @called.should == nil
       end
-  
+
       it "should invoke a callback after request is made" do
         WebMock.after_request {
           @called = true
@@ -1422,7 +1555,7 @@ shared_examples_for "WebMock" do
         http_request(:get, "http://www.example.com/")
         @called.should == true
       end
-    
+
       it "should not invoke a callback if specific http library should be ignored" do
         WebMock.after_request(:except => [http_library()]) {
           @called = true
@@ -1430,7 +1563,7 @@ shared_examples_for "WebMock" do
         http_request(:get, "http://www.example.com/")
         @called.should == nil
       end
-  
+
       it "should invoke a callback even if other http libraries should be ignored" do
         WebMock.after_request(:except => [:other_lib]) {
           @called = true
@@ -1438,7 +1571,7 @@ shared_examples_for "WebMock" do
         http_request(:get, "http://www.example.com/")
         @called.should == true
       end
-  
+
       it "should pass request signature to the callback" do
         WebMock.after_request(:except => [:other_lib])  do |request_signature, _|
           @request_signature = request_signature
@@ -1446,7 +1579,7 @@ shared_examples_for "WebMock" do
         http_request(:get, "http://www.example.com/")
         @request_signature.uri.to_s.should == "http://www.example.com:80/"
       end
-      
+
       describe "passing response to callback" do
 
         describe "for stubbed requests" do
@@ -1463,23 +1596,23 @@ shared_examples_for "WebMock" do
             http_request(:get, "http://www.example.com/")
           end
 
-          it "should pass response with status and message" do            
+          it "should pass response with status and message" do
             @response.status.should == ["200", "hello"]
           end
-        
+
           it "should pass response with headers" do
             @response.headers.should == {
-              'Content-Length' => '666', 
+              'Content-Length' => '666',
               'Hello' => 'World'
             }
           end
-        
+
           it "should pass response with body" do
             @response.body.should == "foo bar"
           end
-      
+
         end
-        
+
         describe "for real requests", :net_connect => true do
           before(:each) do
             WebMock.reset!
@@ -1491,29 +1624,32 @@ shared_examples_for "WebMock" do
           end
 
           it "should pass response with status and message" do
-            @response.status[0].should == 302
-            @response.status[1].should == "Found"
+            # not supported by em-http-request, it always returns "unknown" for http_reason
+            unless http_library == :em_http_request
+              @response.status[0].should == 302
+              @response.status[1].should == "Found"
+            end
           end
-        
+
           it "should pass response with headers" do
-            @response.headers["Content-Length"].should == "#{WWW_EXAMPLE_COM_CONTENT_LENGTH}"
+            @response.headers["Content-Length"].should == "0"
           end
-        
+
           it "should pass response with body" do
-            @response.body.size.should == WWW_EXAMPLE_COM_CONTENT_LENGTH
+            @response.body.size.should == 0
           end
-      
+
         end
-      
+
       end
-  
+
       it "should invoke multiple callbacks in order of their declarations" do
         WebMock.after_request { @called = 1 }
         WebMock.after_request { @called += 1 }
         http_request(:get, "http://www.example.com/")
         @called.should == 2
       end
-      
+
       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/")
@@ -1522,17 +1658,113 @@ shared_examples_for "WebMock" do
         http_request(:get, "http://www.example.net/")
         @called.should == true
       end
-      
+
       it "should clear all declared callbacks on reset callbacks" do
         WebMock.after_request { @called = 1 }
         WebMock.reset_callbacks
-        stub_request(:get, "http://www.example.com")        
+        stub_request(:get, "http://www.example.com/")
         http_request(:get, "http://www.example.com/")
         @called.should == nil
       end
-      
     end
-  
   end
 
+  describe "enabling and disabling webmock" do
+    describe "when webmock is disabled" do
+      before(:each) do
+        WebMock.disable!
+      end
+      after(:each) do
+        WebMock.enable!
+      end
+      it_should_behave_like "disabled WebMock"
+    end
+
+    describe "when webmock is enabled again" do
+      before(:each) do
+        WebMock.disable!
+        WebMock.enable!
+      end
+      it_should_behave_like "enabled WebMock"
+    end
+
+    describe "when webmock is disabled except this lib" do
+      before(:each) do
+        WebMock.disable!(:except => [http_library])
+      end
+      after(:each) do
+        WebMock.enable!
+      end
+      it_should_behave_like "enabled WebMock"
+    end
+
+    describe "when webmock is enabled except this lib" do
+      before(:each) do
+        WebMock.disable!
+        WebMock.enable!(:except => [http_library])
+      end
+      after(:each) do
+        WebMock.enable!
+      end
+      it_should_behave_like "disabled WebMock"
+    end
+  end
+end
+
+shared_examples_for "disabled WebMock" do
+
+  it "should not register executed requests" do
+    http_request(:get, "http://www.example.com/")
+    a_request(:get, "http://www.example.com/").should_not have_been_made
+  end
+
+  it "should not block unstubbed requests" do
+    lambda {
+      http_request(:get, "http://www.example.com/")
+    }.should_not raise_error
+  end
+
+  it "should return real response even if there are stubs" do
+    stub_request(:get, /.*/).to_return(:body => "x")
+    http_request(:get, "http://www.example.com/").
+      status.should == "302"
+  end
+
+  it "should not invoke any callbacks" do
+    WebMock.reset_callbacks
+    stub_request(:get, "http://www.example.com/")
+    @called = nil
+    WebMock.after_request { @called = 1 }
+    http_request(:get, "http://www.example.com/")
+    @called.should == nil
+  end
 end
+
+shared_examples_for "enabled WebMock" do
+  it "should register executed requests" do
+    WebMock.allow_net_connect!
+    http_request(:get, "http://www.example.com/")
+    a_request(:get, "http://www.example.com/").should have_been_made
+  end
+
+  it "should block unstubbed requests" do
+    lambda {
+      http_request(:get, "http://www.example.com/")
+    }.should raise_error(WebMock::NetConnectNotAllowedError)
+  end
+
+  it "should return stubbed response" do
+    stub_request(:get, /.*/).to_return(:body => "x")
+    http_request(:get, "http://www.example.com/").body.should == "x"
+  end
+
+  it "should invoke callbacks" do
+    WebMock.allow_net_connect!
+    WebMock.reset_callbacks
+    @called = nil
+    WebMock.after_request { @called = 1 }
+    http_request(:get, "http://www.example.com/")
+    @called.should == 1
+  end
+end
+