webmock 0.8.0 → 0.8.1

data/CHANGELOG

@@ -1,3 +1,11 @@
+== 0.8.1
+  * Fixed HTTPClient adapter compatibility with Ruby 1.8.6 (reported by Piotr Usewicz)
+  * Net:HTTP adapter now handles request body assigned as Net::HTTP::Post#body attribute (fixed by Mack Earnhardt)
+  * Fixed issue where requests were not matching stubs with Accept header set.(reported by Piotr Usewicz)
+  * Fixed compatibility with Ruby 1.9.1, 1.9.2 and JRuby 1.3.1 (reported by Diego E. “Flameeyes” Pettenò)
+  * Fixed issue with response body declared as IO object and multiple requests (reported by Niels Meersschaert)
+  * Fixed "undefined method `assertion_failure'" error (reported by Nick Plante)
+
 == 0.8.0
 
   * Support for HTTPClient (sync and async requests)

data/VERSION

@@ -1 +1 @@
-0.8.0
+0.8.1

data/lib/webmock/adapters/rspec.rb

@@ -14,7 +14,6 @@ Spec::Runner.configure { |config|
 }
 
 module WebMock
-  private
   def assertion_failure(message)
     raise Spec::Expectations::ExpectationNotMetError.new(message)
   end

data/lib/webmock/adapters/test_unit.rb

@@ -16,9 +16,9 @@ class Test::Unit::TestCase
 end
 
 module WebMock
-  private
+  AssertionFailedError = Test::Unit::AssertionFailedError rescue MiniTest::Assertion # ruby1.9 compat
   def assertion_failure(message)
-    raise Test::Unit::AssertionFailedError.new(message)
+    raise AssertionFailedError.new(message)
   end
 end
 

data/lib/webmock/http_lib_adapters/httpclient.rb

@@ -27,7 +27,7 @@ if defined?(HTTPClient)
         end
       else
         message = "Real HTTP connections are disabled. Unregistered request: #{request_signature}"
-        assertion_failure(message)
+        WebMock.assertion_failure(message)
       end
     end
 
@@ -39,7 +39,7 @@ if defined?(HTTPClient)
         do_request_async_without_webmock(method, uri, query, body, extheader)
       else
         message = "Real HTTP connections are disabled. Unregistered request: #{request_signature}"
-        assertion_failure(message)
+        WebMock.assertion_failure(message)
       end
     end
 
@@ -76,7 +76,7 @@ if defined?(HTTPClient)
     auth = www_auth.basic_auth
     auth.challenge(req.header.request_uri, nil)
 
-    headers = Hash[req.header.all]
+    headers = Hash[*req.header.all.flatten]
 
     if (auth_cred = auth.get(req)) && auth.scheme == 'Basic'
       userinfo = WebMock::Util::Headers.decode_userinfo_from_header(auth_cred)

data/lib/webmock/http_lib_adapters/net_http.rb

@@ -69,10 +69,14 @@ module Net  #:nodoc: all
       method = request.method.downcase.to_sym
 
       headers = Hash[*request.to_hash.map {|k,v| [k, v.flatten]}.flatten]
-      headers.reject! {|k,v| k =~ /[Aa]ccept/ && v = '*/*'} #removing header added by Net::HTTP
+      
+      remove_default_net_http_headers!(headers)
+      
       headers.reject! {|k,v| k =~ /[Aa]uthorization/ && v =~ /^Basic / } #we added it to url userinfo
 
-      request_signature = WebMock::RequestSignature.new(method, uri, :body => body, :headers => headers)
+      request.set_body_internal body
+
+      request_signature = WebMock::RequestSignature.new(method, uri, :body => request.body, :headers => headers)
 
       WebMock::RequestRegistry.instance.requested_signatures.put(request_signature)
 
@@ -85,7 +89,7 @@ module Net  #:nodoc: all
         request_without_webmock(request, body, &block)
       else
         message = "Real HTTP connections are disabled. Unregistered request: #{request_signature}"
-        assertion_failure(message)
+        WebMock.assertion_failure(message)
       end
     end
     alias_method :request_without_webmock, :request
@@ -117,6 +121,16 @@ module Net  #:nodoc: all
 
       response
     end
+    
+    def remove_default_net_http_headers!(headers)
+      default_request = Net::HTTPGenericRequest.new('','','','/')
+      default_net_http_headers = Hash[*default_request.to_hash.map {|k,v|
+         [k, v.flatten]
+      }.flatten]
+      headers.reject! {|k,v| default_request[k] == v}
+      headers
+    end
+    
   end
 
 end

data/lib/webmock/response.rb

@@ -13,12 +13,8 @@ module WebMock
 
     def body
       return '' unless @options.has_key?(:body)
-      case @options[:body]
-      when IO
-        @options[:body].read
-      when String
-        @options[:body]
-      end
+      stringify_body!
+      @options[:body]
     end
 
     def status
@@ -30,6 +26,7 @@ module WebMock
     end
 
     def dup
+      stringify_body!
       dup_response = super
       dup_response.options = options.dup
       dup_response
@@ -39,5 +36,11 @@ module WebMock
       options == other.options
     end
 
+    def stringify_body!
+      if @options[:body].is_a?(IO)
+        @options[:body] = @options[:body].read
+      end
+    end
+
   end
 end

data/lib/webmock/util/uri.rb

@@ -16,7 +16,7 @@ module WebMock
         return uri if uri.is_a?(Regexp)
         uri = 'http://' + uri unless uri.match('^https?://') if uri.is_a?(String)
         normalized_uri = Addressable::URI.heuristic_parse(uri)
-        normalized_uri.query_values = normalized_uri.query_values if normalized_uri.query_values
+        normalized_uri.query_values = Hash[*normalized_uri.query_values.sort.flatten] if normalized_uri.query_values
         normalized_uri.normalize!
         normalized_uri.port = normalized_uri.inferred_port unless normalized_uri.port
         normalized_uri

data/lib/webmock/webmock.rb

@@ -48,8 +48,6 @@ module WebMock
     WebMock::RequestRegistry.instance.reset_webmock
   end
   
-  private
-  
   def assertion_failure(message)
     raise message
   end

data/spec/httpclient_spec_helper.rb

@@ -19,7 +19,7 @@ module HTTPClientSpecHelper
     end
     OpenStruct.new({
       :body => HTTPClientSpecHelper.async_mode ? response.content.read : response.content,
-      :headers => Hash[response.header.all],
+      :headers => Hash[*response.header.all.flatten],
       :status => response.code.to_s })
   end
 

data/spec/net_http_spec.rb

@@ -13,7 +13,7 @@ describe "Webmock with Net:HTTP" do
     stub_http_request(:get, "www.example.com").to_return(:body => "abc"*100000)
     Net::HTTP.start("www.example.com") { |query| query.get("/") }.body.should == "abc"*100000
   end
-  
+
   it "should yield block on response" do
     stub_http_request(:get, "www.example.com").to_return(:body => "abc")
     response_body = ""
@@ -22,4 +22,21 @@ describe "Webmock with Net:HTTP" do
     end
     response_body.should == "abc"
   end
+
+  it "should handle Net::HTTP::Post#body" do
+    stub_http_request(:post, "www.example.com").with(:body => "my_params").to_return(:body => "abc")
+    req = Net::HTTP::Post.new("/")
+    req.body = "my_params"
+    Net::HTTP.start("www.example.com") { |http| http.request(req)}.body.should == "abc"
+  end
+
+  it "should behave like Net::HTTP and raise error if both request body and body argument are set" do
+    stub_http_request(:post, "www.example.com").with(:body => "my_params").to_return(:body => "abc")
+    req = Net::HTTP::Post.new("/")
+    req.body = "my_params"
+    lambda {
+      Net::HTTP.start("www.example.com") { |http| http.request(req, "my_params")}
+    }.should raise_error("both of body argument and HTTPRequest#body set")
+  end
+
 end

data/spec/net_http_spec_helper.rb

