thin 1.2.5 → 1.2.6

data/CHANGELOG

@@ -1,3 +1,8 @@
+== 1.2.6 Crazy Delicious
+ * Make work with Rails 3 out-of-the-box.
+ * Auto-detect and load config.ru files on start. Makes Rails 3 work.
+ * Fix signals being ignored under 1.9 when daemonized.
+
 == 1.2.5 This Is Not A Web Server
  * Add rolling restart support (--onebyone option) [sikachu]
  * Force external_encoding of request's body to ASCII_8BIT [jeremyz]

data/lib/rack/adapter/loader.rb

@@ -8,6 +8,7 @@ module Rack
   # NOTE: If a framework has a file that is not unique, make sure to place
   # it at the end.
   ADAPTERS = [
+    [:rack,    'config.ru'],
     [:rails,   'config/environment.rb'],
     [:ramaze,  'start.rb'],
     [:halcyon, 'runner.ru'],
@@ -29,9 +30,20 @@ module Rack
       raise AdapterNotFound, "No adapter found for #{dir}"
     end
     
+    # Load a Rack application from a Rack config file (.ru).
+    def self.load(config)
+      rackup_code = ::File.read(config)
+      eval("Rack::Builder.new {( #{rackup_code}\n )}.to_app", TOPLEVEL_BINDING, config)
+    end
+    
     # Loads an adapter identified by +name+ using +options+ hash.
     def self.for(name, options={})
+      ENV['RACK_ENV'] = options[:environment]
+      
       case name.to_sym
+      when :rack
+        return load(::File.join(options[:chdir], "config.ru"))
+        
       when :rails
         return Rails.new(options.merge(:root => options[:chdir]))
       

data/lib/thin.rb

@@ -3,44 +3,44 @@ require 'timeout'
 require 'stringio'
 require 'time'
 require 'forwardable'
-
 require 'openssl'
 require 'eventmachine'
-
-require 'thin/version'
-require 'thin/statuses'
+require 'rack'
 
 module Thin
-  autoload :Command,            'thin/command'
-  autoload :Connection,         'thin/connection'
-  autoload :Daemonizable,       'thin/daemonizing'
-  autoload :Logging,            'thin/logging'
-  autoload :Headers,            'thin/headers'
-  autoload :Request,            'thin/request'
-  autoload :Response,           'thin/response'
-  autoload :Runner,             'thin/runner'
-  autoload :Server,             'thin/server'
-  autoload :Stats,              'thin/stats'
+  ROOT = File.expand_path(File.dirname(__FILE__))
+  
+  autoload :Command,            "#{ROOT}/thin/command"
+  autoload :Connection,         "#{ROOT}/thin/connection"
+  autoload :Daemonizable,       "#{ROOT}/thin/daemonizing"
+  autoload :Logging,            "#{ROOT}/thin/logging"
+  autoload :Headers,            "#{ROOT}/thin/headers"
+  autoload :Request,            "#{ROOT}/thin/request"
+  autoload :Response,           "#{ROOT}/thin/response"
+  autoload :Runner,             "#{ROOT}/thin/runner"
+  autoload :Server,             "#{ROOT}/thin/server"
+  autoload :Stats,              "#{ROOT}/thin/stats"
   
   module Backends
-    autoload :Base,             'thin/backends/base'
-    autoload :SwiftiplyClient,  'thin/backends/swiftiply_client'
-    autoload :TcpServer,        'thin/backends/tcp_server'
-    autoload :UnixServer,       'thin/backends/unix_server'
+    autoload :Base,             "#{ROOT}/thin/backends/base"
+    autoload :SwiftiplyClient,  "#{ROOT}/thin/backends/swiftiply_client"
+    autoload :TcpServer,        "#{ROOT}/thin/backends/tcp_server"
+    autoload :UnixServer,       "#{ROOT}/thin/backends/unix_server"
   end
   
   module Controllers
-    autoload :Cluster,          'thin/controllers/cluster'
-    autoload :Controller,       'thin/controllers/controller'
-    autoload :Service,          'thin/controllers/service'
+    autoload :Cluster,          "#{ROOT}/thin/controllers/cluster"
+    autoload :Controller,       "#{ROOT}/thin/controllers/controller"
+    autoload :Service,          "#{ROOT}/thin/controllers/service"
   end
 end
 
-require 'rack'
-require 'rack/adapter/loader'
+require "#{Thin::ROOT}/thin/version"
+require "#{Thin::ROOT}/thin/statuses"
+require "#{Thin::ROOT}/rack/adapter/loader"
 
 module Rack
   module Adapter
-    autoload :Rails, 'rack/adapter/rails'
+    autoload :Rails, "#{Thin::ROOT}/rack/adapter/rails"
   end
 end

data/lib/thin/controllers/controller.rb

@@ -172,8 +172,7 @@ module Thin
             Kernel.load(@options[:rackup])
             Object.const_get(File.basename(@options[:rackup], '.rb').capitalize.to_sym)
           when /\.ru$/
-            rackup_code = File.read(@options[:rackup])
-            eval("Rack::Builder.new {( #{rackup_code}\n )}.to_app", TOPLEVEL_BINDING, @options[:rackup])
+            Rack::Adapter.load(@options[:rackup])
           else
             raise "Invalid rackup file.  please specify either a .ru or .rb file"
           end

data/lib/thin/daemonizing.rb

@@ -36,18 +36,21 @@ module Thin
     def daemonize
       raise PlatformNotSupported, 'Daemonizing is not supported on Windows'     if Thin.win?
       raise ArgumentError,        'You must specify a pid_file to daemonize' unless @pid_file
-
+      
       remove_stale_pid_file
       
       pwd = Dir.pwd # Current directory is changed during daemonization, so store it
       
+      # HACK we need to create the directory before daemonization to prevent a bug under 1.9
+      #      ignoring all signals when the directory is created after daemonization.
+      FileUtils.mkdir_p File.dirname(@pid_file)
+      
       Daemonize.daemonize(File.expand_path(@log_file), name)
       
       Dir.chdir(pwd)
       
       write_pid_file
       
-      trap('HUP') { restart }
       at_exit do
         log ">> Exiting!"
         remove_pid_file
@@ -153,7 +156,6 @@ module Thin
     
       def write_pid_file
         log ">> Writing PID to #{@pid_file}"
-        FileUtils.mkdir_p File.dirname(@pid_file)
         open(@pid_file,"w") { |f| f.write(Process.pid) }
         File.chmod(0644, @pid_file)
       end

data/lib/thin/request.rb

@@ -1,4 +1,4 @@
-require 'thin_parser'
+require "#{Thin::ROOT}/thin_parser"
 require 'tempfile'
 
 module Thin
@@ -16,7 +16,7 @@ module Thin
     
     INITIAL_BODY      = ''
     # Force external_encoding of request's body to ASCII_8BIT
-    INITIAL_BODY.encode!(Encoding::ASCII_8BIT) if INITIAL_BODY.respond_to?(:encode)
+    INITIAL_BODY.encode!(Encoding::ASCII_8BIT) if INITIAL_BODY.respond_to?(:encode!)
     
     # Freeze some HTTP header names & values
     SERVER_SOFTWARE   = 'SERVER_SOFTWARE'.freeze

data/lib/thin/server.rb

@@ -208,11 +208,12 @@ module Thin
     protected
       # Register signals:
       # * INT calls +stop+ to shutdown gracefully.
-      # * TERM calls <tt>stop!</tt> to force shutdown.    
+      # * TERM calls <tt>stop!</tt> to force shutdown.
       def setup_signals
         trap('QUIT') { stop }  unless Thin.win?
         trap('INT')  { stop! }
         trap('TERM') { stop! }
+        trap('HUP')  { restart }
       end
       
       def select_backend(host, port, options)

data/lib/thin/version.rb

@@ -6,11 +6,11 @@ module Thin
   module VERSION #:nodoc:
     MAJOR    = 1
     MINOR    = 2
-    TINY     = 5
+    TINY     = 6
     
     STRING   = [MAJOR, MINOR, TINY].join('.')
     
-    CODENAME = "This Is Not A Web Server".freeze
+    CODENAME = "Crazy Delicious".freeze
     
     RACK     = [1, 0].freeze # Rack protocol version
   end

data/spec/rack/loader_spec.rb

@@ -2,9 +2,18 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Rack::Adapter do
   before do
+    @config_ru_path = File.dirname(__FILE__) + '/../../example'
     @rails_path = File.dirname(__FILE__) + '/../rails_app'
   end
   
+  it "should load Rack app from config" do
+    Rack::Adapter.load(@config_ru_path + '/config.ru').class.should == Proc
+  end
+  
+  it "should guess Rack app from dir" do
+    Rack::Adapter.guess(@config_ru_path).should == :rack
+  end
+  
   it "should guess rails app from dir" do
     Rack::Adapter.guess(@rails_path).should == :rails
   end
@@ -13,6 +22,10 @@ describe Rack::Adapter do
     proc { Rack::Adapter.guess('.') }.should raise_error(Rack::AdapterNotFound)
   end
   
+  it "should load Rack adapter" do
+    Rack::Adapter.for(:rack, :chdir => @config_ru_path).class.should == Proc
+  end
+  
   it "should load Rails adapter" do
     Rack::Adapter::Rails.should_receive(:new)
     Rack::Adapter.for(:rails, :chdir => @rails_path)

data/spec/request/processing_spec.rb

@@ -44,6 +44,7 @@ describe Request, 'processing' do
   end
   
   it "should set body external encoding to ASCII_8BIT" do
+    pending("Ruby 1.9 compatible implementations only") unless StringIO.instance_methods.include? :external_encoding
     Request.new.body.external_encoding.should == Encoding::ASCII_8BIT
   end
 end

data/spec/server_spec.rb

@@ -12,6 +12,10 @@ describe Server do
   end
 
   it "should set lower maximum_connections size when too large" do
+    # root users under Linux will not have a limitation on maximum
+    # connections, so we cannot really run this test under that
+    # condition.
+    pending("only for non-root users") if Process.euid == 0
     @server.maximum_connections = 100_000
     @server.config
     @server.maximum_connections.should < 100_000

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thin
 version: !ruby/object:Gem::Version 
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors: 
 - Marc-Andre Cournoyer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-13 00:00:00 -05:00
+date: 2010-02-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency