webmock 1.6.1 → 1.6.2

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 #Changelog
 
+## 1.6.2
+
+* Em-http-request adapter sets `last_effective_url` property. Thanks to [Sam Stokes](https://github.com/samstokes).
+
+* Curb adapter supports `Curb::Easy#http_post` and `Curb::Easy#http_put` without arguments (by setting `post_body` or `put_data` beforehand). Thanks to [Eugene Bolshakov](https://github.com/eugenebolshakov)
+
 ## 1.6.1
 
 * Fixed issue with `webmock/rspec` which didn't load correctly if `rspec/core` was already required but `rspec/expectations` not.

data/README.md

@@ -21,7 +21,7 @@ Supported HTTP libraries
 * HTTPClient
 * Patron
 * EM-HTTP-Request
-* Curb
+* Curb (currently only Curb::Easy)
 
 ##Installation
 
@@ -544,6 +544,8 @@ People who submitted patches and new features or suggested improvements. Many th
 * Pete Higgins
 * Hans de Graaff
 * Alastair Brunton
+* Sam Stokes
+* Eugene Bolshakov
 
 ## Background
 

data/VERSION

@@ -1 +1 @@
-1.6.1
+1.6.2

data/lib/webmock/http_lib_adapters/curb.rb

@@ -117,9 +117,9 @@ if defined?(Curl)
         alias_method "http_#{verb}", "http_#{verb}_with_webmock"
       end
 
-      def http_put_with_webmock data
+      def http_put_with_webmock data = nil
         @webmock_method = :put
-        @put_data = data
+        @put_data = data if data
         curb_or_webmock do
           http_put_without_webmock(data)
         end
@@ -127,9 +127,9 @@ 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
+      def http_post_with_webmock data = nil
         @webmock_method = :post
-        @post_body = data
+        @post_body = data if data
         curb_or_webmock do
           http_post_without_webmock(data)
         end

data/lib/webmock/http_lib_adapters/em_http_request.rb

@@ -10,7 +10,7 @@ if defined?(EventMachine::HttpRequest)
       class WebMockHttpClient < EventMachine::HttpClient
 
         def setup(response, uri, error = nil)
-          @uri = uri
+          @last_effective_url = @uri = uri
           if error
             on_error(error)
             fail(self)

data/spec/curb_spec.rb

@@ -153,6 +153,24 @@ unless RUBY_PLATFORM =~ /java/
     describe "using #http_* methods for requests" do
       it_should_behave_like "Curb"
       include CurbSpecHelper::NamedHttp
+
+      it "should work with blank arguments for post" do
+        stub_http_request(:post, "www.example.com").with(:body => "01234")
+        c = Curl::Easy.new
+        c.url = "http://www.example.com"
+        c.post_body = "01234"
+        c.http_post
+        c.response_code.should == 200
+      end
+
+      it "should work with blank arguments for put" do
+        stub_http_request(:put, "www.example.com").with(:body => "01234")
+        c = Curl::Easy.new
+        c.url = "http://www.example.com"
+        c.put_data = "01234"
+        c.http_put
+        c.response_code.should == 200
+      end
     end
 
     describe "using #perform for requests" do

data/spec/em_http_request_spec.rb

@@ -30,5 +30,26 @@ unless RUBY_PLATFORM =~ /java/
       http_request(:get, "http://www.example.com/?x=3", :query => "a[]=b&a[]=c").body.should == "abc"
     end
 
+    describe "mocking EM::HttpClient API" do
+      before { stub_http_request(:get, "www.example.com/") }
+      subject do
+        client = nil
+        EM.run do
+          client = EventMachine::HttpRequest.new('http://www.example.com/').get
+          client.callback { EM.stop }
+          client.errback { failed }
+        end
+        client
+      end
+
+      it 'should support #uri' do
+        subject.uri.should == Addressable::URI.parse('http://www.example.com/')
+      end
+
+      it 'should support #last_effective_url' do
+        subject.last_effective_url.should == Addressable::URI.parse('http://www.example.com/')
+      end
+    end
+
   end
 end

data/webmock.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{webmock}
-  s.version = "1.6.1"
+  s.version = "1.6.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bartosz Blimke"]
-  s.date = %q{2010-11-13}
+  s.date = %q{2011-01-12}
   s.description = %q{WebMock allows stubbing HTTP requests and setting expectations on HTTP requests.}
   s.email = %q{bartosz.blimke@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 1
   - 6
-  - 1
-  version: 1.6.1
+  - 2
+  version: 1.6.2
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-13 00:00:00 +00:00
+date: 2011-01-12 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency