webmock 1.7.3 → 1.7.4

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.7.4
+
+* Added support for matching EM-HTTP-Request requests with body declared as a Hash
+
+   Thanks to [David Yeu](https://github.com/daveyeu)
+
 ## 1.7.3
 
 * Added `Get`, `Post`, `Delete`, `Put`, `Head`, `Option` constants to replaced `Net::HTTP` to make it possible to marshal objects with these constants assigned to properties. This fixed problem with `tvdb_party` gem which serializes HTTParty responses.

data/README.md

@@ -646,6 +646,7 @@ People who submitted patches and new features or suggested improvements. Many th
 * Zach Dennis
 * Nikita Fedyashev
 * Lin Jen-Shin
+* David Yeu
 
 For a full list of contributors you can visit the
 [contributors](https://github.com/bblimke/webmock/contributors) page.

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

@@ -112,10 +112,13 @@ if defined?(EventMachine::HttpRequest)
 
         uri.query = encode_query(@req.uri, options[:query]).slice(/\?(.*)/, 1)
 
+        body = options[:body] || options['body']
+        body = form_encode_body(body) if body.is_a?(Hash)
+
         WebMock::RequestSignature.new(
           method.downcase.to_sym,
           uri.to_s,
-          :body => (options[:body] || options['body']),
+          :body => body,
           :headers => (options[:head] || options['head'])
         )
       end

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

@@ -163,6 +163,8 @@ if defined?(EventMachine::HttpClient)
 
         uri.query = encode_query(@req.uri, query).slice(/\?(.*)/, 1)
 
+        body = form_encode_body(body) if body.is_a?(Hash)
+
         WebMock::RequestSignature.new(
           method.downcase.to_sym,
           uri.to_s,
@@ -198,4 +200,4 @@ if defined?(EventMachine::HttpClient)
       end
     end
   end
-end
+end

data/lib/webmock/version.rb

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

data/spec/em_http_request_spec.rb

@@ -126,6 +126,11 @@ unless RUBY_PLATFORM =~ /java/
       http_request(:get, "http://www.example.com/?x=3", :query => "a[]=b&a[]=c").body.should == "abc"
     end
 
+    it "should work when the body is passed as a Hash" do
+      stub_http_request(:post, "www.example.com").with(:body => {:a => "1", :b => "2"}).to_return(:body => "ok")
+      http_request(:post, "http://www.example.com", :body => {:a => "1", :b => "2"}).body.should == "ok"
+    end
+
     describe "mocking EM::HttpClient API" do
       before do
         stub_http_request(:get, "www.example.com/")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webmock
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.7.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-08-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &2157028660 !ruby/object:Gem::Requirement
+  requirement: &2160447620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -24,10 +24,10 @@ dependencies:
         version: 2.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *2157028660
+  version_requirements: *2160447620
 - !ruby/object:Gem::Dependency
   name: crack
-  requirement: &2157027840 !ruby/object:Gem::Requirement
+  requirement: &2160424420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: 0.1.7
   type: :runtime
   prerelease: false
-  version_requirements: *2157027840
+  version_requirements: *2160424420
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2157027140 !ruby/object:Gem::Requirement
+  requirement: &2160422500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *2157027140
+  version_requirements: *2160422500
 - !ruby/object:Gem::Dependency
   name: httpclient
-  requirement: &2157026140 !ruby/object:Gem::Requirement
+  requirement: &2160421560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: 2.1.5.2
   type: :development
   prerelease: false
-  version_requirements: *2157026140
+  version_requirements: *2160421560
 - !ruby/object:Gem::Dependency
   name: patron
-  requirement: &2157025680 !ruby/object:Gem::Requirement
+  requirement: &2160420320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: 0.4.9
   type: :development
   prerelease: false
-  version_requirements: *2157025680
+  version_requirements: *2160420320
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &2157025180 !ruby/object:Gem::Requirement
+  requirement: &2160418840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
         version: 0.2.14
   type: :development
   prerelease: false
-  version_requirements: *2157025180
+  version_requirements: *2160418840
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &2157024720 !ruby/object:Gem::Requirement
+  requirement: &2160400940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,10 +90,10 @@ dependencies:
         version: 0.7.8
   type: :development
   prerelease: false
-  version_requirements: *2157024720
+  version_requirements: *2160400940
 - !ruby/object:Gem::Dependency
   name: typhoeus
-  requirement: &2157024260 !ruby/object:Gem::Requirement
+  requirement: &2160400240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,10 +101,10 @@ dependencies:
         version: 0.2.4
   type: :development
   prerelease: false
-  version_requirements: *2157024260
+  version_requirements: *2160400240
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2157023800 !ruby/object:Gem::Requirement
+  requirement: &2160399300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -112,10 +112,10 @@ dependencies:
         version: 2.2.2
   type: :development
   prerelease: false
-  version_requirements: *2157023800
+  version_requirements: *2160399300
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2157023320 !ruby/object:Gem::Requirement
+  requirement: &2160398420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -123,7 +123,7 @@ dependencies:
         version: 3.5.0
   type: :development
   prerelease: false
-  version_requirements: *2157023320
+  version_requirements: *2160398420
 description: WebMock allows stubbing HTTP requests and setting expectations on HTTP
   requests.
 email: