cool.io-http 0.2.0 → 0.2.1

data/.gitignore

@@ -0,0 +1,2 @@
+pkg
+*.rbc

data/CHANGES.md

@@ -1,5 +1,10 @@
 # CHANGES
 
+## cool.io-http 0.2.1 -- 2012-01-09
+
+* Added SSL (HTTPS) supports
+* Added Coolio::Http#ssl?
+
 ## cool.io-http 0.2.0 -- 2012-01-01
 
 * Birthday!

data/README.md

@@ -29,7 +29,7 @@ Asynchrony client:
 
     require 'cool.io/http'
 
-    Coolio::Http.request(:url => 'http://example.com'){ |response, headers|
+    Coolio::Http.request(:url => 'https://google.com'){ |response, headers|
       puts "Response: #{response}"
       puts
       puts " Headers: #{headers}"
@@ -42,7 +42,7 @@ Fiber-aware synchrony client:
     require 'cool.io/http'
 
     Fiber.new{
-      Coolio::HttpFiber.request(:url => 'http://example.com'){ |r, h|
+      Coolio::HttpFiber.request(:url => 'https://google.com'){ |r, h|
         puts "Response: #{r}"
         puts
         puts " Headers: #{h}"

data/TODO.md

@@ -1,3 +1,4 @@
 # TODO
 
 * streaming payload body
+* ssl options (e.g. OpenSSL::SSL::VERIFY_NONE)

data/cool.io-http.gemspec

@@ -2,14 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = "cool.io-http"
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lin Jen-Shin (godfat)"]
-  s.date = "2012-01-01"
+  s.date = "2012-01-09"
   s.description = "Simpler HTTP for [cool.io][]\n\n[cool.io]: https://github.com/tarcieri/cool.io"
   s.email = ["godfat (XD) godfat.org"]
   s.files = [
+  ".gitignore",
   ".gitmodules",
   "CHANGES.md",
   "LICENSE",
@@ -21,6 +22,7 @@ Gem::Specification.new do |s|
   "lib/cool.io-http/version.rb",
   "lib/cool.io/http.rb",
   "lib/cool.io/http/payload.rb",
+  "lib/cool.io/http/ssl.rb",
   "lib/cool.io/http_fiber.rb",
   "task/.git",
   "task/.gitignore",
@@ -28,7 +30,7 @@ Gem::Specification.new do |s|
   "test/test_http.rb"]
   s.homepage = "https://github.com/godfat/cool.io-http"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.13"
+  s.rubygems_version = "1.8.15"
   s.summary = "Simpler HTTP for [cool.io][]"
   s.test_files = ["test/test_http.rb"]
 

data/lib/cool.io/http/ssl.rb

@@ -0,0 +1,105 @@
+
+module Coolio
+  module SSL
+    def ssl?
+      true
+    end
+
+    def ssl_socket
+      @ssl_scoket ||= begin
+        s = OpenSSL::SSL::SSLSocket.new(@_io, ssl_context)
+        s.sync_close = true
+        s
+      end
+    end
+
+    def ssl_context
+      @ssl_context ||= begin
+        c = OpenSSL::SSL::SSLContext.new
+        # c.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        c
+      end
+    end
+
+    def ssl_completed?
+      !!!@ssl_method
+    end
+
+    def ssl_client_start
+      @ssl_method = :connect_nonblock
+      ssl_init
+    end
+
+    def ssl_server_start
+      @ssl_method = :accept_nonblock
+      ssl_init
+    end
+
+    #########
+    protected
+    #########
+
+    def ssl_init
+      ssl_socket.__send__(@ssl_method)
+      ssl_init_complete
+    rescue ::IO::WaitReadable
+      enable unless enabled?
+    rescue ::IO::WaitWritable
+      enable_write_watcher
+    rescue Errno::ECONNRESET, Errno::EPIPE
+      close
+    rescue => e
+      if respond_to?(:on_ssl_error)
+        on_ssl_error(e)
+      else
+        raise e
+      end
+    end
+
+    def ssl_init_complete
+      @ssl_method = nil
+      enable unless enabled?
+      on_peer_cert(ssl_socket.peer_cert) if respond_to?(:on_peer_cert)
+      on_ssl_connect if respond_to?(:on_ssl_connect)
+    end
+
+    def on_readable
+      unless ssl_completed?
+        disable
+        ssl_init
+        return
+      end
+
+      begin
+        on_read(ssl_socket.read_nonblock(Coolio::IO::INPUT_SIZE))
+      rescue Errno::EAGAIN, ::IO::WaitReadable
+      rescue Errno::ECONNRESET, EOFError
+        close
+      end
+    end
+
+    def on_writable
+      unless ssl_completed?
+        # disable_write_watcher
+        ssl_init
+        return
+      end
+
+      begin
+        nbytes = ssl_socket.write_nonblock(@_write_buffer.to_str)
+      rescue Errno::EAGAIN, ::IO::WaitWritable
+        return
+      rescue Errno::EPIPE, Errno::ECONNRESET
+        close
+        return
+      end
+
+      @_write_buffer.read(nbytes)
+
+      if @_write_buffer.empty?
+        disable_write_watcher
+        on_write_complete
+      end
+    end
+  end
+end

data/lib/cool.io/http.rb

@@ -2,9 +2,11 @@
 require 'uri'
 require 'cool.io'
 require 'cool.io/http/payload'
+require 'cool.io/http/ssl'
 
 module Coolio
   autoload :HttpFiber, 'cool.io/http_fiber'
+  autoload :SSL      , 'cool.io/http/ssl'
 end
 
 class Coolio::Http < Coolio::HttpClient
@@ -24,12 +26,22 @@ class Coolio::Http < Coolio::HttpClient
              r}.merge(query.inject({}){ |r, (k, v)| r[k.to_s] = v.to_s; r })
     p    = Payload.generate(payload)
 
-    connect(uri.host, uri.port).attach(loop).
+    connect(uri.host, uri.port, uri.scheme.downcase == 'https').attach(loop).
       request(method.to_s.upcase, path, :query => q,
                                         :head  => p.headers.merge(headers),
                                         :body  => p.read, &block)
   end
 
+  def self.connect host, port, ssl
+    http = super(host, port)
+    http.extend(Coolio::SSL) if ssl
+    http
+  end
+
+  def ssl?
+    false
+  end
+
   def initialize socket
     super
     @http_data = []
@@ -52,4 +64,9 @@ class Coolio::Http < Coolio::HttpClient
     super
     @http_callback.call(@http_data.join, @http_response_header)
   end
+
+  def on_connect
+    ssl_client_start if respond_to?(:ssl_socket)
+    super
+  end
 end

data/lib/cool.io-http/version.rb

@@ -1,4 +1,4 @@
 
 module CoolioHttp
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/test/test_http.rb

@@ -1,21 +1,32 @@
 
 require 'cool.io/http'
 
-def request klass
-  klass.request(:url => 'http://example.com'){ |response, headers|
+def request klass, url
+  klass.request(:url => url){ |response, headers|
     puts "Response: #{response}"
     puts
     puts " Headers: #{headers}"
   }
 end
 
-request(Coolio::Http)
+request(Coolio::Http, 'http://google.com')
 Coolio::Loop.default.run
 puts
 
 Fiber.new{
-  request(Coolio::HttpFiber)
+  request(Coolio::HttpFiber, 'https://google.com')
   puts "DONE"
 }.resume
 puts "GO"
 Coolio::Loop.default.run
+
+describe 'ssl' do
+  should 'respect ssl?' do
+    port = rand(30000) + 1024
+    serv = TCPServer.new('localhost', port)
+    sock = TCPSocket.new('localhost', port)
+    Coolio::Http.new(sock)                    .ssl?.should == false
+    Coolio::Http.new(sock).extend(Coolio::SSL).ssl?.should == true
+    serv.close
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cool.io-http
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-01 00:00:00.000000000 Z
+date: 2012-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cool.io
-  requirement: &2168638220 !ruby/object:Gem::Requirement
+  requirement: &2153258440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168638220
+  version_requirements: *2153258440
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &2168637040 !ruby/object:Gem::Requirement
+  requirement: &2153274020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168637040
+  version_requirements: *2153274020
 description: ! 'Simpler HTTP for [cool.io][]
 
 
@@ -43,6 +43,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
 - .gitmodules
 - CHANGES.md
 - LICENSE
@@ -54,6 +55,7 @@ files:
 - lib/cool.io-http/version.rb
 - lib/cool.io/http.rb
 - lib/cool.io/http/payload.rb
+- lib/cool.io/http/ssl.rb
 - lib/cool.io/http_fiber.rb
 - task/.git
 - task/.gitignore
@@ -79,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.13
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Simpler HTTP for [cool.io][]