igrigorik-em-http-request 0.1.1 → 0.1.3

data/README.rdoc

@@ -3,12 +3,13 @@
 EventMachine based HTTP Request interface. Supports streaming response processing, uses Ragel HTTP parser. 
 - Simple interface for single & parallel requests via deferred callbacks
 - Automatic gzip & deflate decoding
-- Basic-Auth support 
+- Basic-Auth support
+- Custom timeouts 
 
 == Simple client example
 
   EventMachine.run {
-    http = EventMachine::HttpRequest.new('http://127.0.0.1/').get :query => {'keyname' => 'value'}
+    http = EventMachine::HttpRequest.new('http://127.0.0.1/').get :query => {'keyname' => 'value'}, :timeout => 10
  
     http.callback {
       p http.response_header.status

data/lib/em-http/client.rb

@@ -155,8 +155,6 @@ module EventMachine
     attr_reader   :response, :response_header, :errors
 
     def post_init
-      self.comm_inactivity_timeout = 5
-
       @parser = HttpClientParser.new
       @data = EventMachine::Buffer.new
       @response_header = HttpResponseHeader.new

data/lib/em-http/request.rb

@@ -24,7 +24,6 @@ module EventMachine
   #
 
   class HttpRequest
-    attr_reader :response, :headers
 
     def initialize(host, headers = {})
       @headers = headers
@@ -52,12 +51,19 @@ module EventMachine
       raise ArgumentError, "invalid request path" unless /^\// === @uri.path
 
       method = method.to_s.upcase
-
-      EventMachine.connect(@uri.host, @uri.port, EventMachine::HttpClient) { |c|
-        c.uri = @uri
-        c.method = method
-        c.options = options
-      }
+      begin
+       EventMachine.connect(@uri.host, @uri.port, EventMachine::HttpClient) { |c|
+          c.uri = @uri
+          c.method = method
+          c.options = options
+          c.comm_inactivity_timeout = options[:timeout] || 5
+        }
+      rescue RuntimeError => e 
+        raise e unless e.message == "no connection"
+        conn = EventMachine::HttpClient.new("")
+        conn.on_error("no connection")
+        conn
+      end
     end
   end
 end

data/test/stallion.rb

@@ -83,6 +83,10 @@ Stallion.saddle :spec do |stable|
     elsif stable.request.post?
       stable.response.write 'test'
 
+    elsif stable.request.path_info == '/timeout'
+      sleep(10)
+      stable.response.write 'timeout'
+
     elsif stable.request.path_info == '/gzip'
       io = StringIO.new
       gzip = Zlib::GzipWriter.new(io)

data/test/test_request.rb

@@ -8,9 +8,9 @@ describe EventMachine::HttpRequest do
     fail
   end
 
-  it "should fail GET on invalid host" do
+  it "should fail GET on DNS timeout" do
     EventMachine.run {
-      http = EventMachine::HttpRequest.new('http://169.169.169.169/').get
+      http = EventMachine::HttpRequest.new('http://127.1.1.1/').get
       http.callback { failed }
       http.errback {
         http.response_header.status.should == 0
@@ -19,6 +19,18 @@ describe EventMachine::HttpRequest do
     }
   end
 
+ it "should fail GET on invalid host" do
+    EventMachine.run {
+      http = EventMachine::HttpRequest.new('http://google1.com/').get
+      http.callback { failed }
+      http.errback {
+        http.response_header.status.should == 0
+        http.errors.should match(/no connection/)
+        EventMachine.stop
+      }
+    }
+  end
+
   it "should fail GET on missing path" do
     EventMachine.run {
       lambda {
@@ -122,11 +134,11 @@ describe EventMachine::HttpRequest do
     EventMachine.run {
 
       # digg.com uses chunked encoding
-      http = EventMachine::HttpRequest.new('http://www.digg.com/').get
+      http = EventMachine::HttpRequest.new('http://digg.com/').get
 
       http.errback { failed }
       http.callback {
-        http.response_header.status == 200
+        http.response_header.status.should == 200
         EventMachine.stop
       }
     }
@@ -139,7 +151,7 @@ describe EventMachine::HttpRequest do
 
       http.errback { failed }
       http.callback {
-        http.response_header.status == 200
+        http.response_header.status.should == 200
         EventMachine.stop
       }
     }
@@ -152,7 +164,7 @@ describe EventMachine::HttpRequest do
 
       http.errback { failed }
       http.callback {
-        http.response_header.status == 200
+        http.response_header.status.should == 200
         EventMachine.stop
       }
     }
@@ -165,7 +177,7 @@ describe EventMachine::HttpRequest do
 
       http.errback { failed }
       http.callback {
-        http.response_header.status == 200
+        http.response_header.status.should == 200
         http.response_header["CONTENT_ENCODING"].should == "deflate"
         http.response.should == "compressed"
 
@@ -174,14 +186,14 @@ describe EventMachine::HttpRequest do
     }
   end
 
-   it "should detect gzip encoding" do
+  it "should detect gzip encoding" do
     EventMachine.run {
 
       http = EventMachine::HttpRequest.new('http://127.0.0.1:8080/gzip').get :head => {"accept-encoding" => "gzip, compressed"}
 
       http.errback { failed }
       http.callback {
-        http.response_header.status == 200
+        http.response_header.status.should == 200
         http.response_header["CONTENT_ENCODING"].should == "gzip"
         http.response.should == "compressed"
 
@@ -189,4 +201,17 @@ describe EventMachine::HttpRequest do
       }
     }
   end
+
+  it "should timeout after 10 seconds" do
+    EventMachine.run {
+      t = Time.now.to_i
+      http = EventMachine::HttpRequest.new('http://127.0.0.1:8080/timeout').get :timeout => 2
+
+      http.errback {
+        (Time.now.to_i - t).should == 2
+        EventMachine.stop
+      }
+      http.callback { failed }
+    }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: igrigorik-em-http-request
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors: 
 - Ilya Grigorik
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-15 00:00:00 -08:00
+date: 2009-03-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency