igrigorik-em-http-request 0.1.6 → 0.1.7

data/em-http-request.gemspec

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

data/lib/em-http/client.rb

@@ -171,6 +171,9 @@ 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
+
       send_request_header
       send_request_body
     end
@@ -191,10 +194,18 @@ module EventMachine
       unbind
     end
 
+    def normalize_body
+      if @options[:body].is_a? Hash
+        @options[:body].to_params
+      else
+        @options[:body]
+      end
+    end
+
     def send_request_header
       query   = @options[:query]
       head    = @options[:head] ? munge_header_keys(@options[:head]) : {}
-      body    = @options[:body]
+      body    = normalize_body
 
       # Set the Host header if it hasn't been specified already
       head['host'] ||= encode_host
@@ -220,11 +231,7 @@ module EventMachine
 
     def send_request_body
       return unless @options[:body]
-      if @options[:body].is_a? Hash
-        body = @options[:body].to_params
-      else
-        body = @options[:body]
-      end
+      body = normalize_body
       send_data body
     end
 

data/test/stallion.rb

@@ -80,6 +80,9 @@ Stallion.saddle :spec do |stable|
     elsif stable.request.path_info == '/echo_query'
       stable.response.write stable.request.query_string
 
+    elsif stable.request.path_info == '/echo_content_length'
+      stable.response.write stable.request.content_length
+
     elsif stable.request.post?
       stable.response.write stable.request.body.read
 

data/test/test_request.rb

@@ -145,6 +145,20 @@ describe EventMachine::HttpRequest do
       }
     }
   end
+  
+  it "should perform successfull POST with Ruby Hash/Array as params and with the correct content length" do
+    EventMachine.run {
+      http = EventMachine::HttpRequest.new('http://127.0.0.1:8080/echo_content_length').post :body => {"key1" => "data1"}
+
+      http.errback { failed }
+      http.callback {
+        http.response_header.status.should == 200
+        
+        http.response.to_i.should == 10
+        EventMachine.stop
+      }
+    }
+  end
 
   it "should perform successfull GET with custom header" do
     EventMachine.run {
@@ -277,4 +291,16 @@ describe EventMachine::HttpRequest do
     }
   end
 
+  it "should initiate SSL/TLS on HTTPS connections" do
+    EventMachine.run {
+      http = EventMachine::HttpRequest.new('https://mail.google.com:443/mail/').get
+
+      http.errback { failed }
+      http.callback {
+        http.response_header.status.should == 302
+        EventMachine.stop
+      }
+    }
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: igrigorik-em-http-request
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - Ilya Grigorik