webmock 1.7.10 → 1.8.0

data/.travis.yml

@@ -3,7 +3,7 @@ rvm:
   - 1.9.2
   - 1.9.3
   - ree
-  - jruby
+  - jruby-19mode
 
 
-script: "bundle exec rake JRUBY_OPTS='–server -Dnative.enabled=true' && rake em_http_request_1_x_spec"
+script: "bundle exec rake && rake em_http_request_0_x_spec"

data/CHANGELOG.md

@@ -1,5 +1,79 @@
 # Changelog
 
+## 1.8.0
+
+* Matching request body against partial hash.
+
+        stub_http_request(:post, "www.example.com").
+                with(:body => hash_including({:data => {:a => '1', :b => 'five'}}))
+
+        RestClient.post('www.example.com', "data[a]=1&data[b]=five&x=1",
+        :content_type => 'application/x-www-form-urlencoded')    # ===> Success
+
+        request(:post, "www.example.com").
+        with(:body => hash_including({:data => {:a => '1', :b => 'five'}}),
+        :headers => 'Content-Type' => 'application/json').should have_been_made         # ===> Success
+
+    Thanks to [Marnen Laibow-Koser](https://github.com/marnen) for help with this solution
+
+* Matching request query params against partial hash.
+
+        stub_http_request(:get, "www.example.com").with(:query => hash_including({"a" => ["b", "c"]}))
+
+        RestClient.get("http://www.example.com/?a[]=b&a[]=c&x=1") # ===> Success
+
+        request(:get, "www.example.com").
+          with(:query => hash_including({"a" => ["b", "c"]})).should have_been_made  # ===> Success
+
+* Added support for Excon.
+
+    Thanks to [Dimitrij Denissenko](https://github.com/dim)
+
+* Added support for setting expectations on the request stub with `assert_requested`
+
+        stub_get = stub_request(:get, "www.example.com")
+        stub_post = stub_request(:post, "www.example.com")
+
+        Net::HTTP.get('www.example.com', '/')
+
+        assert_requested(stub_get)
+        assert_not_requested(stub_post)
+
+    Thanks to [Nicolas Fouché](https://github.com/nfo)
+
+* `WebMock.disable_net_connect!` accepts `RegExp` as `:allow` parameter
+
+    Thanks to [Frank Schumacher](https://github.com/thenoseman)
+
+* Ensure multiple values for the same header can be recorded and played back
+
+    Thanks to [Myron Marston](https://github.com/myronmarston)
+
+* Updated dependency on Addressable to version >= 2.2.7 to handle nested hash query values. I.e. `?one[two][three][]=four&one[two][three][]=five`
+
+* Fixed compatibility with Curb >= 0.7.16 This breaks compatibility with Curb < 0.7.16
+
+* Fix #to_rack to handle non-array response bodies.
+
+    Thanks to [Tammer Saleh](https://github.com/tsaleh)
+
+* Added `read_timeout` accessor to StubSocket which fixes compatibility with aws-sdk
+
+    Thanks to [Lin Jen-Shin](https://github.com/godfat)
+
+* Fix warning "instance variable @query_params not initialized"
+
+    Thanks to [Joe Van Dyk](https://github.com/joevandyk)
+
+* Using bytesize of message instead of its length for content-length header in em-http-request adapter.
+  This fixes a problem with messages getting truncated in Ruby >= 1.9
+
+    Thanks to [Mark Abramov](https://github.com/markiz)
+
+* Fixed problem with body params being matched even if params were different.
+
+    Thanks to [Evgeniy Dolzhenko](https://github.com/dolzenko) for reporting this issue.
+
 ## 1.7.10
 
 * Yanked 1.7.9 and rebuilt gem on 1.8.7 to deal with syck/psych incompatibilties in gemspec.
@@ -297,11 +371,11 @@ josevalim:
 
   This feature was available before only for localhost with `:allow_localhost => true`
 
-                WebMock.disable_net_connect!(:allow => "www.example.org")
+        WebMock.disable_net_connect!(:allow => "www.example.org")
 
-                Net::HTTP.get('www.something.com', '/')   # ===> Failure
+        Net::HTTP.get('www.something.com', '/')   # ===> Failure
 
-                Net::HTTP.get('www.example.org', '/')      # ===> Allowed.
+        Net::HTTP.get('www.example.org', '/')      # ===> Allowed.
 
 * Fixed Net::HTTP adapter so that it preserves the original behavior of Net::HTTP.
 
@@ -333,51 +407,51 @@ josevalim:
 
 * Matching query params using a hash
 
-                 stub_http_request(:get, "www.example.com").with(:query => {"a" => ["b", "c"]})
+        stub_http_request(:get, "www.example.com").with(:query => {"a" => ["b", "c"]})
 
-                 RestClient.get("http://www.example.com/?a[]=b&a[]=c") # ===> Success
+        RestClient.get("http://www.example.com/?a[]=b&a[]=c") # ===> Success
 
-                 request(:get, "www.example.com").with(:query => {"a" => ["b", "c"]}).should have_been_made  # ===> Success
+        request(:get, "www.example.com").with(:query => {"a" => ["b", "c"]}).should have_been_made  # ===> Success
 
 * Matching request body against a hash. Body can be URL-Encoded, JSON or XML.
 
   (Thanks to Steve Tooke for the idea and a solution for url-encoded bodies)
 
-                stub_http_request(:post, "www.example.com").
-                        with(:body => {:data => {:a => '1', :b => 'five'}})
+        stub_http_request(:post, "www.example.com").
+                with(:body => {:data => {:a => '1', :b => 'five'}})
 
-                RestClient.post('www.example.com', "data[a]=1&data[b]=five",
-                :content_type => 'application/x-www-form-urlencoded')    # ===> Success
+        RestClient.post('www.example.com', "data[a]=1&data[b]=five",
+        :content_type => 'application/x-www-form-urlencoded')    # ===> Success
 
-                RestClient.post('www.example.com', '{"data":{"a":"1","b":"five"}}',
-                :content_type => 'application/json')    # ===> Success
+        RestClient.post('www.example.com', '{"data":{"a":"1","b":"five"}}',
+        :content_type => 'application/json')    # ===> Success
 
-                RestClient.post('www.example.com', '<data a="1" b="five" />',
-                        :content_type => 'application/xml' )    # ===> Success
+        RestClient.post('www.example.com', '<data a="1" b="five" />',
+                :content_type => 'application/xml' )    # ===> Success
 
-                request(:post, "www.example.com").
+        request(:post, "www.example.com").
         with(:body => {:data => {:a => '1', :b => 'five'}},
-         :headers => 'Content-Type' => 'application/json').should have_been_made         # ===> Success
+        :headers => 'Content-Type' => 'application/json').should have_been_made         # ===> Success
 
 * Request callbacks (Thanks to Myron Marston for all suggestions)
 
     WebMock can now invoke callbacks for stubbed or real requests:
 
-                WebMock.after_request do |request_signature, response|
-                  puts "Request #{request_signature} was made and #{response} was returned"
-                end
+        WebMock.after_request do |request_signature, response|
+          puts "Request #{request_signature} was made and #{response} was returned"
+        end
 
     invoke callbacks for real requests only and except requests made with Patron client
 
-                WebMock.after_request(:except => [:patron], :real_requests_only => true)  do |request_signature, response|
-                  puts "Request #{request_signature} was made and #{response} was returned"
-                end
+        WebMock.after_request(:except => [:patron], :real_requests_only => true)  do |request_signature, response|
+            puts "Request #{request_signature} was made and #{response} was returned"
+        end
 
 * `to_raise()` now accepts an exception instance or a string as argument in addition to an exception class
 
-                stub_request(:any, 'www.example.net').to_raise(StandardError.new("some error"))
+        stub_request(:any, 'www.example.net').to_raise(StandardError.new("some error"))
 
-                stub_request(:any, 'www.example.net').to_raise("some error")
+        stub_request(:any, 'www.example.net').to_raise("some error")
 
 * Matching requests based on a URI is 30% faster
 

data/Gemfile

@@ -1,9 +1,8 @@
 source 'http://rubygems.org/'
 
 gemspec
-if ENV["EM_HTTP_REQUEST_1_X"]
-  gem 'em-http-request', '>= 1.0.0'
-  gem 'em-synchrony', '>= 1.0.0'
+if ENV["EM_HTTP_REQUEST_0_X"]
+  gem 'em-http-request', '~> 0.3.0'
 end
 
 

data/README.md

@@ -1,4 +1,4 @@
-WebMock [![Build Status](https://secure.travis-ci.org/bblimke/webmock.png)](http://travis-ci.org/bblimke/webmock)
+WebMock [![Build Status](https://secure.travis-ci.org/bblimke/webmock.png)](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.
@@ -24,6 +24,7 @@ Supported HTTP libraries
 * EM-HTTP-Request
 * Curb (currently only Curb::Easy)
 * Typhoeus (currently only Typhoeus::Hydra)
+* Excon
 
 Supported Ruby Interpreters
 ---------------------------
@@ -32,13 +33,13 @@ Supported Ruby Interpreters
 * MRI 1.8.7
 * MRI 1.9.1
 * MRI 1.9.2
-* MRI 1.9.3-preview1
+* MRI 1.9.3
 * REE 1.8.7
 * JRuby
 
 ##Installation
 
-    gem install webmock --source http://gemcutter.org
+    gem install webmock
 
 ### or to install the latest development version from github master
 
@@ -125,6 +126,14 @@ You can also use WebMock outside a test framework:
     RestClient.post('www.example.com', '<data a="1" b="five" />',
       :content_type => 'application/xml' )    # ===> Success
 
+### Matching request body against partial hash.
+
+    stub_http_request(:post, "www.example.com").
+            with(:body => hash_including({:data => {:a => '1', :b => 'five'}}))
+
+    RestClient.post('www.example.com', "data[a]=1&data[b]=five&x=1",
+    :content_type => 'application/x-www-form-urlencoded')    # ===> Success
+
 ### Matching custom request headers
 
     stub_request(:any, "www.example.com").with(:headers=>{ 'Header-Name' => 'Header-Value' })
@@ -172,6 +181,12 @@ You can also use WebMock outside a test framework:
 
      RestClient.get("http://www.example.com/?a[]=b&a[]=c") # ===> Success
 
+### Matching partial query params using hash
+
+    stub_http_request(:get, "www.example.com").with(:query => hash_including({"a" => ["b", "c"]}))
+
+    RestClient.get("http://www.example.com/?a[]=b&a[]=c&x=1") # ===> Success
+
 ### Stubbing with custom response
 
     stub_request(:any, "www.example.com").to_return(:body => "abc", :status => 200,  :headers => { 'Content-Length' => 3 } )
@@ -319,7 +334,7 @@ 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 or port
+### External requests can be disabled while allowing any hostname or port or parts thereof
 
     WebMock.disable_net_connect!(:allow => "www.example.org:8080")
 
@@ -329,6 +344,10 @@ You can also use WebMock outside a test framework:
 
     RestClient.get('www.example.org:8080', '/')     # ===> Allowed
 
+    WebMock.disable_net_connect!(:allow => /ample.org/)
+
+    RestClient.get('www.example.org', '/')   # ===> Allowed
+
 ## Connecting on Net::HTTP.start
 
 HTTP protocol has 3 steps: connect, request and response (or 4 with close). Most Ruby HTTP client libraries
@@ -377,6 +396,16 @@ This forces WebMock Net::HTTP adapter to always connect on `Net::HTTP.start`.
 
     assert_requested :get, "http://www.example.com"    # ===> Success
 
+### Setting expectations in Test::Unit on the stub
+
+    stub_get = stub_request(:get, "www.example.com")
+    stub_post = stub_request(:post, "www.example.com")
+
+    Net::HTTP.get('www.example.com', '/')
+
+    assert_requested(stub_get)
+    assert_not_requested(stub_post)
+
 
 ### Setting expectations in RSpec on `WebMock` module
  This style is borrowed from [fakeweb-matcher](http://github.com/freelancing-god/fakeweb-matcher)
@@ -391,6 +420,8 @@ 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(:query => hash_including({"a" => ["b", "c"]}))
+
     WebMock.should have_requested(:get, "www.example.com").
       with(:body => {"a" => ["b", "c"]}, :headers => {'Content-Type' => 'application/json'})
 
@@ -406,6 +437,8 @@ 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(:get, "www.example.com").with(:query => hash_including({"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
 
@@ -654,6 +687,14 @@ People who submitted patches and new features or suggested improvements. Many th
 * Eugene Pimenov
 * Albert Llop
 * Christopher Pickslay
+* Tammer Saleh
+* Nicolas Fouché
+* Joe Van Dyk
+* Mark Abramov
+* Frank Schumacher
+* Dimitrij Denissenko
+* Marnen Laibow-Koser
+* Evgeniy Dolzhenko
 
 For a full list of contributors you can visit the
 [contributors](https://github.com/bblimke/webmock/contributors) page.

data/Rakefile

@@ -26,8 +26,8 @@ RSpec::Core::RakeTask.new(:spec_http_without_webmock) do |t|
 end
 
 
-task :em_http_request_1_x_spec do
-  sh "EM_HTTP_REQUEST_1_X=true bundle install && bundle exec rspec spec/acceptance/em_http_request/em_http_request_spec.rb" if RUBY_VERSION >= "1.9.2"
+task :em_http_request_0_x_spec do
+  sh "EM_HTTP_REQUEST_0_X=true bundle install && bundle exec rspec spec/acceptance/em_http_request/em_http_request_spec.rb" if RUBY_VERSION <= "1.8.7"
 end
 
 require 'rake/testtask'

data/lib/webmock.rb

@@ -14,6 +14,7 @@ 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/http_lib_adapters/excon_adapter'
 
 require 'webmock/errors'
 
@@ -23,6 +24,8 @@ require 'webmock/util/hash_counter'
 require 'webmock/util/hash_keys_stringifier'
 require 'webmock/util/json'
 
+require 'webmock/matchers/hash_including_matcher'
+
 require 'webmock/request_pattern'
 require 'webmock/request_signature'
 require 'webmock/responses_sequence'

data/lib/webmock/api.rb

@@ -17,17 +17,45 @@ module WebMock
       alias :request :a_request
     end
 
-    def assert_requested(method, uri, options = {}, &block)
-      expected_times_executed = options.delete(:times) || 1
-      request = WebMock::RequestPattern.new(method, uri, options).with(&block)
-      verifier = WebMock::RequestExecutionVerifier.new(request, expected_times_executed)
+
+    def assert_requested(*args, &block)
+      if not args[0].is_a?(WebMock::RequestStub)
+        args = convert_uri_method_and_options_to_request_and_options(*args, &block)
+      end
+      assert_request_requested(*args, &block)
+    end
+
+    def assert_not_requested(*args, &block)
+      if not args[0].is_a?(WebMock::RequestStub)
+        args = convert_uri_method_and_options_to_request_and_options(*args, &block)
+      end
+      assert_request_not_requested(*args, &block)
+    end
+
+    def hash_including(expected)
+      if defined?(::RSpec::Mocks::ArgumentMatchers::HashIncludingMatcher)
+        RSpec::Mocks::ArgumentMatchers::HashIncludingMatcher.new(expected)
+      else
+        WebMock::Matchers::HashIncludingMatcher.new(expected)
+      end
+    end
+
+    private
+
+    def convert_uri_method_and_options_to_request_and_options(*args, &block)
+      request = WebMock::RequestPattern.new(*args).with(&block)
+      [request, args[2] || {}]
+    end
+
+    def assert_request_requested(request, options = {})
+      verifier = WebMock::RequestExecutionVerifier.new(request, options.delete(:times) || 1)
       WebMock::AssertionFailure.failure(verifier.failure_message) unless verifier.matches?
     end
 
-    def assert_not_requested(method, uri, options = {}, &block)
-      request = WebMock::RequestPattern.new(method, uri, options).with(&block)
+    def assert_request_not_requested(request, options = {})
       verifier = WebMock::RequestExecutionVerifier.new(request, options.delete(:times))
       WebMock::AssertionFailure.failure(verifier.negative_failure_message) unless verifier.does_not_match?
     end
+
   end
 end

data/lib/webmock/http_lib_adapters/curb_adapter.rb

@@ -53,6 +53,7 @@ if defined?(Curl)
   module Curl
     class WebMockCurlEasy < Curl::Easy
       def curb_or_webmock
+
         request_signature = build_request_signature
         WebMock::RequestRegistry.instance.requested_signatures.put(request_signature)
 
@@ -169,9 +170,7 @@ if defined?(Curl)
 
       def http_with_webmock(method)
         @webmock_method = method
-        curb_or_webmock do
           http_without_webmock(method)
-        end
       end
       alias_method :http_without_webmock, :http
       alias_method :http, :http_with_webmock
@@ -179,9 +178,7 @@ if defined?(Curl)
       %w[ get head delete ].each do |verb|
         define_method "http_#{verb}_with_webmock" do
           @webmock_method = verb
-          curb_or_webmock do
-            send( "http_#{verb}_without_webmock" )
-          end
+          send( "http_#{verb}_without_webmock" )
         end
 
         alias_method "http_#{verb}_without_webmock", "http_#{verb}"
@@ -191,9 +188,7 @@ if defined?(Curl)
       def http_put_with_webmock data = nil
         @webmock_method = :put
         @put_data = data if data
-        curb_or_webmock do
-          http_put_without_webmock(data)
-        end
+        http_put_without_webmock(data)
       end
       alias_method :http_put_without_webmock, :http_put
       alias_method :http_put, :http_put_with_webmock
@@ -201,9 +196,7 @@ if defined?(Curl)
       def http_post_with_webmock *data
         @webmock_method = :post
         @post_body = data.join('&') if data && !data.empty?
-        curb_or_webmock do
-          http_post_without_webmock(*data)
-        end
+        http_post_without_webmock(*data)
       end
       alias_method :http_post_without_webmock, :http_post
       alias_method :http_post, :http_post_with_webmock
@@ -287,36 +280,6 @@ if defined?(Curl)
         alias_method "on_#{callback}_without_webmock", "on_#{callback}"
         alias_method "on_#{callback}", "on_#{callback}_with_webmock"
       end
-
-      %w[ http_get http_head http_delete perform ].each do |method|
-        class_eval <<-METHOD, __FILE__, __LINE__
-          def self.#{method}(url, &block)
-            c = new
-            c.url = url
-            block.call(c) if block
-            c.send("#{method}")
-            c
-          end
-        METHOD
-      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
-
-        def self.http_post(url, *data, &block)
-          c = new
-          c.url = url
-          block.call(c) if block
-          c.send(:http_post, *data)
-          c
-        end
-      METHOD
     end
   end
 end