em-net-http 0.3.6 → 0.3.7

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://secure.travis-ci.org/jfairbairn/em-net-http.png)](http://travis-ci.org/jfairbairn/em-net-http])
+
 Most Ruby web API libraries use <tt>Net::HTTP</tt> (because it's ubiquitous),
 but I want to use them in my non-blocking EventMachine-based applications, and
 I don't want Net::HTTP to block. I therefore wrote this.

data/em-net-http.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{em-net-http}
-  s.version = "0.3.6"
+  s.version = "0.3.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Fairbairn"]

data/lib/em-net-http.rb

@@ -9,7 +9,7 @@ module EventMachine
     class Response
       attr_reader :code, :body, :header, :message, :http_version
       alias_method :msg, :message
-    
+
       def initialize(response_header)
         @code = response_header.http_status.to_s
         @message = response_header.http_reason
@@ -21,23 +21,23 @@ module EventMachine
         @already_buffered = true
         @body = body
       end
-    
+
       def content_type
         self['content-type']
       end
-    
+
       def [](k)
         @header[key(k)]
       end
-    
+
       def key?(k)
         @header.key? key(k)
       end
-    
+
       def read_body(dest=nil,&block)
         @body
       end
-    
+
       def to_hash
         h={}
         @header.each do |k, v|
@@ -45,32 +45,32 @@ module EventMachine
         end
         h
       end
-      
+
       private
       def key(k)
         k.upcase.tr('-','_')
       end
-    
+
       def fromkey(k)
         k.tr('_', '-').split('-').map{|i|i.capitalize}.join('-')
       end
-    
+
       include Enumerable
       def each(&blk)
         @header.each(&blk)
       end
-    
+
     end
   end
 end
-  
+
 
 module Net
   class HTTPResponse
     class << self
       public :response_class
     end
-    
+
     alias_method :orig_net_http_read_body, :read_body
 
     def read_body(dest=nil, &block)
@@ -98,19 +98,19 @@ module Net
       end
     end
   end
-  
+
   class HTTP
     alias_method :orig_net_http_request, :request
-    
+
     alias_method :orig_net_http_do_start, :do_start
-    
+
     def do_start
 
       return orig_net_http_do_start unless ::EM.reactor_running?
 
       @started = true
     end
-    
+
     def request(req, body = nil, &block)
 
       return orig_net_http_request(req, body, &block) unless ::EM.reactor_running?
@@ -133,7 +133,7 @@ module Net
       end
 
       headers['content-type'] ||= "application/x-www-form-urlencoded"
-      
+
       t0 = Time.now
       httpreq = EM::HttpRequest.new(uri).send(req.class::METHOD.downcase.to_sym, opts)
 
@@ -152,7 +152,7 @@ module Net
         f.resume nhres
       end
 
-      
+
       if block_given?
         httpreq.headers { |headers|
 
@@ -164,8 +164,9 @@ module Net
           end
           f.resume nhres
         }
+        httpreq.errback {|err|f.resume(:error)}
 
-        nhres = Fiber.yield
+        nhres = yield_with_error_check
         nhres.instance_variable_set :@httpreq, httpreq
 
         yield nhres
@@ -173,17 +174,24 @@ module Net
       else
         httpreq.callback &convert_em_http_response
         httpreq.errback {|err|f.resume(:error)}
-        res = Fiber.yield
 
-        if res == :error
-          raise 'EM::HttpRequest error - request timed out' if Time.now - self.read_timeout > t0
-          raise 'EM::HttpRequest error - unknown error'
-        end
+        yield_with_error_check
+      end
+    end
+
+    private
 
-        res
+    def yield_with_error_check
+      res = Fiber.yield
+
+      if res == :error
+        raise 'EM::HttpRequest error - request timed out' if Time.now - self.read_timeout > t0
+        raise 'EM::HttpRequest error - unknown error'
       end
+
+      res
     end
-    
+
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-net-http
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-12 00:00:00.000000000Z
+date: 2011-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70106516929060 !ruby/object:Gem::Requirement
+  requirement: &70245767732660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70106516929060
+  version_requirements: *70245767732660
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70106516928320 !ruby/object:Gem::Requirement
+  requirement: &70245767732080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.12.10
   type: :runtime
   prerelease: false
-  version_requirements: *70106516928320
+  version_requirements: *70245767732080
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70106516927800 !ruby/object:Gem::Requirement
+  requirement: &70245767731500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70106516927800
+  version_requirements: *70245767731500
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70106516927300 !ruby/object:Gem::Requirement
+  requirement: &70245767730920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.2.10
   type: :runtime
   prerelease: false
-  version_requirements: *70106516927300
+  version_requirements: *70245767730920
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70106516926680 !ruby/object:Gem::Requirement
+  requirement: &70245767730220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *70106516926680
+  version_requirements: *70245767730220
 - !ruby/object:Gem::Dependency
   name: mimic
-  requirement: &70106516926100 !ruby/object:Gem::Requirement
+  requirement: &70245767727780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.3.0
   type: :development
   prerelease: false
-  version_requirements: *70106516926100
+  version_requirements: *70245767727780
 - !ruby/object:Gem::Dependency
   name: weary
-  requirement: &70106516925520 !ruby/object:Gem::Requirement
+  requirement: &70245767727120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70106516925520
+  version_requirements: *70245767727120
 description: Monkeypatching Net::HTTP to use em-http-request under the hood.
 email: james@netlagoon.com
 executables: []
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Non-blocking replacement for Net::HTTP, for use in EventMachine