thin 1.0.0 → 1.2.1

data/lib/thin/controllers/cluster.rb

@@ -102,7 +102,13 @@ module Thin
       
         def with_each_server
           if only
-            yield only
+            if only < 80
+              # interpret +only+ as a sequence number
+              yield(first_port + only)
+            else
+              # interpret +only+ as an absolute port number
+              yield only
+            end
           elsif socket || swiftiply?
             size.times { |n| yield n }
           else

data/lib/thin/controllers/controller.rb

@@ -166,6 +166,7 @@ module Thin
         end
         
         def load_rackup_config
+          ENV['RACK_ENV'] = @options[:environment]
           case @options[:rackup]
           when /\.rb$/
             Kernel.load(@options[:rackup])

data/lib/thin/request.rb

@@ -16,6 +16,8 @@ module Thin
 
     # Freeze some HTTP header names & values
     SERVER_SOFTWARE   = 'SERVER_SOFTWARE'.freeze
+    SERVER_NAME       = 'SERVER_NAME'.freeze
+    LOCALHOST         = 'localhost'.freeze
     HTTP_VERSION      = 'HTTP_VERSION'.freeze
     HTTP_1_0          = 'HTTP/1.0'.freeze
     REMOTE_ADDR       = 'REMOTE_ADDR'.freeze
@@ -24,7 +26,7 @@ module Thin
     CONNECTION        = 'HTTP_CONNECTION'.freeze
     KEEP_ALIVE_REGEXP = /\bkeep-alive\b/i.freeze
     CLOSE_REGEXP      = /\bclose\b/i.freeze
-
+    
     # Freeze some Rack header names
     RACK_INPUT        = 'rack.input'.freeze
     RACK_VERSION      = 'rack.version'.freeze
@@ -32,6 +34,8 @@ module Thin
     RACK_MULTITHREAD  = 'rack.multithread'.freeze
     RACK_MULTIPROCESS = 'rack.multiprocess'.freeze
     RACK_RUN_ONCE     = 'rack.run_once'.freeze
+    ASYNC_CALLBACK    = 'async.callback'.freeze
+    ASYNC_CLOSE       = 'async.close'.freeze
 
     # CGI-like request environment variables
     attr_reader :env
@@ -43,12 +47,13 @@ module Thin
     attr_reader :body
 
     def initialize
-      @parser   = HttpParser.new
+      @parser   = Thin::HttpParser.new
       @data     = ''
       @nparsed  = 0
       @body     = StringIO.new
       @env      = {
         SERVER_SOFTWARE   => SERVER,
+        SERVER_NAME       => LOCALHOST,
 
         # Rack stuff
         RACK_INPUT        => @body,
@@ -125,6 +130,15 @@ module Thin
     def threaded=(value)
       @env[RACK_MULTITHREAD] = value
     end
+    
+    def async_callback=(callback)
+      @env[ASYNC_CALLBACK] = callback
+      @env[ASYNC_CLOSE] = EventMachine::DefaultDeferrable.new
+    end
+    
+    def async_close
+      @async_close ||= @env[ASYNC_CLOSE]
+    end
 
     # Close any resource used by the request
     def close

data/lib/thin/response.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
 

data/lib/thin/runner.rb

@@ -92,7 +92,7 @@ module Thin
           opts.separator "Cluster options:"                                             
                                                                                       
           opts.on("-s", "--servers NUM", "Number of servers to start")                  { |num| @options[:servers] = num.to_i }
-          opts.on("-o", "--only NUM", "Send command to only one server of the cluster") { |only| @options[:only] = only }
+          opts.on("-o", "--only NUM", "Send command to only one server of the cluster") { |only| @options[:only] = only.to_i }
           opts.on("-C", "--config FILE", "Load options from config file")               { |file| @options[:config] = file }
           opts.on(      "--all [DIR]", "Send command to each config files in DIR")      { |dir| @options[:all] = dir } if Thin.linux?
         end

data/lib/thin/version.rb

@@ -5,21 +5,21 @@ module Thin
   
   module VERSION #:nodoc:
     MAJOR    = 1
-    MINOR    = 0
-    TINY     = 0
+    MINOR    = 2
+    TINY     = 1
     
     STRING   = [MAJOR, MINOR, TINY].join('.')
     
-    CODENAME = "That's What She Said".freeze
+    CODENAME = "Asynctilicious Ultra Supreme".freeze
     
-    RACK     = [0, 3].freeze # Latest Rack version that was tested
+    RACK     = [1, 0].freeze # Rack protocol version
   end
   
   NAME    = 'thin'.freeze
   SERVER  = "#{NAME} #{VERSION::STRING} codename #{VERSION::CODENAME}".freeze  
   
   def self.win?
-    RUBY_PLATFORM =~ /mswin/
+    RUBY_PLATFORM =~ /mswin|mingw/
   end
   
   def self.linux?

data/spec/command_spec.rb

@@ -4,7 +4,7 @@ describe Command do
   before do
     Command.script = 'thin'
     @command = Command.new(:start, :port => 3000, :daemonize => true, :log => 'hi.log',
-                           :require => %w(rubygems thin))
+                           :require => %w(rubygems thin), :no_epoll => true)
   end
   
   it 'should shellify command' do
@@ -17,4 +17,9 @@ describe Command do
     out = @command.shellify
     out.should include('--require="rubygems"', '--require="thin"')
   end
+
+  it 'should convert _ to - in option name' do
+    out = @command.shellify
+    out.should include('--no-epoll')
+  end
 end

data/spec/controllers/cluster_spec.rb

@@ -135,6 +135,39 @@ describe Cluster, "controlling only one server" do
     end
 end
 
+describe Cluster, "controlling only one server, by sequence number" do
+  before do
+    @cluster = Cluster.new(:chdir => '/rails_app',
+                           :address => '0.0.0.0',
+                           :port => 3000, 
+                           :servers => 3,
+                           :timeout => 10,
+                           :log => 'thin.log',
+                           :pid => 'thin.pid',
+                           :only => 1
+                          )
+  end
+  
+  it 'should call only specified server' do
+    calls = []
+    @cluster.send(:with_each_server) do |n|
+      calls << n
+    end
+    calls.should == [3001]
+  end
+  
+  it "should start only specified server" do
+    Command.should_receive(:run).with(:start, options_for_port(3001))
+
+    @cluster.start
+  end
+  
+  private
+    def options_for_port(port)
+      { :daemonize => true, :log => "thin.#{port}.log", :timeout => 10, :address => "0.0.0.0", :port => port, :pid => "thin.#{port}.pid", :chdir => "/rails_app" }
+    end
+end
+
 describe Cluster, "with Swiftiply" do
   before do
     @cluster = Cluster.new(:chdir => '/rails_app',

data/spec/controllers/controller_spec.rb

@@ -63,14 +63,14 @@ describe Controller, 'start' do
   end
   
   it "should load app from Rack config" do
-    @controller.options[:rackup] = File.dirname(__FILE__) + '/../../example/config.ru'    
+    @controller.options[:rackup] = File.dirname(__FILE__) + '/../../example/config.ru'
     @controller.start
     
     @server.app.class.should == Proc
   end
 
   it "should load app from ruby file" do
-    @controller.options[:rackup] = filename = File.dirname(__FILE__) + '/../../example/myapp.rb'    
+    @controller.options[:rackup] = File.dirname(__FILE__) + '/../../example/myapp.rb'
     @controller.start
     
     @server.app.should == Myapp
@@ -78,7 +78,7 @@ describe Controller, 'start' do
 
   it "should throwup if rackup is not a .ru or .rb file" do
     proc do
-      @controller.options[:rackup] = filename = File.dirname(__FILE__) + '/../../example/myapp.foo'    
+      @controller.options[:rackup] = File.dirname(__FILE__) + '/../../example/myapp.foo'
       @controller.start
     end.should raise_error(RuntimeError, /please/)
   end
@@ -89,6 +89,14 @@ describe Controller, 'start' do
     
     @server.threaded.should be_true
   end
+  
+  it "should set RACK_ENV" do
+    @controller.options[:rackup] = File.dirname(__FILE__) + '/../../example/config.ru'
+    @controller.options[:environment] = "lolcat"
+    @controller.start
+    
+    ENV['RACK_ENV'].should == "lolcat"
+  end
     
 end
 

data/spec/request/parser_spec.rb

@@ -1,5 +1,12 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
+# Require mongrel so we can test that Thin parser don't clash w/ Mongrel parser.
+begin
+  require 'mongrel'
+rescue LoadError
+  warn "Install mongrel to test compatibility w/ it"
+end
+
 describe Request, 'parser' do
   it 'should include basic headers' do
     request = R("GET / HTTP/1.1\r\nHost: localhost\r\n\r\n")
@@ -52,7 +59,7 @@ describe Request, 'parser' do
   it 'should parse headers from GET request' do
     request = R(<<-EOS, true)
 GET / HTTP/1.1
-Host: localhost:3000
+Host: myhost.com:3000
 User-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US; rv:1.8.1.9) Gecko/20071025 Firefox/2.0.0.9
 Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
 Accept-Language: en-us,en;q=0.5
@@ -63,8 +70,8 @@ Keep-Alive: 300
 Connection: keep-alive
 
 EOS
-    request.env['HTTP_HOST'].should == 'localhost:3000'
-    request.env['SERVER_NAME'].should == 'localhost'
+    request.env['HTTP_HOST'].should == 'myhost.com:3000'
+    request.env['SERVER_NAME'].should == 'myhost.com'
     request.env['SERVER_PORT'].should == '3000'
     request.env['HTTP_COOKIE'].should == 'mium=7'
 
@@ -167,7 +174,7 @@ EOS
       sorta_safe = %(GET #{path} HTTP/1.1\r\n\r\n)
       nread      = parser.execute(req, sorta_safe, 0)
 
-      sorta_safe.size.should == nread
+      sorta_safe.size.should == nread - 1 # Ragel 6 skips last linebreak
       parser.should be_finished
       parser.should_not be_error
     end
@@ -188,4 +195,21 @@ EOS
   it "should fails on heders larger then MAX_HEADER" do
     proc { R("GET / HTTP/1.1\r\nFoo: #{'X' * Request::MAX_HEADER}\r\n\r\n") }.should raise_error(InvalidRequest)
   end
+  
+  it "should default SERVER_NAME to localhost" do
+    request = R("GET / HTTP/1.1\r\n\r\n")
+    request.env['SERVER_NAME'].should == "localhost"
+  end
+  
+  it 'should normalize http_fields' do
+    [ "GET /index.html HTTP/1.1\r\nhos-t: localhost\r\n\r\n",
+      "GET /index.html HTTP/1.1\r\nhOs_t: localhost\r\n\r\n",
+      "GET /index.html HTTP/1.1\r\nhoS-T: localhost\r\n\r\n"
+    ].each { |req_str|
+      parser     = HttpParser.new
+      req        = {}
+      nread      = parser.execute(req, req_str, 0)
+      req.should be_has_key('HTTP_HOS_T')
+    }
+  end
 end

data/spec/response_spec.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 = ''

data/spec/runner_spec.rb

@@ -2,10 +2,11 @@ require File.dirname(__FILE__) + '/spec_helper'
 
 describe Runner do
   it "should parse options" do
-    runner = Runner.new(%w(start --pid test.pid --port 5000))
+    runner = Runner.new(%w(start --pid test.pid --port 5000 -o 3000))
     
     runner.options[:pid].should == 'test.pid'
     runner.options[:port].should == 5000
+    runner.options[:only].should == 3000
   end
   
   it "should parse specified command" do
@@ -164,4 +165,4 @@ describe Runner, "service" do
     
     runner.run!
   end  
-end
+end

data/spec/server/pipelining_spec.rb

@@ -16,6 +16,7 @@ describe Server, "HTTP pipelining" do
     socket.write "GET /first HTTP/1.1\r\nConnection: keep-alive\r\n\r\n"
     socket.flush
     socket.write "GET /second HTTP/1.1\r\nConnection: close\r\n\r\n"
+    socket.flush
     response = socket.read
     socket.close
     

data/spec/server/stopping_spec.rb

@@ -5,13 +5,21 @@ describe Server, "stopping" do
     start_server do |env|
       [200, { 'Content-Type' => 'text/html' }, ['ok']]
     end
+    @done = false
   end
   
   it "should wait for current requests before soft stopping" do
     socket = TCPSocket.new('0.0.0.0', 3333)
     socket.write("GET / HTTP/1.1")
-    @server.stop # Stop the server in the middle of a request
-    socket.write("\r\n\r\n")
+    EventMachine.next_tick do
+      @server.stop # Stop the server in the middle of a request
+      socket.write("\r\n\r\n")
+      @done = true
+    end
+    
+    timeout(2) do
+      Thread.pass until @done
+    end
     
     out = socket.read
     socket.close
@@ -36,7 +44,9 @@ describe Server, "stopping" do
     socket.write("GET / HTTP/1.1")
     @server.stop! # Force stop the server in the middle of a request
     
-    EventMachine.next_tick { socket.should be_closed }
+    EventMachine.next_tick do
+      socket.should be_closed
+    end
   end
   
   after do

data/spec/spec_helper.rb

@@ -63,7 +63,7 @@ module Matchers
   class ValidateWithLint
     def matches?(request)
       @request = request
-      Rack::Lint.new(proc{[200, {'Content-Type' => 'text/html'}, []]}).call(@request.env)
+      Rack::Lint.new(proc{[200, {'Content-Type' => 'text/html', 'Content-Length' => '0'}, []]}).call(@request.env)
       true
     rescue Rack::Lint::LintError => e
       @message = e.message
@@ -71,7 +71,7 @@ module Matchers
     end
     
     def failure_message(negation=nil)
-      "should#{negation} validate with Rack Lint"
+      "should#{negation} validate with Rack Lint: #{@message}"
     end
 
     def negative_failure_message

data/tasks/gem.rake

@@ -1,4 +1,5 @@
 require 'rake/gempackagetask'
+require 'yaml'
 
 WIN_SUFFIX = ENV['WIN_SUFFIX'] || 'i386-mswin32'
 
@@ -19,13 +20,13 @@ spec = Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 1.8.5'
   
-  s.add_dependency        'rack',         '>= 0.3.0'
-  s.add_dependency        'eventmachine', '>= 0.12.0'
+  s.add_dependency        'rack',         '>= 1.0.0'
+  s.add_dependency        'eventmachine', '>= 0.12.6'
   unless WIN
     s.add_dependency      'daemons',      '>= 1.0.9'
   end
 
-  s.files                 = %w(COPYING CHANGELOG COMMITTERS README Rakefile) +
+  s.files                 = %w(COPYING CHANGELOG README Rakefile) +
                             Dir.glob("{benchmark,bin,doc,example,lib,spec,tasks}/**/*") + 
                             Dir.glob("ext/**/*.{h,c,rb,rl}")
   
@@ -58,6 +59,11 @@ end
 task :gem => :tag_warn
 
 namespace :gem do
+  desc "Update the gemspec for GitHub's gem server"
+  task :github do
+    File.open("thin.gemspec", 'w') { |f| f << YAML.dump(spec) }
+  end
+  
   desc 'Upload gem to code.macournoyer.com'
   task :upload => :gem do
     upload "pkg/#{spec.full_name}.gem", 'gems'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thin
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.2.1
 platform: ruby
 authors: 
 - Marc-Andre Cournoyer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-28 00:00:00 -04:00
+date: 2009-05-01 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.0
+        version: 1.0.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.12.0
+        version: 0.12.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: daemons
@@ -53,7 +53,6 @@ extra_rdoc_files: []
 files: 
 - COPYING
 - CHANGELOG
-- COMMITTERS
 - README
 - Rakefile
 - benchmark/abc
@@ -61,6 +60,9 @@ files:
 - benchmark/runner
 - bin/thin
 - example/adapter.rb
+- example/async_app.ru
+- example/async_chat.ru
+- example/async_tailer.ru
 - example/config.ru
 - example/monit_sockets
 - example/monit_unixsock
@@ -74,8 +76,6 @@ files:
 - lib/rack/adapter
 - lib/rack/adapter/loader.rb
 - lib/rack/adapter/rails.rb
-- lib/rack/handler
-- lib/rack/handler/thin.rb
 - lib/thin
 - lib/thin/backends
 - lib/thin/backends/base.rb
@@ -101,6 +101,7 @@ files:
 - lib/thin/statuses.rb
 - lib/thin/version.rb
 - lib/thin.rb
+- lib/thin_parser.bundle
 - spec/backends
 - spec/backends/swiftiply_client_spec.rb
 - spec/backends/tcp_server_spec.rb
@@ -240,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: thin
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: A thin and fast web server