julien51-em-http-request 0.1.9 → 0.1.10

data/em-http-request.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'em-http-request'
-  s.version = '0.1.9'
+  s.version = '0.1.10'
   s.date = '2009-03-20'
   s.summary = 'EventMachine based HTTP Request interface'
   s.description = s.summary

data/lib/em-http/client.rb

@@ -20,6 +20,16 @@ module EventMachine
 
     # The status code (as a string!)
     attr_accessor :http_status
+    
+    # E-Tag
+    def etag
+      self["ETag"]
+    end
+    
+    def last_modified
+      time = self["Last-Modified"]
+      Time.parse(time) if time
+    end
 
     # HTTP response status as an integer
     def status
@@ -98,12 +108,16 @@ module EventMachine
     end
 
     def encode_query(path, query)
-      return path unless query
-      if query.kind_of? String
-        return "#{path}?#{query}"
+      encoded_query = if query.kind_of?(Hash)
+        query.map { |k, v| encode_param(k, v) }.join('&')
       else
-        return path + "?" + query.map { |k, v| encode_param(k, v) }.join('&')
+        query.to_s
       end
+      if !@uri.query.to_s.empty?
+        encoded_query = [encoded_query, @uri.query].reject {|part| part.empty?}.join("&")
+      end
+      return path if encoded_query.to_s.empty?
+      "#{path}?#{encoded_query}"
     end
 
     # URL encodes query parameters:
@@ -181,12 +195,12 @@ module EventMachine
     # start HTTP request once we establish connection to host
     def connection_completed
       ssl = @options[:tls] || @options[:ssl] || {}
-      start_tls(ssl) if @uri.scheme == "https" or @uri.port == 443
+      start_tls(ssl) if @uri.scheme == "https" #or @uri.port == 443 # A user might not want https even on port 443.
 
       send_request_header
       send_request_body
     end
-
+    
     # request is done, invoke the callback
     def on_request_complete
       begin
@@ -196,11 +210,14 @@ module EventMachine
       end
       unbind
     end
-
+    
     # request failed, invoke errback
-    def on_error(msg)
+    def on_error(msg, dns_error = false)
       @errors = msg
-      unbind
+      
+      # no connection signature on DNS failures
+      # fail the connection directly
+      dns_error == true ? fail : unbind
     end
 
     # assign a stream processing block
@@ -281,7 +298,11 @@ module EventMachine
     end
 
     def unbind
-      (@state == :finished) ? succeed(self) : fail
+      if @state == :finished
+        succeed(self) 
+      else
+        fail(self)
+      end
       close_connection
     end
 
@@ -339,11 +360,22 @@ module EventMachine
         return false
       end
 
+      # shortcircuit on HEAD requests 
+      if @method == "HEAD"
+        @state = :finished
+        on_request_complete
+      end
+
       if @response_header.chunked_encoding?
         @state = :chunk_header
       else
-        @state = :body
-        @bytes_remaining = @response_header.content_length
+        if @response_header.content_length > 0
+          @state = :body
+          @bytes_remaining = @response_header.content_length 
+        else
+          @state = :finished
+          on_request_complete
+        end
       end
 
       if @inflate.include?(response_header[CONTENT_ENCODING]) &&

data/lib/em-http/request.rb

@@ -50,13 +50,14 @@ module EventMachine
     #     Host: header
 
     def get  options = {};    send_request(:get,  options);    end
+    def head options = {};    send_request(:head, options);    end
     def post options = {};    send_request(:post, options);    end
 
     protected
 
     def send_request(method, options)
       raise ArgumentError, "invalid request path" unless /^\// === @uri.path
-
+      
       method = method.to_s.upcase
       begin
        host = options[:host] || @uri.host
@@ -69,7 +70,7 @@ module EventMachine
       rescue RuntimeError => e 
         raise e unless e.message == "no connection"
         conn = EventMachine::HttpClient.new("")
-        conn.on_error("no connection")
+        conn.on_error("no connection", true)
         conn
       end
     end

data/test/stallion.rb

@@ -83,6 +83,9 @@ Stallion.saddle :spec do |stable|
     elsif stable.request.path_info == '/echo_content_length'
       stable.response.write stable.request.content_length
 
+    elsif stable.request.head?
+      stable.response.status = 200
+
     elsif stable.request.post?
       stable.response.write stable.request.body.read
 
@@ -131,7 +134,11 @@ Stallion.saddle :spec do |stable|
 end
 
 Thread.new do
-  Stallion.run :Host => '127.0.0.1', :Port => 8080
+  begin
+    Stallion.run :Host => '127.0.0.1', :Port => 8080  
+  rescue Exception => e
+    print e
+  end
 end
 
-sleep(2)
+sleep(1)

data/test/test_hash.rb

@@ -10,9 +10,10 @@ describe Hash do
     it "should transform a more complex hash into HTTP POST Params" do
       {:a => "a", :b => ["c", "d", "e"]}.to_params.should == "a=a&b[0]=c&b[1]=d&b[2]=e"
     end
-    
-    it "should transform a very complex hash into HTTP POST Params" do
-      {:a => "a", :b => [{:c => "c", :d => "d"}, {:e => "e", :f => "f"}]}.to_params.should == "a=a&b[0][d]=d&b[0][c]=c&b[1][f]=f&b[1][e]=e"
-    end
+
+    # Ruby 1.8 Hash is not sorted, so this test breaks randomly. Maybe once we're all on 1.9. ;-)
+    # it "should transform a very complex hash into HTTP POST Params" do
+    #    {:a => "a", :b => [{:c => "c", :d => "d"}, {:e => "e", :f => "f"}]}.to_params.should == "a=a&b[0][d]=d&b[0][c]=c&b[1][f]=f&b[1][e]=e"
+    # end
   end
 end

data/test/test_request.rb

@@ -1,13 +1,13 @@
 require 'test/helper'
 require 'test/stallion'
-
+ 
 describe EventMachine::HttpRequest do
 
   def failed
     EventMachine.stop
     fail
   end
-
+  
   it "should fail GET on DNS timeout" do
     EventMachine.run {
       http = EventMachine::HttpRequest.new('http://127.1.1.1/').get
@@ -68,12 +68,26 @@ describe EventMachine::HttpRequest do
     }    
   end
 
+  it "should perform successfull HEAD with a URI passed as argument" do
+    EventMachine.run {
+      uri = URI.parse('http://127.0.0.1:8080/')
+      http = EventMachine::HttpRequest.new(uri).head
+
+      http.errback { failed }
+      http.callback {
+        http.response_header.status.should == 200
+        http.response.should == ""
+        EventMachine.stop
+      }
+    }    
+  end
+
   it "should return 404 on invalid path" do
     EventMachine.run {
       http = EventMachine::HttpRequest.new('http://127.0.0.1:8080/fail').get
 
       http.errback { failed }
-      http.callback {
+      http.callback { 
         http.response_header.status.should == 404
         EventMachine.stop
       }
@@ -247,10 +261,10 @@ describe EventMachine::HttpRequest do
   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 = EventMachine::HttpRequest.new('http://127.0.0.1:8080/timeout').get :timeout => 1
 
       http.errback {
-        (Time.now.to_i - t).should == 2
+        (Time.now.to_i - t).should >= 2
         EventMachine.stop
       }
       http.callback { failed }
@@ -340,5 +354,5 @@ describe EventMachine::HttpRequest do
       }
     }
   end
-
-end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: julien51-em-http-request
 version: !ruby/object:Gem::Version 
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors: 
 - Ilya Grigorik