astro-em-http-request 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/em-http/client.rb

@@ -198,7 +198,14 @@ module EventMachine
 
     # start HTTP request once we establish connection to host
     def connection_completed
+      if @options[:max_connection_duration] 
+        EM.add_timer(@options[:max_connection_duration]) {
+          @aborted = true
+          on_error("Max Connection Duration Exceeded (#{@options[:max_connection_duration]}s.)")
+        }
+      end
       ssl = @options[:tls] || @options[:ssl] || {}
+      @bytes_received = 0
       start_tls(ssl) if @uri.scheme == "https" #or @uri.port == 443 # A user might not want https even on port 443.
 
       send_request_header
@@ -276,8 +283,13 @@ module EventMachine
     end
 
     def receive_data(data)
-      @data << data
-      dispatch
+      @bytes_received += data.size
+      if @options[:max_bytes].nil? or @options[:max_bytes] > @bytes_received
+        @data << data
+        dispatch
+      else
+        on_error("Bytes received exceeds limit (#{@bytes_received} vs. #{ @options[:max_bytes]})")
+      end
     end
 
     # Called when part of the body has been read
@@ -302,7 +314,12 @@ module EventMachine
     end
 
     def unbind
-      if @state == :finished || (@state == :body && @bytes_remaining.nil?)
+      if @state == :finished || (
+          @state == :body && 
+          @bytes_remaining.nil? && 
+          (!@options[:max_bytes] or @bytes_received < @options[:max_bytes]) &&
+          (!@options[:max_connection_duration] or !@aborted)
+        )
         succeed(self) 
       else
         fail(self)

data/lib/em-http/request.rb

@@ -48,6 +48,16 @@ module EventMachine
     #   host: String
     #     Manually specify TCP connect host address, independent of
     #     Host: header
+    #
+    #   max_bytes: Integer
+    #     Explictly specify a maximum number of bytes that this connection may receive before shutting down.
+    #     Default : none.
+    #
+    #   max_connection_duration: Integer
+    #     Explictly specify a maximum number of second for the connection. This is useful to avoid dealing with never ending connections (AtomStream-like)
+    #     Default : none.
+    #
+    
 
     def get  options = {};    send_request(:get,  options);    end
     def head options = {};    send_request(:head, options);    end

data/test/test_request.rb

@@ -444,4 +444,27 @@ describe EventMachine::HttpRequest do
         }
       }
   end
+
+  it "should return an error if the response size exceeds the :max_bytes option" do
+     EventMachine.run {
+        http = EventMachine::HttpRequest.new("http://127.0.0.1:8080/").get(:max_bytes => 3)
+        http.errback { |http|
+          http.errors.should match /Bytes received exceeds limit/
+          EventMachine.stop
+        }
+        http.callback { failed }
+      }
+  end
+
+  it "should return an error if the connection duration exceeds the :max_connection_duration option" do
+     EventMachine.run {
+        http = EventMachine::HttpRequest.new("http://updates.sixapart.com/atom-stream.xml").get(:max_connection_duration => 3)
+        http.errback { |http|
+          http.errors.should match /Max Connection Duration Exceeded/
+          EventMachine.stop
+        }
+        http.callback { failed }
+      }
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: astro-em-http-request
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Ilya Grigorik
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-31 00:00:00 +01:00
+date: 2009-11-03 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency