thin 0.5.2 → 0.5.3

data/CHANGELOG

@@ -0,0 +1,40 @@
+== 0.5.3 Purple Yogurt release
+ * win32 pre-compiled gem now available
+ * change rake task configuration to allow win32 gem build
+ * Add prefix option to thin script to mount app under a given path.
+
+== 0.5.2 Cheezburger release
+ * Add cluster support through the -s option in the thin script, start 3 thins like this:
+    thin start -s3 -p3000
+   3 thin servers will be started on port 3000, 3001, 3002, also the port number will be
+   injected in the pid and log filenames.
+ * Fix IOError when writing to logger when starting server as a daemon.
+ * Really change directory when the -c option is specified.
+ * Add restart command to thin script.
+ * Fix typos in thin script usage message and expand chdir path.
+ * Rename thin script options to be the same as mongrel_rails script [thronedrk]:
+     -o --host  => -a --address
+     --log-file => --log
+     --pid-file => --pid
+     --env      => --environment
+ 
+== 0.5.1 LOLCAT release
+ * Add URL rewriting to Rails adapter so that page caching works and / fetches index.html if present.
+ * Fix bug in multiline response header parsing.
+ * Add specs for the Rails adapter.
+ * Fix Set-Cookie headers in Rails adapter to handle multiple values correctly.
+ * Fix Ruby 1.9 incompatibility in Response#headers= and Rakefile.
+ * Fix parser to be Ruby 1.9 compatible [Aman Gupta]
+ * Set gemspec to use EventMachine version 0.8.1 as it's the latest one having precompiled windows binaries.
+   [Francis Cianfrocca].
+ * Add -D option to thin script to set debugging on.
+ * Output incoming data and response when debugging is on.
+
+== 0.5.0
+ * Full rewrite to use EventMachine, Rack and Mongrel parser
+ 
+== 0.4.1
+ * Fix Rails environment option not being used in thin script.
+ 
+== 0.4.0
+ * First alphaish release as a gem.

data/Rakefile

@@ -1,17 +1,11 @@
 RUBY_1_9 = RUBY_VERSION =~ /^1\.9/
+WIN      = (PLATFORM =~ /mswin|cygwin/)
+SUDO     = (WIN ? "" : "sudo")
 
 require 'rake'
 require 'rake/clean'
 require 'lib/thin'
+
 Dir['tasks/**/*.rake'].each { |rake| load rake }
 
 task :default => [:compile, :spec]
-
-task :install => :compile do
-  sh %{rake package}
-  sh %{sudo #{gem} install pkg/#{Thin::NAME}-#{Thin::VERSION::STRING}}
-end
-
-task :uninstall => :clean do
-  sh %{sudo #{gem} uninstall #{Thin::NAME}}
-end

data/benchmark/previous.rb

@@ -0,0 +1,14 @@
+# Benchmark to compare Thin performance against
+# previous Thin version (the one installed as a gem).
+#
+# Run with:
+#
+#  ruby previous.rb [num of request]
+#
+require 'rubygems'
+require 'rack'
+require File.dirname(__FILE__) + '/utils'
+
+request = (ARGV[0] || 1000).to_i # Number of request to send (ab -n option)
+
+benchmark %w(current gem), request

data/benchmark/simple.rb

@@ -0,0 +1,13 @@
+# Simple benchmark to compare Thin performance against
+# other webservers supported by Rack.
+#
+# Run with:
+#
+#  ruby simple.rb [num of request]
+#
+require File.dirname(__FILE__) + '/../lib/thin'
+require File.dirname(__FILE__) + '/utils'
+
+request = (ARGV[0] || 1000).to_i # Number of request to send (ab -n option)
+
+benchmark %w(WEBrick Mongrel EMongrel Thin), request

data/benchmark/utils.rb

@@ -0,0 +1,51 @@
+require 'rack/lobster'
+
+def run(handler_name, n=1000, c=1)
+  server = fork do
+    [STDOUT, STDERR].each { |o| o.reopen "/dev/null" }
+      
+    case handler_name
+    when 'EMongrel'
+      require 'swiftcore/evented_mongrel'
+      handler_name = 'Mongrel'
+    
+    when 'gem' # Load the current Thin gem
+      require 'thin'
+      handler_name = 'Thin'
+    
+    when 'current' # Load the current Thin version under /lib
+      require File.dirname(__FILE__) + '/../lib/thin'
+      handler_name = 'Thin'
+      
+    end
+    
+    app = Rack::Lobster.new
+    
+    handler = Rack::Handler.const_get(handler_name)
+    handler.run app, :Host => '0.0.0.0', :Port => 7000
+  end
+
+  sleep 2
+
+  out = `nice -n20 ab -c #{c} -n #{n} http://127.0.0.1:7000/ 2> /dev/null`
+
+  Process.kill('SIGKILL', server)
+  Process.wait
+  
+  if requests = out.match(/^Requests.+?(\d+\.\d+)/)
+    failed = out.match(/^Failed requests.+?(\d+)$/)[1]
+    "#{requests[1].to_s.ljust(9)} #{failed}"
+  else
+    'ERROR'
+  end
+end
+
+def benchmark(servers, request, concurrency_levels=[1, 10, 100])
+  puts 'server     request   concurrency   req/s     failures'
+  puts '=' * 53
+  concurrency_levels.each do |c|
+    servers.each do |server|
+      puts "#{server.ljust(8)}   #{request}      #{c.to_s.ljust(4)}          #{run(server, request, c)}"
+    end
+  end
+end

data/bin/thin

@@ -43,6 +43,7 @@ opts = OptionParser.new do |opts|
                                  "(default: #{options[:timeout]})")               { |sec| options[:timeout] = sec.to_i }
   opts.on("-u", "--user NAME", "User to run daemon as (use with -g)")             { |user| options[:user] = user }
   opts.on("-g", "--group NAME", "Group to run daemon as (use with -u)")           { |group| options[:group] = group }
+  opts.on(      "--prefix PATH", "Mount the app under PATH (start with /)")       { |path| options[:prefix] = path }
   
   opts.separator ""
   opts.separator "Common options:"
@@ -77,6 +78,10 @@ def start(options)
     end
   
     server.app = Rack::Adapter::Rails.new(options.merge(:root => options[:chdir]))
+    
+    # If a prefix is required, wrap in Rack URL mapper
+    server.app = Rack::URLMap.new(options[:prefix] => server.app) if options[:prefix]
+    
     server.start!
   end  
 end

data/lib/rack/adapter/rails.rb

@@ -14,8 +14,9 @@ module Rack
   module Adapter 
     class Rails
       def initialize(options={})
-        @root = options[:root]         || Dir.pwd
-        @env  = options[:environment]  || 'development'
+        @root   = options[:root]         || Dir.pwd
+        @env    = options[:environment]  || 'development'
+        @prefix = options[:prefix]
         
         load_application
         
@@ -27,6 +28,8 @@ module Rack
 
         require "#{@root}/config/environment"
         require 'dispatcher'
+        
+        ActionController::AbstractRequest.relative_url_root = @prefix if @prefix 
       end
       
       # TODO refactor this in File#can_serve?(path) ??

data/lib/thin/daemonizing.rb

@@ -31,6 +31,7 @@ module Thin
     
     # Turns the current script into a daemon process that detaches from the console.
     def daemonize
+      check_plateform_support
       raise ArgumentError, 'You must specify a pid_file to deamonize' unless @pid_file
       
       pwd = Dir.pwd # Current directory is changed during daemonization, so store it
@@ -49,6 +50,7 @@ module Thin
     # Change privileges of the process
     # to the specified user and group.
     def change_privilege(user, group=user)
+      check_plateform_support
       log ">> Changing process privilege to #{user}:#{group}"
       
       uid, gid = Process.euid, Process.egid
@@ -92,10 +94,14 @@ module Thin
     end
     
     private
+      def check_plateform_support
+        raise RuntimeError, 'Daemonizing not supported on Windows' if RUBY_PLATFORM =~ /mswin/
+      end
+      
       def remove_pid_file
         File.delete(@pid_file) if @pid_file && File.exists?(@pid_file)
       end
-
+      
       def write_pid_file
         log ">> Writing PID to #{@pid_file}"
         FileUtils.mkdir_p File.dirname(@pid_file)

data/lib/thin/request.rb

@@ -52,7 +52,7 @@ module Thin
         body << data
 			elsif @data.size > MAX_HEADER           # Oho! very big header, must be a mean person
 			  raise InvalidRequest, MAX_HEADER_MSG
-			else                                    # Parse more header
+			else                                    # Parse more header using the super parser
 			  @nparsed = @parser.execute(@env, @data, @nparsed)
 			end
 			

data/lib/thin/version.rb

@@ -2,10 +2,10 @@ module Thin
   module VERSION #:nodoc:
     MAJOR    = 0
     MINOR    = 5
-    TINY     = 2
+    TINY     = 3
 
     STRING   = [MAJOR, MINOR, TINY].join('.')
     
-    CODENAME = 'Cheezburger'
+    CODENAME = 'Purple Yogurt'
   end
 end

data/spec/rack_rails_spec.rb

@@ -4,7 +4,7 @@ require 'rack/mock'
 begin
   gem 'rails', '= 2.0.2' # We could freeze Rails in the rails_app dir to remove this
 
-  context Rack::Adapter::Rails do
+  describe Rack::Adapter::Rails do
     before do
       @rails_app_path = File.dirname(__FILE__) + '/rails_app'
       @request = Rack::MockRequest.new(Rack::Adapter::Rails.new(:root => @rails_app_path))
@@ -67,6 +67,25 @@ begin
       FileUtils.rm_rf @rails_app_path + '/public/simple'
     end
   end
+  
+  describe Rack::Adapter::Rails, 'with prefix' do
+    before do
+      @rails_app_path = File.dirname(__FILE__) + '/rails_app'
+      @prefix = '/nowhere'
+      @request = Rack::MockRequest.new(
+        Rack::URLMap.new(
+          @prefix => Rack::Adapter::Rails.new(:root => @rails_app_path, :prefix => @prefix)))
+    end
+  
+    it "should handle simple GET request" do
+      res = @request.get("#{@prefix}/simple", :lint => true)
+
+      res.should be_ok
+      res["Content-Type"].should include("text/html")
+
+      res.body.should include('Simple#index')
+    end
+  end
 
 rescue Gem::LoadError
   warn 'Rails 2.0.2 is required to run the Rails adapter specs'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thin
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors: 
 - Marc-Andre Cournoyer
@@ -9,26 +9,26 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-12 00:00:00 -05:00
+date: 2008-01-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: eventmachine
+  name: rack
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.8.1
+        version: 0.2.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: rack
+  name: eventmachine
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.0
+        version: 0.8.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: daemons
@@ -49,10 +49,33 @@ extra_rdoc_files: []
 
 files: 
 - COPYING
+- CHANGELOG
 - README
 - Rakefile
+- benchmark/previous.rb
+- benchmark/simple.rb
+- benchmark/utils.rb
 - bin/thin
 - doc/benchmarks.txt
+- example/config.ru
+- example/thin.god
+- lib/rack
+- lib/rack/adapter
+- lib/rack/adapter/rails.rb
+- lib/rack/handler
+- lib/rack/handler/thin.rb
+- lib/thin
+- lib/thin/cluster.rb
+- lib/thin/connection.rb
+- lib/thin/daemonizing.rb
+- lib/thin/headers.rb
+- lib/thin/logging.rb
+- lib/thin/request.rb
+- lib/thin/response.rb
+- lib/thin/server.rb
+- lib/thin/statuses.rb
+- lib/thin/version.rb
+- lib/thin.rb
 - spec/cluster_spec.rb
 - spec/daemonizing_spec.rb
 - spec/headers_spec.rb
@@ -116,26 +139,6 @@ files:
 - spec/response_spec.rb
 - spec/server_spec.rb
 - spec/spec_helper.rb
-- lib/rack
-- lib/rack/adapter
-- lib/rack/adapter/rails.rb
-- lib/rack/handler
-- lib/rack/handler/thin.rb
-- lib/thin
-- lib/thin/cluster.rb
-- lib/thin/connection.rb
-- lib/thin/daemonizing.rb
-- lib/thin/headers.rb
-- lib/thin/logging.rb
-- lib/thin/request.rb
-- lib/thin/response.rb
-- lib/thin/server.rb
-- lib/thin/statuses.rb
-- lib/thin/version.rb
-- lib/thin.rb
-- lib/thin_parser.bundle
-- example/config.ru
-- example/thin.god
 - ext/thin_parser/ext_help.h
 - ext/thin_parser/parser.h
 - ext/thin_parser/parser.c