webmock 1.3.1 → 1.3.2

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 #Changelog
 
+## 1.3.2
+
+* Fixed compatibility with EM-HTTP-Request >= 0.2.9. Thanks to Myron Marston for reporting the issue.
+
 ## 1.3.1
 
 * The less hacky way to get the stream behaviour working for em-http-request. Thanks to Martyn Loughran

data/README.md

@@ -22,20 +22,23 @@ Supported HTTP libraries
 * Patron
 * EM-HTTP-Request
 
-Installation
-------------
+##Installation
 
     gem install webmock --source http://gemcutter.org
 
-In your `test/test_helper.rb` add these two lines:
+### Test::Unit 
 
-    require 'webmock/test_unit'
+Add the following code to `test/test_helper.rb`
+
+	require 'webmock/test_unit'
 	
 	class Test::Unit::TestCase
-	  include WebMock
+	  config.include WebMock
 	end
 
-or if you use RSpec add these lines to `spec/spec_helper`:
+### RSpec
+	
+Add the following code to `spec/spec_helper`:
 
 	require 'webmock/rspec'
 
@@ -43,11 +46,33 @@ or if you use RSpec add these lines to `spec/spec_helper`:
 	  config.include WebMock
 	end
 
-You can also use WebMock without RSpec or Test::Unit support:
+### RSpec 2
 
-	require 'webmock'
+Add the following code to `spec/spec_helper`:
 
+	require 'webmock/rspec'
+	
+	RSpec.configure do |config|
+	  config.include WebMock
+	end
+
+### Cucumber
+
+Add the following code to `features/support/env.rb`
+
+	require 'webmock/rspec'  
+	module WebMockWorld
+	  include WebMock
+	  include WebMock::Matchers
+	end
+
+	World(WebMockWorld)
+
+You can also use WebMock outside a test framework:
+
+	require 'webmock'
 	include WebMock
+	include WebMock::Matchers
 
 ## Examples
 

data/VERSION

@@ -1 +1 @@
-1.3.1
+1.3.2

data/lib/webmock/http_lib_adapters/em_http_request.rb

@@ -18,13 +18,11 @@ if defined?(EventMachine::HttpRequest)
           end
         end
         
-        # def stream(&blk)
-          # blk.call(@response)
-        # end
-
         def unbind
         end
 
+        def close_connection
+        end
       end
 
       def send_request_with_webmock(&block)
@@ -72,22 +70,31 @@ if defined?(EventMachine::HttpRequest)
       end
 
       def build_request_signature
-        
-        if @options[:authorization] || @options['authorization']
-          auth = (@options[:authorization] || @options['authorization'])
+        if @req
+          options = @req.options
+          method = @req.method
+          uri = @req.uri
+        else
+          options = @options
+          method = @method
+          uri = @uri
+        end  
+
+        if options[:authorization] || options['authorization']
+          auth = (options[:authorization] || options['authorization'])
           userinfo = auth.join(':')
           userinfo = WebMock::Util::URI.encode_unsafe_chars_in_userinfo(userinfo)
-          @options.reject! {|k,v| k.to_s == 'authorization' } #we added it to url userinfo
-          @uri.userinfo = userinfo
+          options.reject! {|k,v| k.to_s == 'authorization' } #we added it to url userinfo
+          uri.userinfo = userinfo
         end
         
-       @uri.query_values = (@uri.query_values || {}).merge(@options[:query]) if @options[:query]
+       uri.query_values = (uri.query_values || {}).merge(options[:query]) if options[:query]
         
         WebMock::RequestSignature.new(
-          @method.downcase.to_sym,
-          @uri.to_s,
-          :body => (@options[:body] || @options['body']),
-          :headers => (@options[:head] || @options['head'])
+          method.downcase.to_sym,
+          uri.to_s,
+          :body => (options[:body] || options['body']),
+          :headers => (options[:head] || options['head'])
         )
       end
 

data/spec/em_http_request_spec_helper.rb

@@ -18,7 +18,11 @@ module EMHttpRequestSpecHelper
         'authorization' => [uri.user, uri.password],
         :head => options[:headers]}, &block)
       http.errback {
-        error = http.errors         
+        error = if http.respond_to?(:errors)
+          http.errors         
+        else
+          http.error
+        end  
         failed 
       }
       http.callback {    

data/webmock.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{webmock}
-  s.version = "1.3.1"
+  s.version = "1.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bartosz Blimke"]
-  s.date = %q{2010-07-12}
+  s.date = %q{2010-07-23}
   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 = [
@@ -92,8 +92,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{Library for stubbing HTTP requests in Ruby.}
   s.test_files = [
-    "spec/benchmark.rb",
-     "spec/em_http_request_spec.rb",
+    "spec/em_http_request_spec.rb",
      "spec/em_http_request_spec_helper.rb",
      "spec/httpclient_spec.rb",
      "spec/httpclient_spec_helper.rb",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 3
-  - 1
-  version: 1.3.1
+  - 2
+  version: 1.3.2
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-12 00:00:00 +01:00
+date: 2010-07-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -211,7 +211,6 @@ signing_key:
 specification_version: 3
 summary: Library for stubbing HTTP requests in Ruby.
 test_files: 
-- spec/benchmark.rb
 - spec/em_http_request_spec.rb
 - spec/em_http_request_spec_helper.rb
 - spec/httpclient_spec.rb

data/spec/benchmark.rb

@@ -1,61 +0,0 @@
-# require 'rubygems'
-require 'benchmark'
-require 'net/http'
-# require 'fakeweb'
-require 'spec/spec_helper'
-
-def http_request
-  res = Net::HTTP.get_response(URI.parse('http://example.com'))
-  raise "Body should be 'Hello'" unless res.body == 'Hello'
-end
-
-def fakeweb
-  FakeWeb.register_uri(:get, 'http://example.com', :body => 'Hello')
-  yield
-ensure
-  FakeWeb.clean_registry
-end
-
-def webmock
-  WebMock.stub_request(:get, 'http://example.com').to_return(:body => 'Hello')
-  yield
-ensure
-  WebMock.reset_webmock
-end
-
-def perform_benchmark(name)
-  puts "\n\nBenchmarking #{name}:"
-  Benchmark.benchmark do |b|
-    %w(webmock).each do |type|
-      b.report(type) do
-        # this is a bit convoluted, but we want to ensure that each benchmark runs without the other library loaded,
-        # so we fork off a sub-process before requiring the libraries.
-        Process.fork do
-          require type
-          yield type
-        end
-        Process.wait
-      end
-    end
-  end
-end
-
-n = 5000
-perform_benchmark("Single setup/teardown") do |type|
-  send(type) { n.times { http_request } }
-end
-
-perform_benchmark("Setup/teardown for each http request") do |type|
-  n.times { send(type) { http_request } }
-end
-
-# Output on my machine:
-#
-# Benchmarking Single setup/teardown:
-# webmock  0.000000   0.000000  18.830000 ( 19.350281)
-# fakeweb  0.000000   0.000000   1.930000 (  2.049569)
-# 
-# 
-# Benchmarking Setup/teardown for each http request:
-# webmock  0.000000   0.000000  21.350000 ( 21.795557)
-# fakeweb  0.000000   0.000000   2.490000 (  2.707574)