astro-em-http-request 0.1.12 → 0.1.13

data/lib/em-http/client.rb

@@ -38,7 +38,8 @@ module EventMachine
 
     # Length of content as an integer, or nil if chunked/unspecified
     def content_length
-      Integer(self[HttpClient::CONTENT_LENGTH]) rescue nil
+      @content_length ||= ((s = self[HttpClient::CONTENT_LENGTH]) &&
+                           (s =~ /^(\d+)$/)) ? $1.to_i : nil
     end
 
     # Cookie header from the server
@@ -380,17 +381,11 @@ module EventMachine
       if @response_header.chunked_encoding?
         @state = :chunk_header
       elsif @response_header.content_length
-        if @response_header.content_length > 0
-          @state = :body
-          @bytes_remaining = @response_header.content_length 
-        else
-          @state = :body
-          @bytes_remaining = nil
-        end
+        @state = :body
+        @bytes_remaining = @response_header.content_length 
       else
-        @state = :invalid
-        on_error "no HTTP response"
-        return false
+        @state = :body
+        @bytes_remaining = nil
       end
 
       if decoder_class = HttpDecoders.decoder_for_encoding(response_header[CONTENT_ENCODING])

data/lib/em-http/request.rb

@@ -72,10 +72,10 @@ module EventMachine
           c.options = options
           if options.has_key?(:timeout) && options[:timeout]
             c.comm_inactivity_timeout = options[:timeout]
-            c.pending_connect_timeout = options[:timeout]
+            c.pending_connect_timeout = options[:timeout] if c.respond_to?(:pending_connect_timeout)
           elsif options.has_key?(:timeout)
             c.comm_inactivity_timeout = 5
-            c.pending_connect_timeout = 5
+            c.pending_connect_timeout = 5 if c.respond_to?(:pending_connect_timeout)
           end
         }
       rescue RuntimeError => e 

data/test/test_request.rb

@@ -365,6 +365,7 @@ describe EventMachine::HttpRequest do
         http.errback { failed }
         http.callback {
           http.response.should match(/Foo/)
+          http.response_header['CONTENT_LENGTH'].should_not == 0
 
           @s.stop
           EventMachine.stop

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: astro-em-http-request
 version: !ruby/object:Gem::Version 
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors: 
 - Ilya Grigorik
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-20 00:00:00 +02:00
+date: 2009-10-21 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.12.9
+        version: 0.12.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: addressable