webmock 1.3.0 → 1.3.1

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 #Changelog
 
+## 1.3.1
+
+* The less hacky way to get the stream behaviour working for em-http-request. Thanks to Martyn Loughran
+
+* Fixed issues where Net::HTTP was not accepting valid nil response body. Thanks to Muness Alrubaie
+
 ## 1.3.0
 
 * Added support for [em-http-request](http://github.com/igrigorik/em-http-request)
@@ -13,6 +19,7 @@
 	 	 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").
@@ -51,7 +58,7 @@
     
 		stub_request(:any, 'www.example.net').to_raise("some error")
 
-* Matching request stubs based on a URI is 30% faster
+* Matching requests based on a URI is 30% faster
 
 * Fixed constant namespace issues in HTTPClient adapter. Thanks to Nathaniel Bibler for submitting a patch.
 

data/README.md

@@ -498,6 +498,8 @@ People who submitted patches and new features or suggested improvements. Many th
 * Razic
 * Steve Tooke
 * Nathaniel Bibler
+* Martyn Loughran
+* Muness Alrubaie
 
 ## Background
 

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.3.1

data/lib/webmock/http_lib_adapters/em_http_request.rb

@@ -11,14 +11,16 @@ if defined?(EventMachine::HttpRequest)
             on_error(error)
             fail(self)
           else
-            receive_data(response)
-            succeed(self)
+            EM.next_tick do
+              receive_data(response)
+              succeed(self)
+            end
           end
         end
         
-        def stream(&blk)
-          blk.call(@response)
-        end
+        # def stream(&blk)
+          # blk.call(@response)
+        # end
 
         def unbind
         end

data/lib/webmock/http_lib_adapters/net_http_response.rb

@@ -19,6 +19,7 @@ module WebMock
         object.instance_variable_set(:@__orig_body__,
           case body_object
             when String then body_object
+            when nil then nil
             else raise ArgumentError.new("Unexpected body object: #{body_object}")
           end
         )

data/spec/em_http_request_spec_helper.rb

@@ -21,17 +21,10 @@ module EMHttpRequestSpecHelper
         error = http.errors         
         failed 
       }
-      headers = {}
-      if http.response_header
-        http.response_header.each do |k,v|
-          v = v.join(", ") if v.is_a?(Array)
-          headers[k] = v 
-        end
-      end
-      http.callback {
+      http.callback {    
         response = OpenStruct.new({
           :body => http.response,
-          :headers => WebMock::Util::Headers.normalize_headers(headers),          
+          :headers => WebMock::Util::Headers.normalize_headers(extract_response_headers(http)),          
           :message => http.response_header.http_reason,
           :status => http.response_header.status.to_s
         })
@@ -60,5 +53,18 @@ module EMHttpRequestSpecHelper
   def http_library
     :em_http_request
   end
+  
+  private
+  
+  def extract_response_headers(http)
+    headers = {}
+    if http.response_header
+      http.response_header.each do |k,v|
+        v = v.join(", ") if v.is_a?(Array)
+        headers[k] = v 
+      end
+    end
+    headers
+  end
 
 end

data/webmock.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{webmock}
-  s.version = "1.3.0"
+  s.version = "1.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bartosz Blimke"]
-  s.date = %q{2010-06-21}
+  s.date = %q{2010-07-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 = [
@@ -89,7 +89,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/bblimke/webmock}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Library for stubbing HTTP requests in Ruby.}
   s.test_files = [
     "spec/benchmark.rb",
@@ -127,7 +127,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<addressable>, [">= 2.1.1"])
       s.add_runtime_dependency(%q<crack>, [">= 0.1.7"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 3
-  - 0
-  version: 1.3.0
+  - 1
+  version: 1.3.1
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -14,14 +14,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-21 00:00:00 +01:00
+date: 2010-07-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: addressable
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -36,7 +35,6 @@ dependencies:
   name: crack
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -51,7 +49,6 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -66,7 +63,6 @@ dependencies:
   name: httpclient
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -82,7 +78,6 @@ dependencies:
   name: patron
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -97,7 +92,6 @@ dependencies:
   name: em-http-request
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -186,7 +180,6 @@ files:
 - test/test_helper.rb
 - test/test_webmock.rb
 - webmock.gemspec
-- spec/benchmark.rb
 has_rdoc: true
 homepage: http://github.com/bblimke/webmock
 licenses: []
@@ -197,7 +190,6 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -205,7 +197,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -215,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Library for stubbing HTTP requests in Ruby.