@@ -1,3 +1,8 @@ +== 1.2.1 Asynctilicious Ultra Supreme release + * Use Rails Rack based dispatcher when available in Rails 2.3 + * Allow String for response body + * Require openssl before eventmachine to prevent crash in 1.9 + == 1.2.0 Asynctilicious Supreme release * Add support for Windows mingw Ruby distro [Juan C. Rodriguez] * Add async response support, see example/async_*.ru [raggi] CHANGELOG @@ -22,7 +22,13 @@ module Rack load_application - @file_server = Rack::File.new(::File.join(RAILS_ROOT, "public")) + @rails_app = if ActionController::Dispatcher.instance_methods.include?(:call) + ActionController::Dispatcher.new + else + CgiApp.new + end + + @file_app = Rack::File.new(::File.join(RAILS_ROOT, "public")) end def load_application @@ -32,7 +38,7 @@ module Rack require 'dispatcher' if @prefix - if ActionController::Base.respond_to?('relative_url_root=') + if ActionController::Base.respond_to?(:relative_url_root=) ActionController::Base.relative_url_root = @prefix # Rails 2.1.1 else ActionController::AbstractRequest.relative_url_root = @prefix @@ -40,28 +46,11 @@ module Rack end end - # TODO refactor this in File#can_serve?(path) ?? def file_exist?(path) - full_path = ::File.join(@file_server.root, Utils.unescape(path)) + full_path = ::File.join(@file_app.root, Utils.unescape(path)) ::File.file?(full_path) && ::File.readable_real?(full_path) end - def serve_file(env) - @file_server.call(env) - end - - def serve_rails(env) - request = Request.new(env) - response = Response.new - - session_options = ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS - cgi = CGIWrapper.new(request, response) - - Dispatcher.dispatch(cgi, session_options, response) - - response.finish - end - def call(env) path = env['PATH_INFO'].chomp('/') method = env['REQUEST_METHOD'] @@ -69,18 +58,31 @@ module Rack if FILE_METHODS.include?(method) if file_exist?(path) # Serve the file if it's there - return serve_file(env) + return @file_app.call(env) elsif file_exist?(cached_path) # Serve the page cache if it's there env['PATH_INFO'] = cached_path - return serve_file(env) + return @file_app.call(env) end end # No static file, let Rails handle it - serve_rails(env) + @rails_app.call(env) end protected + # For Rails pre Rack (2.3) + class CgiApp + def call(env) + request = Request.new(env) + response = Response.new + session_options = ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS + cgi = CGIWrapper.new(request, response) + + Dispatcher.dispatch(cgi, session_options, response) + + response.finish + end + end class CGIWrapper < ::CGI def initialize(request, response, *args) lib/rack/adapter/rails.rb @@ -7,6 +7,7 @@ require 'time' require 'forwardable' require 'rubygems' +require 'openssl' require 'eventmachine' require 'thin/version' lib/thin.rb @@ -80,8 +80,10 @@ module Thin # define your own +each+ method on +body+. def each yield head - @body.each do |chunk| - yield chunk + if @body.is_a?(String) + yield @body + else + @body.each { |chunk| yield chunk } end end lib/thin/response.rb @@ -6,11 +6,11 @@ module Thin module VERSION #:nodoc: MAJOR = 1 MINOR = 2 - TINY = 0 + TINY = 1 STRING = [MAJOR, MINOR, TINY].join('.') - CODENAME = "Asynctilicious Supreme".freeze + CODENAME = "Asynctilicious Ultra Supreme".freeze RACK = [0, 1].freeze # Rack protocol version that was tested end lib/thin/version.rb @@ -52,6 +52,14 @@ describe Response do end it 'should output body' do + @response.body = ['<html>', '</html>'] + + out = '' + @response.each { |l| out << l } + out.should include("\r\n\r\n<html></html>") + end + + it 'should output String body' do @response.body = '<html></html>' out = '' spec/response_spec.rb bba1db29ff910da218a6c45481e97d80b9dc7208 macournoyer macournoyer@gmail.com http://github.com/macournoyer/thin/commit/a303c274bbba38d46e6164672921b9610ec28c77 a303c274bbba38d46e6164672921b9610ec28c77

2009-04-21T19:58:24-07:00

* Use Rails Rack based dispatcher when available in Rails 2.3 * Allow String for response body * Require openssl before eventmachine to prevent crash in 1.9 41016e3c940d13f4f97e98c4be996fc97228bbe4 macournoyer macournoyer@gmail.com