webmock 1.6.4 → 1.7.0

data/Gemfile

@@ -1,2 +1,17 @@
-source "http://rubygems.org/"
+source 'http://rubygems.org/'
+
 gemspec
+
+group :development do
+  gem 'rake'
+  gem 'guard-rspec'
+  gem 'rb-fsevent'
+end
+
+group :test do
+  gem 'rack'
+end
+
+platforms :jruby do
+  gem 'jruby-openssl', '~> 0.7'
+end

data/Guardfile

@@ -0,0 +1,24 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+# rubies = %w[
+#   1.8.6
+#   1.8.7
+#   1.9.2
+#   ree
+#   jruby
+# ].map { |ruby| "#{ruby}@webmock" }
+
+rspec_options = {
+  # :rvm          => rubies,
+  :all_on_start => false,
+  :notification => false,
+  :cli          => '--color',
+  :version      => 2
+}
+
+guard 'rspec', rspec_options do
+  watch(%r{^spec/.+_spec\.rb})
+  watch(%r{^lib/(.+)\.rb})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb') { "spec" }
+end

data/LICENSE

@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,14 +1,8 @@
-WebMock
+WebMock [![Build Status](https://secure.travis-ci.org/bblimke/webmock.png)](http://travis-ci.org/bblimke/webmock)
 =======
 
 Library for stubbing and setting expectations on HTTP requests in Ruby.
 
-WebMock is looking for a maintainer
-===================================
-
-I'm not able to maintain WebMock until end of June 2011.
-If anyone is interested in maintaining it in the meantime (at least handling pull requests and creating patch releases), please get in touch.
-
 Features
 --------
 
@@ -19,6 +13,7 @@ Features
 * Smart matching of the same headers in different representations.
 * Support for Test::Unit
 * Support for RSpec 1.x and RSpec 2.x
+* Support for MiniTest
 
 Supported HTTP libraries
 ------------------------
@@ -28,6 +23,18 @@ Supported HTTP libraries
 * Patron
 * EM-HTTP-Request
 * Curb (currently only Curb::Easy)
+* Typhoeus (currently only Typhoeus::Hydra)
+
+Supported Ruby Interpreters
+---------------------------
+
+* MRI 1.8.6
+* MRI 1.8.7
+* MRI 1.9.1
+* MRI 1.9.2
+* MRI 1.9.3-preview1
+* REE 1.8.7
+* JRuby
 
 ##Installation
 
@@ -51,6 +58,12 @@ Add the following code to `spec/spec_helper`:
 
     require 'webmock/rspec'
 
+### MiniTest
+
+Add the following code to `test/test_helper`:
+
+    require 'webmock/minitest'
+
 ### Cucumber
 
 Add the following code to `features/support/env.rb`
@@ -219,6 +232,18 @@ You can also use WebMock outside a test framework:
 
     RestClient.post('www.example.net', 'abc')    # ===> "abc\n"
 
+### Rack responses
+
+    class MyRackApp
+      def self.call(env)
+        [200, {}, ["Hello"]]
+      end
+    end
+
+    stub_request(:get, "www.example.com").to_rack(MyRackApp)
+
+    RestClient.post('www.example.com')    # ===> "Hello"
+
 ### Raising errors
 
 #### Exception declared by class
@@ -294,13 +319,15 @@ You can also use WebMock outside a test framework:
 
     Net::HTTP.get('localhost:9887', '/')      # ===> Allowed. Perhaps to Selenium?
 
-### External requests can be disabled while allowing any hostname
+### External requests can be disabled while allowing any hostname or port
 
-    WebMock.disable_net_connect!(:allow => "www.example.org")
+    WebMock.disable_net_connect!(:allow => "www.example.org:8080")
 
-    Net::HTTP.get('www.something.com', '/')   # ===> Failure
+    RestClient.get('www.something.com', '/')   # ===> Failure
+
+    RestClient.get('www.example.org', '/')     # ===> Failure.
 
-    Net::HTTP.get('www.example.org', '/')      # ===> Allowed.
+    RestClient.get('www.example.org:8080', '/')     # ===> Allowed
 
 ## Connecting on Net::HTTP.start
 
@@ -351,7 +378,7 @@ This forces WebMock Net::HTTP adapter to always connect on `Net::HTTP.start`.
     assert_requested :get, "http://www.example.com"    # ===> Success
 
 
-### Setting expectations in RSpec
+### Setting expectations in RSpec on `WebMock` module
  This style is borrowed from [fakeweb-matcher](http://github.com/freelancing-god/fakeweb-matcher)
 
     require 'webmock/rspec'
@@ -365,9 +392,9 @@ This forces WebMock Net::HTTP adapter to always connect on `Net::HTTP.start`.
     WebMock.should have_requested(:get, "www.example.com").with(:query => {"a" => ["b", "c"]})
 
     WebMock.should have_requested(:get, "www.example.com").
-      with(:body => {"a" => ["b", "c"]}, :headers => 'Content-Type' => 'application/json')
+      with(:body => {"a" => ["b", "c"]}, :headers => {'Content-Type' => 'application/json'})
 
-### Different way of setting expectations in RSpec
+### Setting expectations in RSpec with `a_request`
 
     a_request(:post, "www.example.com").with(:body => "abc", :headers => {'Content-Length' => 3}).should have_been_made.once
 
@@ -380,7 +407,13 @@ This forces WebMock Net::HTTP adapter to always connect on `Net::HTTP.start`.
     a_request(:get, "www.example.com").with(:query => {"a" => ["b", "c"]}).should have_been_made
 
     a_request(:post, "www.example.com").
-      with(:body => {"a" => ["b", "c"]}, :headers => 'Content-Type' => 'application/json').should have_been_made
+      with(:body => {"a" => ["b", "c"]}, :headers => {'Content-Type' => 'application/json'}).should have_been_made
+
+### Setting expectations in RSpec on the stub
+
+    stub = stub_request(:get, "www.example.com")
+    # ... make requests ...
+    stub.should have_been_requested
 
 ## Clearing stubs and request history
 
@@ -396,6 +429,13 @@ If you want to reset all current stubs and history of requests use `WebMock.rese
 
     assert_not_requested :get, "www.example.com"    # ===> Success
 
+## Disabling and enabling WebMock or only some http client adapters
+
+    WebMock.disable!                         #disable WebMock (all adapters)
+    WebMock.disable!(:except => [:net_http]) #disable WebMock for all libs except Net::HTTP
+    WebMock.enable!                          #enable WebMock (all adapters)
+    WebMock.enable!(:except => [:patron])    #enable WebMock for all libs except Patron
+
 
 ## Matching requests
 
@@ -597,6 +637,15 @@ People who submitted patches and new features or suggested improvements. Many th
 * Alastair Brunton
 * Sam Stokes
 * Eugene Bolshakov
+* James Conroy-Finn
+* Salvador Fuentes Jr
+* Alex Rothenberg
+* Aidan Feldman
+* Steve Hull
+* Jay Adkisson
+* Zach Dennis
+* Nikita Fedyashev
+* Lin Jen-Shin
 
 For a full list of contributors you can visit the
 [contributors](https://github.com/bblimke/webmock/contributors) page.

data/Rakefile

@@ -1,9 +1,11 @@
+#!/usr/bin/env rake
+
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
-namespace :spec do
+namespace :rvm do
   desc 'Run specs against 1.8.6, REE, 1.8.7, 1.9.2 and jRuby'
-  task :rubies do
+  task :specs do
     # JCF: I'd love to be able to use RVM's `rvm {rubies} specs` command but
     # the require tests in spec/other_net_http_libs_spec.rb break when doing
     # so.
@@ -13,11 +15,16 @@ namespace :spec do
 end
 
 require "rspec/core/rake_task"
-RSpec::Core::RakeTask.new do |t|
+RSpec::Core::RakeTask.new(:spec) do |t|
   t.rspec_opts = ["-c", "-f progress", "-r ./spec/spec_helper.rb"]
   t.pattern = 'spec/**/*_spec.rb'
 end
 
+RSpec::Core::RakeTask.new(:spec_http_without_webmock) do |t|
+  t.rspec_opts = ["-c", "-f progress", "-r ./spec/real_net_http_spec.rb"]
+  t.pattern = 'spec/real_net_http_spec.rb'
+end
+
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.test_files = FileList["test/**/*.rb"].exclude("test/test_helper.rb")
@@ -25,10 +32,16 @@ Rake::TestTask.new(:test) do |test|
   test.warning = false
 end
 
-task :default => [:spec, :test]
+Rake::TestTask.new(:minitest) do |test|
+  test.test_files = FileList["minitest/**/*.rb"].exclude("test/test_helper.rb")
+  test.verbose = false
+  test.warning = false
+end
+
+task :default => [:spec, :spec_http_without_webmock, :test, :minitest]
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
+require 'rdoc/task'
+RDoc::Task.new do |rdoc|
   $:.push File.expand_path('../lib', __FILE__)
   require 'webmock/version'
 

data/lib/webmock.rb

@@ -6,11 +6,14 @@ require 'crack'
 require 'webmock/deprecation'
 require 'webmock/version'
 
+require 'webmock/http_lib_adapters/http_lib_adapter_registry'
+require 'webmock/http_lib_adapters/http_lib_adapter'
 require 'webmock/http_lib_adapters/net_http'
-require 'webmock/http_lib_adapters/httpclient'
-require 'webmock/http_lib_adapters/patron'
-require 'webmock/http_lib_adapters/curb'
-require 'webmock/http_lib_adapters/em_http_request'
+require 'webmock/http_lib_adapters/httpclient_adapter'
+require 'webmock/http_lib_adapters/patron_adapter'
+require 'webmock/http_lib_adapters/curb_adapter'
+require 'webmock/http_lib_adapters/em_http_request_adapter'
+require 'webmock/http_lib_adapters/typhoeus_hydra_adapter'
 
 require 'webmock/errors'
 
@@ -18,12 +21,14 @@ require 'webmock/util/uri'
 require 'webmock/util/headers'
 require 'webmock/util/hash_counter'
 require 'webmock/util/hash_keys_stringifier'
+require 'webmock/util/json'
 
 require 'webmock/request_pattern'
 require 'webmock/request_signature'
 require 'webmock/responses_sequence'
 require 'webmock/request_stub'
 require 'webmock/response'
+require 'webmock/rack_response'
 
 require 'webmock/stub_request_snippet'
 

data/lib/webmock/api.rb

@@ -1,9 +1,10 @@
 module WebMock
   module API
     extend self
-    
+
     def stub_request(method, uri)
-      WebMock::StubRegistry.instance.register_request_stub(WebMock::RequestStub.new(method, uri))
+      WebMock::StubRegistry.instance.
+        register_request_stub(WebMock::RequestStub.new(method, uri))
     end
 
     alias_method :stub_http_request, :stub_request
@@ -11,7 +12,7 @@ module WebMock
     def a_request(method, uri)
       WebMock::RequestPattern.new(method, uri)
     end
-    
+
     class << self
       alias :request :a_request
     end
@@ -29,4 +30,4 @@ module WebMock
       WebMock::AssertionFailure.failure(verifier.negative_failure_message) unless verifier.does_not_match?
     end
   end
-end
+end

data/lib/webmock/assertion_failure.rb

@@ -8,4 +8,4 @@ module WebMock
       end
     end
   end
-end
+end

data/lib/webmock/callback_registry.rb

@@ -26,7 +26,7 @@ module WebMock
     def self.reset
       @@callbacks = []
     end
-    
+
     def self.any_callbacks?
       !@@callbacks.empty?
     end

data/lib/webmock/config.rb

@@ -1,7 +1,7 @@
 module WebMock
-  class Config 
+  class Config
     include Singleton
-    
+
     attr_accessor :allow_net_connect
     attr_accessor :allow_localhost
     attr_accessor :allow

data/lib/webmock/cucumber.rb

@@ -5,4 +5,4 @@ World(WebMock::API, WebMock::Matchers)
 
 After do
   WebMock.reset!
-end
+end

data/lib/webmock/errors.rb

@@ -1,21 +1,33 @@
 module WebMock
-  
+
   class NetConnectNotAllowedError < StandardError
     def initialize(request_signature)
       text = "Real HTTP connections are disabled. Unregistered request: #{request_signature}"
+      text << "\n\n"
       text << stubbing_instructions(request_signature)
+      text << request_stubs
+      text << "\n\n" + "="*60
       super(text)
     end
 
     private
 
+    def request_stubs
+      return "" if WebMock::StubRegistry.instance.request_stubs.empty?
+      text = "\n\nregistered request stubs:\n"
+      WebMock::StubRegistry.instance.request_stubs.each do |stub|
+        text << "\n#{WebMock::StubRequestSnippet.new(stub).to_s(false)}"
+      end
+      text
+    end
+
     def stubbing_instructions(request_signature)
-      text = "\n\n"
+      text = ""
+      request_stub = RequestStub.from_request_signature(request_signature)
       text << "You can stub this request with the following snippet:\n\n"
-      text << WebMock::StubRequestSnippet.new(request_signature).to_s
-      text << "\n\n" + "="*60
+      text << WebMock::StubRequestSnippet.new(request_stub).to_s
       text
     end
   end
 
-end
+end

data/lib/webmock/http_lib_adapters/{curb.rb → curb_adapter.rb}

@@ -1,7 +1,57 @@
+begin
+  require 'curb'
+rescue LoadError
+  # curb not found
+end
+
 if defined?(Curl)
+  module WebMock
+    module HttpLibAdapters
+      class CurbAdapter < HttpLibAdapter
+        adapter_for :curb
+
+        OriginalCurlEasy = Curl::Easy unless const_defined?(:OriginalCurlEasy)
+
+        def self.enable!
+          Curl.send(:remove_const, :Easy)
+          Curl.send(:const_set, :Easy, Curl::WebMockCurlEasy)
+        end
+
+        def self.disable!
+          Curl.send(:remove_const, :Easy)
+          Curl.send(:const_set, :Easy, OriginalCurlEasy)
+        end
+
+        # Borrowed from Patron:
+        # http://github.com/toland/patron/blob/master/lib/patron/response.rb
+        def self.parse_header_string(header_string)
+          status, headers = nil, {}
+
+          header_string.split(/\r\n/).each do |header|
+            if header =~ %r|^HTTP/1.[01] \d\d\d (.*)|
+              status = $1
+            else
+              parts = header.split(':', 2)
+              unless parts.empty?
+                parts[1].strip! unless parts[1].nil?
+                if headers.has_key?(parts[0])
+                  headers[parts[0]] = [headers[parts[0]]] unless headers[parts[0]].kind_of? Array
+                  headers[parts[0]] << parts[1]
+                else
+                  headers[parts[0]] = parts[1]
+                end
+              end
+            end
+          end
+
+          return status, headers
+        end
+      end
+    end
+  end
 
   module Curl
-    class Easy
+    class WebMockCurlEasy < Curl::Easy
       def curb_or_webmock
         request_signature = build_request_signature
         WebMock::RequestRegistry.instance.requested_signatures.put(request_signature)
@@ -19,7 +69,7 @@ if defined?(Curl)
             webmock_response = build_webmock_response
             WebMock::CallbackRegistry.invoke_callbacks(
               {:lib => :curb, :real_request => true}, request_signature,
-                webmock_response)   
+                webmock_response)
           end
           res
         else
@@ -54,15 +104,15 @@ if defined?(Curl)
       end
 
       def build_curb_response(webmock_response)
-        raise Curl::Err::TimeoutError if webmock_response.should_timeout        
+        raise Curl::Err::TimeoutError if webmock_response.should_timeout
         webmock_response.raise_error_if_any
-        
+
         @body_str = webmock_response.body
         @response_code = webmock_response.status[0]
 
         @header_str = "HTTP/1.1 #{webmock_response.status[0]} #{webmock_response.status[1]}\r\n"
         if webmock_response.headers
-          @header_str << webmock_response.headers.map do |k,v| 
+          @header_str << webmock_response.headers.map do |k,v|
             "#{k}: #{v.is_a?(Array) ? v.join(", ") : v}"
           end.join("\r\n")
 
@@ -104,7 +154,8 @@ if defined?(Curl)
       end
 
       def build_webmock_response
-        status, headers = WebmockHelper.parse_header_string(self.header_str)
+        status, headers =
+         WebMock::HttpLibAdapters::CurbAdapter.parse_header_string(self.header_str)
 
         webmock_response = WebMock::Response.new
         webmock_response.status = [self.response_code, status]
@@ -115,7 +166,7 @@ if defined?(Curl)
 
       ###
       ### Mocks of Curl::Easy methods below here.
-      ### 
+      ###
 
       def http_with_webmock(method)
         @webmock_method = method
@@ -148,11 +199,11 @@ if defined?(Curl)
       alias_method :http_put_without_webmock, :http_put
       alias_method :http_put, :http_put_with_webmock
 
-      def http_post_with_webmock data = nil
+      def http_post_with_webmock *data
         @webmock_method = :post
-        @post_body = data if data
+        @post_body = data.join('&') if data && !data.empty?
         curb_or_webmock do
-          http_post_without_webmock(data)
+          http_post_without_webmock(*data)
         end
       end
       alias_method :http_post_without_webmock, :http_post
@@ -163,11 +214,11 @@ if defined?(Curl)
         @webmock_method ||= :get
         curb_or_webmock do
           perform_without_webmock
-        end 
+        end
       end
       alias :perform_without_webmock :perform
       alias :perform :perform_with_webmock
-      
+
       def put_data_with_webmock= data
         @webmock_method = :put
         @put_data = data
@@ -175,7 +226,7 @@ if defined?(Curl)
       end
       alias_method :put_data_without_webmock=, :put_data=
       alias_method :put_data=, :put_data_with_webmock=
-      
+
       def post_body_with_webmock= data
         @webmock_method = :post
         self.post_body_without_webmock = data
@@ -250,44 +301,23 @@ if defined?(Curl)
         METHOD
       end
 
-      %w[ put post ].each do |verb|
-        class_eval <<-METHOD, __FILE__, __LINE__
-          def self.http_#{verb}(url, data, &block)
-            c = new
-            c.url = url
-            block.call(c) if block
-            c.send("http_#{verb}", data)
-            c
-          end
-        METHOD
-      end
-  
-      module WebmockHelper
-        # Borrowed from Patron:
-        # http://github.com/toland/patron/blob/master/lib/patron/response.rb
-        def self.parse_header_string(header_string)
-          status, headers = nil, {}
-
-          header_string.split(/\r\n/).each do |header|
-            if header =~ %r|^HTTP/1.[01] \d\d\d (.*)|
-              status = $1
-            else
-              parts = header.split(':', 2)
-              unless parts.empty?
-                parts[1].strip! unless parts[1].nil?
-                if headers.has_key?(parts[0])
-                  headers[parts[0]] = [headers[parts[0]]] unless headers[parts[0]].kind_of? Array
-                  headers[parts[0]] << parts[1]
-                else
-                  headers[parts[0]] = parts[1]
-                end
-              end
-            end
-          end
+      class_eval <<-METHOD, __FILE__, __LINE__
+        def self.http_put(url, data, &block)
+          c = new
+          c.url = url
+          block.call(c) if block
+          c.send(:http_put, data)
+          c
+        end
 
-          return status, headers
+        def self.http_post(url, *data, &block)
+          c = new
+          c.url = url
+          block.call(c) if block
+          c.send(:http_post, *data)
+          c
         end
-      end
+      METHOD
     end
   end
 end