webmock 1.13.0 → 1.14.0

data/CHANGELOG.md

@@ -1,5 +1,35 @@
 # Changelog
 
+## 1.14.0
+
+* Handling non UTF-8 characters in query params.
+
+  Thanks to [Florian Dütsch](https://github.com/der-flo) for reporting the issue.
+
+* Added support for `request_block` param in Excon
+
+  Thanks to [Dmitry Gutov](https://github.com/dgutov) for reporting the issue.
+
+* Fixed compatibility with latest Curb
+
+  Thanks to [Ian Lesperance](https://github.com/elliterate) and [Matthew Horan](https://github.com/mhoran)
+
+* Triggering errbacks assynchronously in em-http-request adapter.
+
+  Thanks to [Ian Lesperance](https://github.com/elliterate) and [Matthew Horan](https://github.com/mhoran)
+
+* Handling query params with a hashes nested inside arrays.
+
+  Thanks to [Ian Asaff](https://github.com/montague)
+
+* Changed NetConnectNotAllowedError to inherit from Exception to allow it to bubble up into a test suite.
+
+  Thanks to [Daniel van Hoesel](https://github.com/s0meone)
+
+* HTTPClient adapter is thread safe.
+
+  Thanks to [Tom Beauvais](https://github.com/tbeauvais)
+
 ## 1.13.0
 
 * Net::HTTP::Persistent compatibility.

data/README.md

@@ -1,4 +1,4 @@
-WebMock [![Build Status](https://secure.travis-ci.org/bblimke/webmock.png?branch=master)](http://travis-ci.org/bblimke/webmock) [![Dependency Status](https://gemnasium.com/bblimke/webmock.png)](http://gemnasium.com/bblimke/webmock) [![Stories in Ready](http://badge.waffle.io/bblimke/webmock.png)](http://waffle.io/bblimke/webmock)
+WebMock [![Build Status](https://secure.travis-ci.org/bblimke/webmock.png?branch=master)](http://travis-ci.org/bblimke/webmock) [![Dependency Status](https://gemnasium.com/bblimke/webmock.png)](http://gemnasium.com/bblimke/webmock)
 =======
 
 Library for stubbing and setting expectations on HTTP requests in Ruby.
@@ -258,7 +258,10 @@ Net::HTTP.start("www.example.com") {|http| http.request(req)}.message    # ===>
 
 ### Replaying raw responses recorded with `curl -is`
 
-    `curl -is www.example.com > /tmp/example_curl_-is_output.txt`
+```
+curl -is www.example.com > /tmp/example_curl_-is_output.txt
+```
+
 ```ruby
 raw_response_file = File.new("/tmp/example_curl_-is_output.txt")
 ```
@@ -850,6 +853,13 @@ People who submitted patches and new features or suggested improvements. Many th
 * Leif Bladt
 * Alex Tomlins
 * Mitsutaka Mimura
+* Tomy Kaira
+* Daniel van Hoesel
+* Ian Asaff
+* Ian Lesperance
+* Matthew Horan
+* Dmitry Gutov
+* Florian Dütsch
 
 For a full list of contributors you can visit the
 [contributors](https://github.com/bblimke/webmock/contributors) page.

data/lib/webmock/errors.rb

@@ -1,6 +1,6 @@
 module WebMock
 
-  class NetConnectNotAllowedError < StandardError
+  class NetConnectNotAllowedError < Exception
     def initialize(request_signature)
       text = "Real HTTP connections are disabled. Unregistered request: #{request_signature}"
       text << "\n\n"

data/lib/webmock/http_lib_adapters/em_http_request/em_http_request_1_x.rb

@@ -94,7 +94,6 @@ if defined?(EventMachine::HttpClient)
         WebMock::RequestRegistry.instance.requested_signatures.put(request_signature)
 
         if stubbed_webmock_response
-          on_error("WebMock timeout error") if stubbed_webmock_response.should_timeout
           WebMock::CallbackRegistry.invoke_callbacks({:lib => :em_http_request}, request_signature, stubbed_webmock_response)
           EM.next_tick {
             setup(make_raw_response(stubbed_webmock_response), @uri,

data/lib/webmock/http_lib_adapters/excon_adapter.rb

@@ -13,7 +13,7 @@ if defined?(Excon)
       class ExconAdapter < HttpLibAdapter
         PARAMS_TO_DELETE = [:expects, :idempotent,
                             :instrumentor_name, :instrumentor,
-                            :response_block, :request_block,
+                            :response_block,
                             :__construction_args, :stack,
                             :connection, :response]
 

data/lib/webmock/util/query_mapper.rb

@@ -37,6 +37,7 @@ module WebMock::Util
     #     "?one=two&one=three").query_values(:notation => :flat_array)
     #   #=> [['one', 'two'], ['one', 'three']]
     def self.query_to_values(query, options={})
+      query.force_encoding('utf-8') if query.respond_to?(:force_encoding)
       defaults = {:notation => :subscript}
       options = defaults.merge(options)
       if ![:flat, :dot, :subscript, :flat_array].include?(options[:notation])
@@ -65,6 +66,7 @@ module WebMock::Util
               end).compact.inject(empty_accumulator.dup) do |accumulator, (key, value)|
                 value = true if value.nil?
                 key = Addressable::URI.unencode_component(key)
+                key = key.dup.force_encoding(Encoding::ASCII_8BIT) if key.respond_to?(:force_encoding)
                 if value != true
                   value = Addressable::URI.unencode_component(value.gsub(/\+/, " "))
                 end
@@ -90,6 +92,9 @@ module WebMock::Util
                     current_hash = current_hash[subkey]
                   end
                   if array_value
+                    if current_hash[subkeys.last] && !current_hash[subkeys.last].is_a?(Array)
+                      current_hash[subkeys.last] = [current_hash[subkeys.last]]
+                    end
                     current_hash[subkeys.last] = [] unless current_hash[subkeys.last]
                     current_hash[subkeys.last] << value
                   else

data/lib/webmock/util/uri.rb

@@ -78,7 +78,10 @@ module WebMock
       end
 
       def self.uris_with_inferred_port_and_without(uris)
-        uris.map { |uri| [ uri, uri.gsub(%r{(:80)|(:443)}, "").freeze ] }.flatten
+        uris.map { |uri|
+          uri = uri.dup.force_encoding(Encoding::ASCII_8BIT) if uri.respond_to?(:force_encoding)
+          [ uri, uri.gsub(%r{(:80)|(:443)}, "").freeze ]
+        }.flatten
       end
 
       def self.uris_encoded_and_unencoded(uris)
@@ -88,11 +91,17 @@ module WebMock
       end
 
       def self.uris_with_scheme_and_without(uris)
-        uris.map { |uri| [ uri, uri.gsub(%r{^https?://},"").freeze ] }.flatten
+        uris.map { |uri|
+          uri = uri.dup.force_encoding(Encoding::ASCII_8BIT) if uri.respond_to?(:force_encoding)
+          [ uri, uri.gsub(%r{^https?://},"").freeze ]
+        }.flatten
       end
 
       def self.uris_with_trailing_slash_and_without(uris)
-        uris = uris.map { |uri| [ uri, uri.omit(:path).freeze ] }.flatten
+        uris = uris.map { |uri|
+          uri = uri.dup.force_encoding(Encoding::ASCII_8BIT) if uri.respond_to?(:force_encoding)
+          [ uri, uri.omit(:path).freeze ]
+        }.flatten
       end
 
     end

data/lib/webmock/version.rb

@@ -1,3 +1,3 @@
 module WebMock
-  VERSION = '1.13.0' unless defined?(::WebMock::VERSION)
+  VERSION = '1.14.0' unless defined?(::WebMock::VERSION)
 end

data/spec/acceptance/curb/curb_spec_helper.rb

@@ -66,7 +66,7 @@ module CurbSpecHelper
         curl.put_data = body
       end
 
-      curl.http(method)
+      curl.http(method.to_s.upcase)
       curl
     end
   end

data/spec/acceptance/em_http_request/em_http_request_spec.rb

@@ -127,6 +127,23 @@ unless RUBY_PLATFORM =~ /java/
         end
       end
 
+      it 'should trigger error callbacks asynchronously' do
+        stub_request(:get, 'www.example.com').to_timeout
+        called = false
+
+        EM.run do
+          conn = EventMachine::HttpRequest.new('http://www.example.com/')
+          http = conn.get
+          http.errback do
+            called = true
+            EM.stop
+          end
+          called.should == false
+        end
+
+        called.should == true
+      end
+
       # not pretty, but it works
       if defined?(EventMachine::Synchrony)
         describe "with synchrony" do

data/spec/acceptance/shared/allowing_and_disabling_net_connect.rb

@@ -83,7 +83,7 @@ shared_context "allowing and disabling net connect" do |*adapter_info|
       let(:host_with_port){ WebMockServer.instance.host_with_port }
 
       before(:each) do
-        WebMock.disable_net_connect!(:allow => ["www.example.org", host_with_port])
+        WebMock.disable_net_connect!(:allow => ["www.example.org", "httpstat.us", host_with_port])
       end
 
       context "when the host is not allowed" do
@@ -120,7 +120,7 @@ shared_context "allowing and disabling net connect" do |*adapter_info|
         end
 
         it "should make a real request to allowed host", :net_connect => true do
-          http_request(:get, "http://www.example.org/").status.should == "302"
+          http_request(:get, "http://httpstat.us/200").status.should == "200"
         end
       end
 

data/spec/acceptance/shared/callbacks.rb

@@ -101,20 +101,20 @@ shared_context "callbacks" do |*adapter_info|
           WebMock.after_request(:except => [:other_lib])  do |_, response|
             @response = response
           end
-          http_request(:get, "http://www.example.com/")
+          http_request(:get, "http://httpstat.us/200")
         end
 
         it "should pass real response to callback with status and message" do
-          @response.status[0].should == 302
-          @response.status[1].should == "Found" unless adapter_info.include?(:no_status_message)
+          @response.status[0].should == 200
+          @response.status[1].should == "OK" unless adapter_info.include?(:no_status_message)
         end
 
         it "should pass real response to callback with headers" do
-          @response.headers["Content-Length"].should == "0"
+          @response.headers["Content-Length"].should == "6"
         end
 
         it "should pass response to callback with body" do
-          @response.body.size.should == 0
+          @response.body.size.should == 6
         end
       end
     end

data/spec/acceptance/shared/stubbing_requests.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 shared_examples_for "stubbing requests" do |*adapter_info|
   describe "when requests are stubbed" do
     describe "based on uri" do
@@ -16,6 +18,13 @@ shared_examples_for "stubbing requests" do |*adapter_info|
         http_request(:get, "http://www.example.com/hello+/?#{NOT_ESCAPED_PARAMS}").body.should == "abc"
       end
 
+      it "should return stubbed response for url with non utf query params", "ruby>1.9" => true do
+        param = 'aäoöuü'.encode('iso-8859-1')
+        param = CGI.escape(param)
+        stub_request(:get, "www.example.com/?#{param}").to_return(:body => "abc")
+        http_request(:get, "http://www.example.com/?#{param}").body.should == "abc"
+      end
+
       it "should return stubbed response even if stub uri is declared as regexp and request params are escaped" do
         stub_request(:get, /.*x=ab c.*/).to_return(:body => "abc")
         http_request(:get, "http://www.example.com/hello/?#{ESCAPED_PARAMS}").body.should == "abc"

data/spec/spec_helper.rb

@@ -28,6 +28,10 @@ RSpec.configure do |config|
     config.filter_run_excluding :net_connect => true
   end
 
+  if RUBY_VERSION <= "1.8.7"
+    config.filter_run_excluding "ruby>1.9" => true
+  end
+
   config.filter_run_excluding :without_webmock => true
 
   config.before(:suite) do

data/spec/support/network_connection.rb

@@ -16,7 +16,7 @@ module NetworkConnection
 
   def self.is_network_available?
     begin
-      self.connect_to("192.0.32.10", 80, 5)
+      self.connect_to("173.194.113.176", 80, 5)
       true
     rescue
       false

data/spec/unit/errors_spec.rb

@@ -4,11 +4,11 @@ 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")
-        request_stub = mock
-        WebMock::RequestStub.stub!(:from_request_signature).and_return(request_stub)
-        WebMock::StubRequestSnippet.stub!(:new).
-          with(request_stub).and_return(mock(:to_s => "bbb"))
+        request_signature = double(:to_s => "aaa")
+        request_stub = double
+        WebMock::RequestStub.stub(:from_request_signature).and_return(request_stub)
+        WebMock::StubRequestSnippet.stub(:new).
+          with(request_stub).and_return(double(: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============================================================"
@@ -16,16 +16,34 @@ describe "errors" do
       end
 
       it "should have message with registered stubs if available" do
+        request_signature = double(:to_s => "aaa")
+        request_stub = double
+        WebMock::StubRegistry.instance.stub(:request_stubs).and_return([request_stub])
+        WebMock::RequestStub.stub(:from_request_signature).and_return(request_stub)
+        WebMock::StubRequestSnippet.stub(:new).
+          with(request_stub).and_return(double(: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\nregistered request stubs:\n\nbbb\n\n============================================================"
+        WebMock::NetConnectNotAllowedError.new(request_signature).message.should == expected
+      end
+
+      it "should not be caught by a rescue block without arguments" do
         request_signature = mock(:to_s => "aaa")
         request_stub = mock
-        WebMock::StubRegistry.instance.stub!(:request_stubs).and_return([request_stub])
         WebMock::RequestStub.stub!(:from_request_signature).and_return(request_stub)
         WebMock::StubRequestSnippet.stub!(:new).
           with(request_stub).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\nregistered request stubs:\n\nbbb\n\n============================================================"
-        WebMock::NetConnectNotAllowedError.new(request_signature).message.should == expected
+
+        exception = WebMock::NetConnectNotAllowedError.new(request_signature)
+
+        expect do
+          begin
+            raise exception
+          rescue
+            raise "exception should not be caught"
+          end
+        end.to raise_exception exception
       end
     end
   end

data/spec/unit/request_execution_verifier_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe WebMock::RequestExecutionVerifier do
   before(:each) do
     @verifier = WebMock::RequestExecutionVerifier.new
-    @request_pattern = mock(WebMock::RequestPattern, :to_s => "www.example.com")
+    @request_pattern = double(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

data/spec/unit/response_spec.rb

@@ -6,14 +6,14 @@ describe WebMock::ResponseFactory do
 
     it "should create response with options passed as arguments" do
       options = {:body => "abc", :headers => {:a => :b}}
-      WebMock::Response.should_receive(:new).with(options).and_return(@response = mock(WebMock::Response))
+      WebMock::Response.should_receive(:new).with(options).and_return(@response = double(WebMock::Response))
       WebMock::ResponseFactory.response_for(options).should == @response
     end
 
 
     it "should create dynamic response for argument responding to call" do
-      callable = mock(:call => {:body => "abc"})
-      WebMock::DynamicResponse.should_receive(:new).with(callable).and_return(@response = mock(WebMock::Response))
+      callable = double(:call => {:body => "abc"})
+      WebMock::DynamicResponse.should_receive(:new).with(callable).and_return(@response = double(WebMock::Response))
       WebMock::ResponseFactory.response_for(callable).should == @response
     end
 

data/spec/unit/util/uri_spec.rb

@@ -184,6 +184,19 @@ describe WebMock::Util::URI do
       uri = WebMock::Util::URI.normalize_uri(uri_string)
       WebMock::Util::QueryMapper.query_to_values(uri.query).should == {"one"=>{"two"=>{"three" => ["four", "five"]}}}
     end
+
+    it "should successfully handle mixed array and hash parameters" do
+      # derived from an elasticsearch query:
+      # load => {
+      #   :include => [
+      #     { :staff => :email },
+      #     :business_name
+      #   ]
+      # }
+      uri_string = "http://www.example.com:80/path?load[include][][staff]=email&load[include][]=business_name"
+      uri = WebMock::Util::URI.normalize_uri(uri_string)
+      WebMock::Util::QueryMapper.query_to_values(uri.query).should == {"load"=>{"include"=>[{"staff"=>"email"},"business_name"]}}
+    end
   end
 
   describe "stripping default port" do

data/test/shared_test.rb

@@ -10,13 +10,13 @@ module SharedTest
   end
 
   def test_assert_requested_with_stub_and_block_raises_error
-    assert_raise ArgumentError do
+    assert_raises ArgumentError do
       assert_requested(@stub_http) {}
     end
   end
 
   def test_assert_not_requested_with_stub_and_block_raises_error
-    assert_raise ArgumentError do
+    assert_raises ArgumentError do
       assert_not_requested(@stub_http) {}
     end
   end

data/test/test_helper.rb

@@ -9,7 +9,7 @@ require 'test/unit'
 class Test::Unit::TestCase
   AssertionFailedError =  Test::Unit::AssertionFailedError rescue MiniTest::Assertion
   def assert_raise_with_message(e, message, &block)
-    e = assert_raise(e, &block)
+    e = assert_raises(e, &block)
     if message.is_a?(Regexp)
       assert_match(message, e.message)
     else

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  hash: 35
+  hash: 47
   prerelease: 
   segments: 
   - 1
-  - 13
+  - 14
   - 0
-  version: 1.13.0
+  version: 1.14.0
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-07-05 00:00:00 Z
+date: 2013-10-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: addressable