cool.io-http 0.3.0 → 0.3.1

data/CHANGES.md

@@ -1,5 +1,11 @@
 # CHANGES
 
+## cool.io-http 0.3.1 -- 2012-02-18
+
+* Make sure Response#status is an integer
+* Fixed a few bugs
+* Return the response object in HttpFiber
+
 ## cool.io-http 0.3.0 -- 2012-01-09
 
 * Introduced `Coolio::Http::Response`. So now instead of passing

data/cool.io-http.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cool.io-http"
-  s.version = "0.3.0"
+  s.version = "0.3.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-09"
+  s.date = "2012-02-18"
   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 = [
@@ -30,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.15"
+  s.rubygems_version = "1.8.16"
   s.summary = "Simpler HTTP for [cool.io][]"
   s.test_files = ["test/test_http.rb"]
 

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

@@ -1,4 +1,4 @@
 
 module CoolioHttp
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/lib/cool.io/http.rb

@@ -34,7 +34,7 @@ class Coolio::Http < Coolio::HttpClient
                                         :body  => p.read, &block)
   end
 
-  def self.connect host, port, ssl
+  def self.connect host, port, ssl=false
     http = super(host, port)
     http.extend(Coolio::SSL) if ssl
     http
@@ -66,7 +66,7 @@ class Coolio::Http < Coolio::HttpClient
     super
     @http_callback.call(Response.new(@http_data.join,
                                      @http_response_header,
-                                     @http_response_header.http_status))
+                                     @http_response_header.http_status.to_i))
   end
 
   def on_connect

data/lib/cool.io/http_fiber.rb

@@ -4,9 +4,9 @@ require 'fiber'
 class Coolio::HttpFiber < Coolio::Http
   def self.request opts={}
     f = Fiber.current
-    super(opts){ |response, headers|
-      yield(response, headers)
-      f.resume
+    super(opts){ |response|
+      yield(response) if block_given?
+      f.resume(response)
     }
     Fiber.yield
   end

data/test/test_http.rb

@@ -1,33 +1,53 @@
 
+require 'bacon'
 require 'cool.io/http'
+require 'rack'
 
-def request klass, url
-  klass.request(:url => url){ |response|
-    puts "Response: #{response.body}"
-    puts
-    puts " Headers: #{response.headers}"
-    puts "  Status: #{response.status}"
-  }
+Bacon.summary_on_exit
+port = rand(30000) + 1024
+
+pid = Process.fork do
+  $stdout.reopen(IO::NULL)
+  $stderr.reopen(IO::NULL)
+  Rack::Handler::WEBrick.run(
+    lambda{ |env| [200, {'Content-Type' => 'test/ok'}, ['ok']] },
+    :Port => port)
+end
+sleep(0.5)
+at_exit{ Process.kill 2, pid }
+
+module Kernel
+  def eq? rhs
+    self == rhs
+  end
 end
 
-request(Coolio::Http, 'http://google.com')
-Coolio::Loop.default.run
-puts
-
-Fiber.new{
-  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)
+describe Coolio::Http do
+  def request klass, url
+    klass.request(:url => url){ |response| assert(response) }
+  end
+
+  def assert response
+    response.body                   .should.eq 'ok'
+    response.headers['CONTENT_TYPE'].should.eq 'test/ok'
+    response.status                 .should.eq 200
+  end
+
+  should 'asynchrony' do
+    request(Coolio::Http, "http://localhost:#{port}")
+    Coolio::Loop.default.run
+  end
+
+  should 'synchrony' do
+    Fiber.new{
+      assert(request(Coolio::HttpFiber, "http://localhost:#{port}"))
+    }.resume
+    Coolio::Loop.default.run
+  end
+
+  should 'ssl' do
     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.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-09 00:00:00.000000000 Z
+date: 2012-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cool.io
-  requirement: &2152924280 !ruby/object:Gem::Requirement
+  requirement: &2153122400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152924280
+  version_requirements: *2153122400
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &2152939800 !ruby/object:Gem::Requirement
+  requirement: &2153121580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152939800
+  version_requirements: *2153121580
 description: ! 'Simpler HTTP for [cool.io][]
 
 
@@ -81,9 +81,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Simpler HTTP for [cool.io][]
 test_files:
 - test/test_http.rb
+has_rdoc: