em-http-request 1.0.0.beta.2 → 1.0.0.beta.3

data/lib/em-http/client.rb

@@ -104,6 +104,8 @@ module EventMachine
     def proxy?; !@options[:proxy].nil?; end
     def http_proxy?; proxy? && [nil, :http].include?(@options[:proxy][:type]); end
 
+    def ssl?; @req.uri.scheme == "https" || @req.uri.port == 443; end
+
     def continue?
       @response_header.status == 100 && (@method == 'POST' || @method == 'PUT')
     end

data/lib/em-http/http_connection.rb

@@ -87,7 +87,8 @@ module EventMachine
 
     def connection_completed
       if @opts.proxy && @opts.proxy[:type] == :socks5
-        socksify(@opts.uri.host, @opts.uri.port, *@opts.proxy[:authorization]) { start }
+        socksify(client.req.uri.host, client.req.uri.port, *@opts.proxy[:authorization]) { start }
+
       else
         start
       end
@@ -95,7 +96,7 @@ module EventMachine
 
     def start
       ssl = @opts.options[:tls] || @opts.options[:ssl] || {}
-      start_tls(ssl) if @opts.uri.scheme == "https" or @opts.uri.port == 443
+      start_tls(ssl) if client && client.ssl?
 
       succeed
     end
@@ -124,7 +125,12 @@ module EventMachine
           @clients.pop.close(e.message)
         end
       end
-
     end
+
+    private
+
+      def client
+        @clients.first
+      end
   end
 end

data/lib/em-http/version.rb

@@ -1,5 +1,5 @@
 module EventMachine
   class HttpRequest
-    VERSION = "1.0.0.beta.2"
+    VERSION = "1.0.0.beta.3"
   end
 end

data/spec/external_spec.rb

@@ -15,6 +15,18 @@ requires_connection do
       }
     end
 
+    it "should follow redirect to https and initiate the handshake" do
+      EventMachine.run {
+        http = EventMachine::HttpRequest.new('http://analytics.postrank.com/').get :redirects => 5
+
+        http.errback { failed(http) }
+        http.callback {
+          http.response_header.status.should == 200
+          EventMachine.stop
+        }
+      }
+    end
+
     it "should perform a streaming GET" do
       EventMachine.run {
 

data/spec/helper.rb

@@ -13,5 +13,5 @@ def failed(http = nil)
 end
 
 def requires_connection(&blk)
-  blk.call if system('ping -c1 google.com &> /dev/null')
+  blk.call if system('ping -t1 -c1 google.com &> /dev/null')
 end

metadata

@@ -2,7 +2,7 @@
 name: em-http-request
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.0.0.beta.2
+  version: 1.0.0.beta.3
 platform: ruby
 authors: 
 - Ilya Grigorik
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-10 00:00:00 -05:00
+date: 2011-03-12 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency