thin 0.6.2 → 0.6.3

data/spec/server/builder_spec.rb

@@ -0,0 +1,38 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Server, 'app builder' do
+  it "should build app from constructor" do
+    server = Server.new('0.0.0.0', 3000, :works)
+    
+    server.app.should == :works
+  end
+  
+  it "should build app from builder block" do
+    server = Server.new '0.0.0.0', 3000 do
+      run(proc { |env| :works })
+    end
+    
+    server.app.call({}).should == :works
+  end
+  
+  it "should use middlewares in builder block" do
+    server = Server.new '0.0.0.0', 3000 do
+      use Rack::ShowExceptions
+      run(proc { |env| :works })
+    end
+    
+    server.app.class.should == Rack::ShowExceptions
+    server.app.call({}).should == :works
+  end
+  
+  it "should work with Rack url mapper" do
+    server = Server.new '0.0.0.0', 3000 do
+      map '/test' do
+        run(proc { |env| :works })
+      end
+    end
+    
+    server.app.call({})[0].should == 404
+    server.app.call({'PATH_INFO' => '/test'}).should == :works
+  end
+end

data/spec/server/stopping_spec.rb

@@ -0,0 +1,45 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Server, "stopping" do
+  before do
+    start_server do |env|
+      [200, { 'Content-Type' => 'text/html', 'Content-Length' => '2' }, ['ok']]
+    end
+  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")
+    
+    out = socket.read
+    socket.close
+    
+    out.should_not be_empty
+  end
+  
+  it "should not accept new requests when 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
+    
+    EventMachine.next_tick do
+      proc { get('/') }.should raise_error(Errno::ECONNRESET)
+    end
+    
+    socket.close
+  end
+  
+  it "should drop current requests when hard stopping" do
+    socket = TCPSocket.new('0.0.0.0', 3333)
+    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 }
+  end
+  
+  after do
+    stop_server
+  end
+end

data/spec/server/tcp_spec.rb

@@ -0,0 +1,54 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Server, 'on TCP socket' do
+  before do
+    start_server do |env|
+      body = env.inspect + env['rack.input'].read
+      [200, { 'Content-Type' => 'text/html', 'Content-Length' => body.size.to_s }, body]
+    end
+  end
+    
+  it 'should GET from Net::HTTP' do
+    get('/?cthis').should include('cthis')
+  end
+  
+  it 'should GET from TCPSocket' do
+    send_data("GET /?this HTTP/1.1\r\n\r\n").
+      should include("HTTP/1.1 200 OK",
+                     "Content-Type: text/html", "Content-Length: ",
+                     "Connection: close", "this")
+  end
+  
+  it 'should return empty string on incomplete headers' do
+    send_data("GET /?this HTTP/1.1\r\nHost:").should be_empty
+  end
+  
+  it 'should return empty string on incorrect Content-Length' do
+    send_data("POST / HTTP/1.1\r\nContent-Length: 300\r\n\r\naye").should be_empty
+  end
+  
+  it 'should POST from Net::HTTP' do
+    post('/', :arg => 'pirate').should include('arg=pirate')
+  end
+  
+  it 'should handle big POST' do
+    big = 'X' * (20 * 1024)
+    post('/', :big => big).should include(big)
+  end
+  
+  it "should handle GET in less then #{get_request_time = 0.004} RubySecond" do
+    proc { get('/') }.should be_faster_then(get_request_time)
+  end
+  
+  it "should handle POST in less then #{post_request_time = 0.007} RubySecond" do
+    proc { post('/', :file => 'X' * 1000) }.should be_faster_then(post_request_time)
+  end
+  
+  it "should retreive remote address" do
+    get('/').should include('"REMOTE_ADDR"=>"127.0.0.1"')
+  end
+  
+  after do
+    stop_server
+  end
+end

data/spec/server/unix_socket_spec.rb

@@ -0,0 +1,30 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Server, "on UNIX domain socket" do
+  before do
+    start_server('/tmp/thin_test.sock') do |env|
+      [200, { 'Content-Type' => 'text/html', 'Content-Length' => env.inspect.size.to_s }, [env.inspect]]
+    end
+  end
+  
+  it "should accept GET request" do
+    get("/?this").should include('this')
+  end
+  
+  it "should retreive remote address" do    
+    get('/').should include('"REMOTE_ADDR"=>""') # Is that right?
+  end
+  
+  it "should handle GET in less then #{get_request_time = 0.002} RubySecond" do
+    proc { get('/') }.should be_faster_then(get_request_time)
+  end
+  
+  it "should remove socket file after server stops" do
+    @server.stop!
+    File.exist?('/tmp/thin_test.sock').should be_false
+  end
+  
+  after do
+    stop_server
+  end
+end

data/spec/spec_helper.rb

@@ -5,26 +5,13 @@ require 'benchmark'
 require 'timeout'
 require 'fileutils'
 require 'benchmark_unit'
+require 'net/http'
+require 'socket'
 
 include Thin
 
 FileUtils.mkdir_p File.dirname(__FILE__) + '/../log'
-
-class TestRequest < Thin::Request
-  def initialize(path, verb='GET', params={})
-    @path = path
-    @verb = verb.to_s.upcase
-    @params = {
-      'HTTP_HOST'      => 'localhost:3000',
-      'REQUEST_URI'    => @path,
-      'REQUEST_PATH'   => @path,
-      'REQUEST_METHOD' => @verb,
-      'SCRIPT_NAME'    => @path
-    }.merge(params)
-    
-    @body = "#{@verb} #{path} HTTP/1.1"
-  end
-end
+Command.script = File.dirname(__FILE__) + '/../bin/thin'
 
 module Matchers
   class BeFasterThen
@@ -139,6 +126,52 @@ module Helpers
   ensure
     stream.reopen(old_stream)
   end
+  
+  # Create and parse a request
+  def R(raw, convert_line_feed=false)
+    raw.gsub!("\n", "\r\n") if convert_line_feed
+    request = Thin::Request.new
+    request.parse(raw)
+    request
+  end
+  
+  def start_server(*args, &app)
+    @server = Thin::Server.new(args[0] || '0.0.0.0', args[1] || 3333, app)
+    @server.timeout = 3
+    @server.silent = true
+    
+    @thread = Thread.new { @server.start }
+    sleep 0.1 until @thread.status == 'sleep'
+  end
+  
+  def stop_server
+    @server.stop!
+    @thread.kill
+  end
+    
+  def send_data(data)
+    if @server.connector.class == Connectors::UnixServer
+      socket = UNIXSocket.new(@server.socket)
+    else
+      socket = TCPSocket.new(@server.host, @server.port)
+    end
+    socket.write data
+    out = socket.read
+    socket.close
+    out
+  end
+  
+  def get(url)
+    if @server.connector.class == Connectors::UnixServer
+      send_data("GET #{url} HTTP/1.1\r\n\r\n")
+    else
+      Net::HTTP.get(URI.parse("http://#{@server.host}:#{@server.port}" + url))
+    end
+  end
+  
+  def post(url, params={})
+    Net::HTTP.post_form(URI.parse("http://#{@server.host}:#{@server.port}" + url), params).body
+  end
 end
 
 Spec::Runner.configure do |config|

data/tasks/announce.rake

@@ -1,7 +1,7 @@
 require 'erb'
 
 MSG_TEMPLATE = File.dirname(__FILE__) + '/email.erb'
-SEND_TO      = %w(thin-ruby@googlegroups.com eventmachine-talk@rubyforge.org Rubymtl@lists.artengine.ca ruby-talk@ruby-lang.org)
+SEND_TO      = %w(thin-ruby@googlegroups.com eventmachine-talk@rubyforge.org Rubymtl@lists.artengine.ca ruby-talk@ruby-lang.org montreal-on-rails@googlegroups.com)
 
 desc 'Generate a template for the new version annoucement'
 task :ann do
@@ -9,10 +9,14 @@ task :ann do
     
   body = <<END_OF_MESSAGE
 To: #{SEND_TO.join(', ')}
-Subject: [ANN] Thin #{Thin::VERSION::STRING} #{Thin::VERSION::CODENAME} released
+Subject: [ANN] Thin #{Thin::VERSION::STRING} #{Thin::VERSION::CODENAME} release
 
 #{msg}
 END_OF_MESSAGE
 
-  puts body
+  `echo "#{body}" | mate`
+end
+
+def changelog
+  File.read('CHANGELOG').split("==")[1].split("\n")[1..-1].join("\n")
 end

data/tasks/email.erb

@@ -6,37 +6,27 @@ http://code.macournoyer.com/thin/
 
 == What's new?
 
-Bug fix in daemon mode and speed boost for all!
-
-* Don't read the full body, use direct streaming when sending response.
-  See: Response#each
-  As a result, the Content-Length can not be calculated anymore.
-  You have to do set this in your adapter. All frameworks do it anyway.
-  It improve memory usage and boost speed for low concurrency.
-  Thanks to Kent Sibilev and Ezra for their help on that one.
-* Add 'Server' response header
-* Fix --user and --group option not changing daemon process privileges
+<%= changelog %>
 
 == Get it!
 
  sudo gem install thin
  
-Might take some time for the gem mirrors to be updated, try adding
---source http://code.macournoyer.com to the command if it doesn't work
+Or using my mirror:
 
-If you installed a previous alpha version (if you have <%= Thin::VERSION::STRING %> already installed)
-uninstall it before: sudo gem uninstall thin
+ sudo gem install thin --source http://code.macournoyer.com
 
 WARNING:
-Thin is still alpha software, if you use it on your server you understand the
-risks that are involved.
+  Thin is still alpha software, if you use it on your server you understand the
+  risks that are involved.
  
 == Contribute
 
 If you're using Thin, let me know and I'll put your site on http://code.macournoyer.com/thin/users/
 
-Thin is driven by an active community of passionate coders and benchmarkers. Please join us, contribute
-or share some ideas in Thin Google Group: http://groups.google.com/group/thin-ruby/topics
+Thin is driven by an active community of passionate coders and benchmarkers.
+Please join us, contribute or share some ideas in Thin Google Group:
+http://groups.google.com/group/thin-ruby/topics
 
 Also on IRC: #thin on freenode
 

data/tasks/gem.rake

@@ -74,7 +74,14 @@ namespace :gem do
       sh "rubyforge add_file thin thin #{Thin::VERSION::STRING} pkg/#{spec.full_name}.gem"
       sh "rubyforge add_file thin thin #{Thin::VERSION::STRING} pkg/#{spec.full_name}-x86-mswin32-60.gem"
     end
-  end  
+  end
+  
+  desc 'Download the Windows gem from Kevin repo'
+  task 'download:win' => 'pkg' do
+    cd 'pkg' do
+      `wget http://rubygems.bantamtech.com/ruby18/gems/#{spec.full_name}-x86-mswin32-60.gem`
+    end
+  end
 end
 
 task :install => [:clobber, :compile, :package] do

data/tasks/stats.rake

@@ -3,13 +3,26 @@ task :stats do
   line_count = proc do |path|
     Dir[path].collect { |f| File.open(f).readlines.reject { |l| l =~ /(^\s*(\#|\/\*))|^\s*$/ }.size }.inject(0){ |sum,n| sum += n }
   end
-  lib = line_count['lib/**/*.rb']
-  ext = line_count['ext/**/*.{c,h}'] 
-  spec = line_count['spec/**/*.rb']
-  ratio = '%1.2f' % (spec.to_f / lib.to_f)
+  comment_count = proc do |path|
+    Dir[path].collect { |f| File.open(f).readlines.select { |l| l =~ /^\s*\#/ }.size }.inject(0) { |sum,n| sum += n }
+  end
+  lib     = line_count['lib/**/*.rb']
+  comment = comment_count['lib/**/*.rb']
+  ext     = line_count['ext/**/*.{c,h}'] 
+  spec    = line_count['spec/**/*.rb']
+  
+  comment_ratio = '%1.2f' % (comment.to_f / lib.to_f)
+  spec_ratio = '%1.2f' % (spec.to_f / lib.to_f)
   
-  puts "#{lib.to_s.rjust(6)} LOC of lib"
-  puts "#{ext.to_s.rjust(6)} LOC of ext"
-  puts "#{spec.to_s.rjust(6)} LOC of spec"
-  puts "#{ratio.to_s.rjust(6)} ratio lib/spec"
+  puts '/======================\\'
+  puts '| Part            LOC  |'
+  puts '|======================|'
+  puts "| lib             #{lib.to_s.ljust(5)}|"
+  puts "| lib comments    #{comment.to_s.ljust(5)}|"
+  puts "| ext             #{ext.to_s.ljust(5)}|"
+  puts "| spec            #{spec.to_s.ljust(5)}|"
+  puts '| ratios:              |'
+  puts "|   lib/comment   #{comment_ratio.to_s.ljust(5)}|"
+  puts "|   lib/spec      #{spec_ratio.to_s.ljust(5)}|"
+  puts '\======================/'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thin
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors: 
 - Marc-Andre Cournoyer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-30 00:00:00 -05:00
+date: 2008-02-07 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,28 +61,46 @@ files:
 - example/config.ru
 - example/monit_sockets
 - example/monit_unixsock
+- example/ramaze.ru
 - example/thin.god
+- example/vlad.rake
 - 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/command.rb
 - lib/thin/connection.rb
+- lib/thin/connectors
+- lib/thin/connectors/connector.rb
+- lib/thin/connectors/tcp_server.rb
+- lib/thin/connectors/unix_server.rb
+- lib/thin/controllers
+- lib/thin/controllers/cluster.rb
+- lib/thin/controllers/controller.rb
+- lib/thin/controllers/service.rb
+- lib/thin/controllers/service.sh.erb
 - lib/thin/daemonizing.rb
 - lib/thin/headers.rb
 - lib/thin/logging.rb
 - lib/thin/request.rb
 - lib/thin/response.rb
+- lib/thin/runner.rb
 - lib/thin/server.rb
+- lib/thin/stats.html.erb
 - lib/thin/stats.rb
 - lib/thin/statuses.rb
 - lib/thin/version.rb
 - lib/thin.rb
-- spec/cluster_spec.rb
 - spec/command_spec.rb
+- spec/configs
+- spec/configs/cluster.yml
+- spec/configs/single.yml
+- spec/controllers
+- spec/controllers/cluster_spec.rb
+- spec/controllers/controller_spec.rb
+- spec/controllers/service_spec.rb
 - spec/daemonizing_spec.rb
 - spec/headers_spec.rb
 - spec/rack_rails_spec.rb
@@ -144,9 +162,18 @@ files:
 - spec/rails_app/script/server
 - spec/rails_app/tmp
 - spec/rails_app/tmp/pids
-- spec/request_spec.rb
+- spec/request
+- spec/request/mongrel_spec.rb
+- spec/request/parser_spec.rb
+- spec/request/perf_spec.rb
+- spec/request/processing_spec.rb
 - spec/response_spec.rb
-- spec/server_spec.rb
+- spec/runner_spec.rb
+- spec/server
+- spec/server/builder_spec.rb
+- spec/server/stopping_spec.rb
+- spec/server/tcp_spec.rb
+- spec/server/unix_socket_spec.rb
 - spec/spec_helper.rb
 - tasks/announce.rake
 - tasks/deploy.rake