@@ -46,8 +46,9 @@ module NetHTTPSpecHelper
     # Request/response handling
     request_parts = ["#{options[:method]} #{options[:path]} HTTP/1.1", "Host: #{options[:host]}"]
     socket.should_receive(:write).with(/#{request_parts[0]}.*#{request_parts[1]}.*/m).and_return(100)
-
-    socket.should_receive(:sysread).once.and_return("HTTP/1.1 #{options[:response_code]} #{options[:response_message]}\nContent-Length: #{options[:response_body].length}\n\n#{options[:response_body]}")
-    socket.should_receive(:sysread).any_number_of_times.and_raise(EOFError)
+    
+    read_method = RUBY_VERSION >= "1.9.2" ? :read_nonblock : :sysread
+    socket.should_receive(read_method).once.and_return("HTTP/1.1 #{options[:response_code]} #{options[:response_message]}\nContent-Length: #{options[:response_body].length}\n\n#{options[:response_body]}")
+    socket.should_receive(read_method).any_number_of_times.and_raise(EOFError)
   end
 end

data/spec/other_net_http_libs_spec.rb

@@ -11,7 +11,7 @@ describe "loading other Net::HTTP based libraries" do
     load_path_opts = vendor_dirs.unshift(webmock_dir).map { |dir| "-I#{dir}" }.join(" ")
 
     # TODO: use the same Ruby executable that this test was invoked with
-    `ruby #{load_path_opts} -e "#{requires}; #{additional_code}" 2>&1`
+    `ruby #{load_path_opts} -e "#{requires}; #{additional_code}" 2>&1 | cat`
   end
 
   it "should requiring samuel before webmock prints warning" do

data/spec/response_spec.rb

@@ -60,6 +60,12 @@ describe Response do
       @response.body.should == File.new(__FILE__).read
     end
     
+    it "should report many times content of a IO object if provided" do
+      @response = Response.new(:body => File.new(__FILE__))
+      @response.body.should == File.new(__FILE__).read
+      @response.body.should == File.new(__FILE__).read
+    end
+    
   end
   
 end

data/spec/webmock_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 unless defined? SAMPLE_HEADERS
-  SAMPLE_HEADERS = { "Content-Length" => "8888" }
+  SAMPLE_HEADERS = { "Content-Length" => "8888", "Accept" => "application/json" }
   ESCAPED_PARAMS = "x=ab%2Bc&z=%27Stop%21%27%20said%20Fred"
   NOT_ESCAPED_PARAMS = "z='Stop!' said Fred&x=ab c"
 end
@@ -136,7 +136,6 @@ describe "WebMock", :shared => true do
           :headers => SAMPLE_HEADERS).status.should == "200"
       end
 
-
       it "should not match requests if headers are different" do
         stub_http_request(:get, "www.example.com").with(:headers => SAMPLE_HEADERS)
 
@@ -146,6 +145,16 @@ describe "WebMock", :shared => true do
           :headers => { 'Content-Length' => '9999'})
         }.should fail_with(%q(Real HTTP connections are disabled. Unregistered request: GET http://www.example.com/ with headers {'Content-Length'=>'9999'}))
       end
+      
+      it "should not match if accept header is different" do
+        stub_http_request(:get, "www.example.com").
+          with(:headers => { 'Accept' => 'application/json'})
+        lambda {
+          http_request(
+            :get, "http://www.example.com/",
+            :headers => { 'Accept' => 'application/xml'})
+        }.should fail_with(%q(Real HTTP connections are disabled. Unregistered request: GET http://www.example.com/ with headers {'Accept'=>'application/xml'}))  
+      end
     end
 
     describe "with basic authentication" do
@@ -211,6 +220,17 @@ describe "WebMock", :shared => true do
         http_request(:get, "http://www.example.com/").status.should == "500"
       end
 
+      it "should return body declared as IO" do
+        stub_http_request(:get, "www.example.com").to_return(:body => File.new(__FILE__))
+        http_request(:get, "http://www.example.com/").body.should == File.new(__FILE__).read
+      end
+
+      it "should return body declared as IO if requested many times" do
+        stub_http_request(:get, "www.example.com").to_return(:body => File.new(__FILE__))
+        2.times do
+          http_request(:get, "http://www.example.com/").body.should == File.new(__FILE__).read
+        end
+      end
 
       describe "dynamic responses" do
         

data/test/test_helper.rb

@@ -8,6 +8,6 @@ require 'test/unit'
 include WebMock
 
 def assert_fail(message, &block)
-  e = assert_raise(Test::Unit::AssertionFailedError, &block)
+  e = assert_raise(AssertionFailedError, &block)
   assert_equal(message, e.message)
 end

data/webmock.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{webmock}
-  s.version = "0.8.0"
+  s.version = "0.8.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bartosz Blimke"]
-  s.date = %q{2009-12-11}
+  s.date = %q{2010-01-14}
   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,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-11 00:00:00 +00:00
+date: 2010-01-14 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency