webmock 1.5.0 → 1.6.0

data/lib/webmock/request_signature.rb

@@ -2,7 +2,8 @@ module WebMock
 
   class RequestSignature
 
-    attr_accessor :method, :uri, :body, :headers
+    attr_accessor :method, :uri, :body
+    attr_reader :headers
 
     def initialize(method, uri, options = {})
       self.method = method
@@ -20,11 +21,23 @@ module WebMock
       string
     end
 
+    def headers=(headers)
+      @headers = WebMock::Util::Headers.normalize_headers(headers)
+    end
+
+    def hash
+      self.to_s.hash
+    end
+
+    def eql?(other)
+      self.to_s == other.to_s
+    end
+
     private
 
     def assign_options(options)
       self.body = options[:body] if options.has_key?(:body)
-      self.headers = WebMock::Util::Headers.normalize_headers(options[:headers]) if options.has_key?(:headers)
+      self.headers = options[:headers] if options.has_key?(:headers)
     end
 
   end

data/lib/webmock/rspec.rb

@@ -1 +1,32 @@
-require File.join(File.dirname(__FILE__), "adapters/rspec")
+require 'webmock'
+
+# RSpec 1.x and 2.x compatibility
+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
+  rescue LoadError
+    require 'spec'
+    RSPEC_NAMESPACE = Spec
+    RSPEC_CONFIGURER = Spec::Runner
+  end
+end
+
+require 'webmock/rspec/matchers'
+  
+RSPEC_CONFIGURER.configure { |config|
+
+  config.include WebMock::API
+  config.include WebMock::Matchers
+
+  config.after(:each) do
+    WebMock.reset!
+  end
+}
+
+WebMock::AssertionFailure.error_class = RSPEC_NAMESPACE::Expectations::ExpectationNotMetError

data/lib/webmock/{adapters/rspec → rspec}/matchers.rb

@@ -1,3 +1,7 @@
+require 'webmock'
+require 'webmock/rspec/matchers/request_pattern_matcher'
+require 'webmock/rspec/matchers/webmock_matcher'
+
 module WebMock
   module Matchers
     def have_been_made

data/lib/webmock/stub_registry.rb

@@ -0,0 +1,43 @@
+module WebMock
+
+  class StubRegistry
+    include Singleton
+
+    attr_accessor :request_stubs
+
+    def initialize
+      reset!
+    end
+
+    def reset!
+      self.request_stubs = []
+    end
+
+    def register_request_stub(stub)
+      request_stubs.insert(0, stub)
+      stub
+    end
+
+    def registered_request?(request_signature)
+      request_stub_for(request_signature)
+    end
+
+    def response_for_request(request_signature)
+      stub = request_stub_for(request_signature)
+      stub ? evaluate_response_for_request(stub.response, request_signature) : nil
+    end
+
+    private
+
+    def request_stub_for(request_signature)
+      request_stubs.detect { |registered_request_stub|
+        registered_request_stub.request_pattern.matches?(request_signature)
+      }
+    end
+
+    def evaluate_response_for_request(response, request_signature)
+      response.evaluate(request_signature)
+    end
+
+  end
+end

data/lib/webmock/stub_request_snippet.rb

@@ -0,0 +1,27 @@
+module WebMock
+  class StubRequestSnippet
+    def initialize(request_signature)
+      @request_signature = request_signature
+    end
+
+    def to_s
+      string = "stub_request(:#{@request_signature.method},"
+      string << " \"#{WebMock::Util::URI.strip_default_port_from_uri_string(@request_signature.uri.to_s)}\")"
+
+      with = ""
+
+      if (@request_signature.body.to_s != '')
+        with << ":body => #{@request_signature.body.inspect}"
+      end
+
+      if (@request_signature.headers && !@request_signature.headers.empty?)
+        with << ", \n       " unless with.empty?
+
+        with << ":headers => #{WebMock::Util::Headers.sorted_headers_string(@request_signature.headers)}"
+      end
+      string << ".\n  with(#{with})" unless with.empty?
+      string << ".\n  to_return(:status => 200, :body => \"\", :headers => {})"
+      string
+    end
+  end
+end

data/lib/webmock/test_unit.rb

@@ -1 +1,20 @@
-require File.join(File.dirname(__FILE__), "adapters/test_unit")
+require 'test/unit'
+require 'webmock'
+
+module Test
+  module Unit
+    class TestCase
+      include WebMock::API
+
+      alias_method :teardown_without_webmock, :teardown
+      def teardown_with_webmock
+        teardown_without_webmock
+        WebMock.reset!
+      end
+      alias_method :teardown, :teardown_with_webmock
+
+    end
+  end
+end
+
+WebMock::AssertionFailure.error_class = Test::Unit::AssertionFailedError rescue MiniTest::Assertion # ruby1.9 compat

data/lib/webmock/util/hash_counter.rb

@@ -1,20 +1,25 @@
 module WebMock
-
   module Util
-
     class Util::HashCounter
       attr_accessor :hash
       def initialize
         self.hash = {}
+        @order = {}
+        @max = 0
       end
       def put key, num=1
         hash[key] = (hash[key] || 0) + num
+        @order[key] = @max = @max + 1
       end
       def get key
         hash[key] || 0
       end
-    end
 
+      def each(&block)
+        @order.to_a.sort {|a, b| a[1] <=> b[1]}.each do |a|
+          block.call(a[0], hash[a[0]])
+        end
+      end
+    end
   end
-  
 end

data/lib/webmock/util/hash_keys_stringifier.rb

@@ -0,0 +1,23 @@
+module WebMock
+  module Util
+    class HashKeysStringifier
+      
+      def self.stringify_keys!(arg)
+        case arg
+        when Array
+          arg.map { |elem| stringify_keys!(elem) }
+        when Hash
+          Hash[
+            *arg.map { |key, value|  
+              k = key.is_a?(Symbol) ? key.to_s : key
+              v = stringify_keys!(value)
+              [k,v]
+            }.inject([]) {|r,x| r + x}]
+        else
+          arg
+        end
+      end
+      
+    end
+  end
+end

data/lib/webmock/webmock.rb

@@ -48,20 +48,30 @@ module WebMock
       Config.instance.allow && Config.instance.allow.include?(uri.host)
   end
 
+  def self.reset!
+    WebMock::RequestRegistry.instance.reset!
+    WebMock::StubRegistry.instance.reset!
+  end
+  
   def self.reset_webmock
-    WebMock::RequestRegistry.instance.reset_webmock
+    WebMock::Deprecation.warning("WebMock.reset_webmock is deprecated. Please use WebMock.reset! method instead")
+    reset!
   end
-
+  
   def self.reset_callbacks
     WebMock::CallbackRegistry.reset
   end
 
   def self.after_request(options={}, &block)
-    CallbackRegistry.add_callback(options, block)
+    WebMock::CallbackRegistry.add_callback(options, block)
   end
 
   def self.registered_request?(request_signature)
-    RequestRegistry.instance.registered_request?(request_signature)
+    WebMock::StubRegistry.instance.registered_request?(request_signature)
+  end
+
+  def self.print_executed_requests
+    puts WebMock::RequestExecutionVerifier.executed_requests_message
   end
 
   %w(

data/spec/curb_spec.rb

@@ -21,7 +21,7 @@ unless RUBY_PLATFORM =~ /java/
   describe "Curb features" do
     before(:each) do
       WebMock.disable_net_connect!
-      WebMock::RequestRegistry.instance.reset_webmock
+      WebMock.reset!
     end
 
     describe "callbacks" do

data/spec/curb_spec_helper.rb

@@ -30,10 +30,6 @@ module CurbSpecHelper
     curl
   end
 
-  def default_client_request_headers(request_method = nil, has_body = false)
-    nil
-  end
-
   def client_timeout_exception_class
     Curl::Err::TimeoutError
   end

data/spec/em_http_request_spec.rb

@@ -25,5 +25,10 @@ unless RUBY_PLATFORM =~ /java/
       http_request(:get, "http://www.example.com/?x=3", :query => {"a" => ["b", "c"]}).body.should == "abc"
     end
 
+    it "should work with optional query params declared as string" do
+      stub_http_request(:get, "www.example.com/?x=3&a[]=b&a[]=c").to_return(:body => "abc")
+      http_request(:get, "http://www.example.com/?x=3", :query => "a[]=b&a[]=c").body.should == "abc"
+    end
+
   end
 end

data/spec/em_http_request_spec_helper.rb

@@ -47,10 +47,6 @@ module EMHttpRequestSpecHelper
     ""
   end
 
-  def default_client_request_headers(request_method = nil, has_body = false)
-    nil
-  end
-
   def setup_expectations_for_real_request(options = {})
   end
 

data/spec/errors_spec.rb

@@ -0,0 +1,17 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "errors" do
+  describe WebMock::NetConnectNotAllowedError do
+    describe "message" do
+      it "should have message with request signature and snippet" do
+        request_signature = mock(:to_s => "aaa")
+        WebMock::StubRequestSnippet.stub!(:new).
+          with(request_signature).and_return(mock(:to_s => "bbb"))
+        expected =  "Real HTTP connections are disabled. Unregistered request: aaa" +
+               "\n\nYou can stub this request with the following snippet:\n\n" +
+               "bbb\n\n============================================================"  
+        WebMock::NetConnectNotAllowedError.new(request_signature).message.should == expected  
+      end
+    end
+  end
+end

data/spec/httpclient_spec_helper.rb

@@ -41,10 +41,6 @@ module HTTPClientSpecHelper
     Errno::ECONNREFUSED
   end
 
-  def default_client_request_headers(request_method = nil, has_body = false)
-    {'Content-Type'=>'application/x-www-form-urlencoded'} if request_method == 'POST' && has_body
-  end
-
   def setup_expectations_for_real_request(options = {})
     socket = mock("TCPSocket")
     TCPSocket.should_receive(:new).

data/spec/net_http_spec_helper.rb

@@ -22,7 +22,8 @@ module NetHTTPSpecHelper
     http = Net::HTTP.new(uri.host, uri.port)
     if uri.scheme == "https"
       http.use_ssl = true
-      http.ssl_timeout = 10
+      #1.9.1 has a bug with ssl_timeout
+      http.ssl_timeout = 10 unless RUBY_VERSION == "1.9.1"
     end
     http.verify_mode = OpenSSL::SSL::VERIFY_NONE
     response = http.start {|http|
@@ -38,13 +39,6 @@ module NetHTTPSpecHelper
     })
   end
   
-  def default_client_request_headers(request_method = nil, has_body = false)
-    default_request = Net::HTTPGenericRequest.new('','','','/')
-    default_net_http_headers = Hash[*default_request.to_hash.map {|k,v|
-      [k, v.flatten]
-    }.flatten]
-  end
-  
   def client_timeout_exception_class
     Timeout::Error
   end

data/spec/patron_spec_helper.rb

@@ -1,15 +1,16 @@
+require 'ostruct'
+
 module PatronSpecHelper
   def http_request(method, uri, options = {}, &block)
     uri = Addressable::URI.heuristic_parse(uri)
     sess = Patron::Session.new
-    sess.base_url = "#{uri.omit(:userinfo, :query).normalize.to_s}".gsub(/\/$/,"")
-
+    sess.base_url = "#{uri.omit(:userinfo, :path, :query).normalize.to_s}".gsub(/\/$/,"")
     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 => options[:body]
     })
@@ -28,14 +29,6 @@ module PatronSpecHelper
     })
   end
 
-  def default_client_request_headers(request_method = nil, has_body = false)
-    if Patron.version >= "0.4.6"
-      {'Expect'=>''}
-    else
-      nil
-    end
-  end
-
   def client_timeout_exception_class
     Patron::TimeoutError
   end

data/spec/request_execution_verifier_spec.rb

@@ -5,6 +5,8 @@ describe WebMock::RequestExecutionVerifier do
     @verifier = WebMock::RequestExecutionVerifier.new
     @request_pattern = mock(WebMock::RequestPattern, :to_s => "www.example.com")
     @verifier.request_pattern = @request_pattern
+    WebMock::RequestRegistry.instance.stub(:to_s).and_return("executed requests")
+    @executed_requests_info = "\n\nThe following requests were made:\n\nexecuted requests\n" + "="*60
   end
 
 
@@ -13,13 +15,17 @@ describe WebMock::RequestExecutionVerifier do
     it "should report failure message" do
       @verifier.times_executed = 0
       @verifier.expected_times_executed = 2
-      @verifier.failure_message.should == "The request www.example.com was expected to execute 2 times but it executed 0 times"
+      expected_text = "The request www.example.com was expected to execute 2 times but it executed 0 times"
+      expected_text << @executed_requests_info
+      @verifier.failure_message.should == expected_text  
     end
 
     it "should report failure message correctly when executed times is one" do
       @verifier.times_executed = 1
       @verifier.expected_times_executed = 1
-      @verifier.failure_message.should == "The request www.example.com was expected to execute 1 time but it executed 1 time"
+      expected_text = "The request www.example.com was expected to execute 1 time but it executed 1 time"
+      expected_text << @executed_requests_info
+      @verifier.failure_message.should == expected_text
     end
 
   end
@@ -29,12 +35,16 @@ describe WebMock::RequestExecutionVerifier do
     it "should report failure message if it executed number of times specified" do
       @verifier.times_executed = 2
       @verifier.expected_times_executed = 2
-      @verifier.negative_failure_message.should == "The request www.example.com was not expected to execute 2 times but it executed 2 times"
+      expected_text = "The request www.example.com was not expected to execute 2 times but it executed 2 times"
+      expected_text << @executed_requests_info
+      @verifier.negative_failure_message.should == expected_text
     end
 
     it "should report failure message when not expected request but it executed" do
       @verifier.times_executed = 1
-      @verifier.negative_failure_message.should == "The request www.example.com was expected to execute 0 times but it executed 1 time"
+      expected_text = "The request www.example.com was expected to execute 0 times but it executed 1 time"
+      expected_text << @executed_requests_info
+      @verifier.negative_failure_message.should == expected_text
     end
 
   end