RubyGems - thin - Versions diffs - 0.5.4-x86-mswin32-60 → 0.6.0-x86-mswin32-60 - Mend

thin 0.5.4-x86-mswin32-60 → 0.6.0-x86-mswin32-60

Potentially problematic release.

This version of thin might be problematic. Click here for more details.

Files changed (37) hide show

@@ -0,0 +1,64 @@
+module Thin
+  # Rack adapter to log stats to a Rack application
+  module Stats
+    class Adapter
+      def initialize(app, path='/stats')
+        @app  = app
+        @path = path
+        @requests          = 0
+        @requests_finished = 0
+        @start_time        = Time.now
+      end
+      def call(env)
+        if env['PATH_INFO'].index(@path) == 0
+          serve(env)
+        else
+          log(env) { @app.call(env) }
+        end
+      end
+      def log(env)
+        @requests += 1
+        @server = env['SERVER_SOFTWARE']
+        request_started_at = Time.now
+        response = yield
+        @requests_finished += 1
+        @last_request_path = env['PATH_INFO']
+        @last_request_time = Time.now - request_started_at
+        response
+      end
+      def serve(env)
+        body = '<html><body>'
+        body << '<h1>Server stats</h1>'
+        body << '<ul>'
+        body << "<li>#{@requests} requests</li>"
+        body << "<li>#{@requests_finished} requests finished</li>"
+        body << "<li>#{@requests - @requests_finished} errors</li>"
+        body << "<li>#{Time.now - @start_time} uptime</li>"
+        body << "<li>Running on #{@server}</li>"
+        body << '</ul>'
+        body << '<h2>Last request</h2>'
+        body << '<ul>'
+        body << "<li>#{@last_request_path}</li>"
+        body << "<li>Took #{@last_request_time} sec</li>"
+        body << '</ul>'
+        body << '</body></html>'
+        [
+          200,
+          {
+            'Content-Type' => 'text/html',
+            'Content-Length' => body.size.to_s
+          },
+          body
+        ]
+      end
+    end
+  end
+end

data/lib/thin/version.rb CHANGED

@@ -1,11 +1,11 @@
 module Thin
   module VERSION #:nodoc:
     MAJOR    = 0
-    MINOR    = 5
-    TINY     = 4
+    MINOR    = 6
+    TINY     = 0
     STRING   = [MAJOR, MINOR, TINY].join('.')
-    CODENAME = 'Flying Mustard'
+    CODENAME = 'Big Pony'
   end
 end

data/lib/thin_parser.so CHANGED

Binary file

data/spec/cluster_spec.rb CHANGED

@@ -1,25 +1,24 @@
 require File.dirname(__FILE__) + '/spec_helper'
-describe Cluster do
+describe Cluster, "with host and port" do
   before do
-    @cluster = Thin::Cluster.new(:chdir => File.dirname(__FILE__) + '/rails_app',
-                                 :address => '0.0.0.0',
-                                 :port => 3000,
-                                 :servers => 3,
-                                 :timeout => 10,
-                                 :log => 'thin.log',
-                                 :pid => 'thin.pid'
-                                )
+    @cluster = Cluster.new(:chdir => File.dirname(__FILE__) + '/rails_app',
+                           :address => '0.0.0.0',
+                           :port => 3000,
+                           :servers => 3,
+                           :timeout => 10,
+                           :log => 'thin.log',
+                           :pid => 'thin.pid'
+                          )
     @cluster.script = File.dirname(__FILE__) + '/../bin/thin'
     @cluster.silent = true
   end
   it 'should include port number in file names' do
-    @cluster.send(:include_port_number, 'thin.log', 3000).should == 'thin.3000.log'
-    @cluster.send(:include_port_number, 'thin.pid', 3000).should == 'thin.3000.pid'
-    proc { @cluster.send(:include_port_number, 'thin', 3000) }.should raise_error(ArgumentError)
+    @cluster.send(:include_server_number, 'thin.log', 3000).should == 'thin.3000.log'
+    @cluster.send(:include_server_number, 'thin.pid', 3000).should == 'thin.3000.pid'
   end
   it 'should call each server' do
     calls = []
     @cluster.send(:with_each_server) do |port|
@@ -41,18 +40,69 @@ describe Cluster do
   it 'should start on specified port' do
     @cluster.should_receive(:`) do |with|
       with.should include('thin start', '--daemonize', 'thin.3001.log', 'thin.3001.pid', '--port=3001')
+      with.should_not include('--socket')
       ''
     end
-    @cluster.start_on_port 3001
+    @cluster.start_server 3001
   end
   it 'should stop on specified port' do
     @cluster.should_receive(:`) do |with|
       with.should include('thin stop', '--daemonize', 'thin.3001.log', 'thin.3001.pid', '--port=3001')
+      with.should_not include('--socket')
+      ''
+    end
+    @cluster.stop_server 3001
+  end
+end
+describe Cluster, "with UNIX socket" do
+  before do
+    @cluster = Cluster.new(:chdir => File.dirname(__FILE__) + '/rails_app',
+                           :socket => '/tmp/thin.sock',
+                           :address => '0.0.0.0',
+                           :port => 3000,
+                           :servers => 3,
+                           :timeout => 10,
+                           :log => 'thin.log',
+                           :pid => 'thin.pid'
+                          )
+    @cluster.script = File.dirname(__FILE__) + '/../bin/thin'
+    @cluster.silent = true
+  end
+  it 'should include socket number in file names' do
+    @cluster.send(:include_server_number, 'thin.sock', 0).should == 'thin.0.sock'
+    @cluster.send(:include_server_number, 'thin', 0).should == 'thin.0'
+  end
+  it 'should call each server' do
+    calls = []
+    @cluster.send(:with_each_server) do |n|
+      calls << n
+    end
+    calls.should == [0, 1, 2]
+  end
+  it 'should start specified server' do
+    @cluster.should_receive(:`) do |with|
+      with.should include('thin start', '--daemonize', 'thin.1.log', 'thin.1.pid', '--socket="/tmp/thin.1.sock"')
+      with.should_not include('--port', '--address')
+      ''
+    end
+    @cluster.start_server 1
+  end
+  it 'should stop specified server' do
+    @cluster.should_receive(:`) do |with|
+      with.should include('thin stop', '--daemonize', 'thin.1.log', 'thin.1.pid', '--socket="/tmp/thin.1.sock"')
+      with.should_not include('--port', '--address')
       ''
     end
-    @cluster.stop_on_port 3001
+    @cluster.stop_server 1
   end
 end

data/spec/daemonizing_spec.rb CHANGED

@@ -23,7 +23,7 @@ describe 'Daemonizing' do
     File.exist?(@server.pid_file).should be_true
     @pid = @server.pid
-    proc { sleep 0.1 while File.exist?(@server.pid_file) }.should take_less_then(2)
+    proc { sleep 0.1 while File.exist?(@server.pid_file) }.should take_less_then(5)
   end
   it 'should redirect stdio to a log file' do
@@ -89,5 +89,6 @@ describe 'Daemonizing' do
   after do
     Process.kill(9, @pid.to_i) if @pid && Process.running?(@pid.to_i)
+    Process.kill(9, @server.pid) if @server.pid && Process.running?(@server.pid)
   end
 end

data/spec/headers_spec.rb CHANGED

@@ -9,20 +9,14 @@ describe Headers do
     @headers['Set-Cookie'] = 'twice'
     @headers['Set-Cookie'] = 'is cooler the once'
-    @headers.size.should == 2
+    @headers.to_s.should == "Set-Cookie: twice\r\nSet-Cookie: is cooler the once\r\n"
   end
   it 'should overwrite value on non duplicate fields' do
     @headers['Host'] = 'this is unique'
     @headers['Host'] = 'so is this'
-    @headers['Host'] = 'so this will overwrite ^'
-    @headers['Host'].should == 'so this will overwrite ^'
-  end
-  it 'should return first header value' do
-    @headers['Set-Cookie'] = 'hi'
-    @headers['Set-Cookie'].should == 'hi'
+    @headers.to_s.should == "Host: this is unique\r\n"
   end
   it 'should output to string' do

data/spec/request_spec.rb CHANGED

@@ -119,6 +119,7 @@ EOS
     request.body.rewind
     request.body.read.should == 'name=marc&email=macournoyer@gmail.com'
+    request.body.class.should == StringIO
     request.should validate_with_lint
   end
@@ -188,8 +189,28 @@ EOS
     request.should validate_with_lint
   end
-  it "should be faster then #{max_parsing_time = 0.2} ms" do
-    body = <<-EOS.chomp
+  it "should move body to tempfile when too big" do
+    body = 'X' * (Request::MAX_BODY + 1)
+    request = R(<<-EOS.chomp, true)
+POST /postit HTTP/1.1
+Host: localhost:3000
+Content-Type: text/html
+Content-Length: #{body.size}
+#{body}
+EOS
+    request.body.class.should == Tempfile
+  end
+  it "should raise error when header is too big" do
+    big_headers = "X-Test: X\r\n" * (1024 * (80 + 32))
+    proc { R("GET / HTTP/1.1\r\n#{big_headers}\r\n") }.should raise_error(InvalidRequest)
+  end
+  it "should be faster then #{max_parsing_time = 0.0002} RubySeconds" do
+    body = <<-EOS.chomp.gsub("\n", "\r\n")
 POST /postit HTTP/1.1
 Host: localhost: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
@@ -205,7 +226,7 @@ Content-Length: 37
 hi=there&name=marc&email=macournoyer@gmail.com
 EOS
-    proc { R(body, true) }.should be_faster_then(max_parsing_time)
+    proc { R(body) }.should be_faster_then(max_parsing_time)
   end
   it 'should be comparable to Mongrel parser' do

data/spec/response_spec.rb CHANGED

@@ -52,7 +52,7 @@ describe Response do
     out.should include("\r\n\r\n<html></html>")
   end
-  it "should be faster then #{max_parsing_time = 0.07} ms" do
+  it "should be faster then #{max_parsing_time = 0.00011} RubySecond" do
     @response.body << <<-EOS
 <html><head><title>Dir listing</title></head>
 <body><h1>Listing stuff</h1><ul>

data/spec/server_spec.rb CHANGED

@@ -6,30 +6,27 @@ describe Server do
   before do
     app = proc do |env|
       body = ''
-      body << env['QUERY_STRING'].to_s
-      body << env['rack.input'].read.to_s
+      body << env.inspect
+      body << env['rack.input'].read
       [200, { 'Content-Type' => 'text/html', 'Content-Length' => body.size.to_s }, body]
     end
     server = Thin::Server.new('0.0.0.0', 3333, app)
     server.timeout = 3
     server.silent = true
-    server.start
-    @thread = Thread.new do
-      server.listen!
-    end
+    @thread = Thread.new { server.start }
     sleep 0.1 until @thread.status == 'sleep'
   end
   it 'should GET from Net::HTTP' do
-    get('/?cthis').should == 'cthis'
+    get('/?cthis').should include('cthis')
   end
   it 'should GET from TCPSocket' do
     raw('0.0.0.0', 3333, "GET /?this HTTP/1.1\r\n\r\n").
       should include("HTTP/1.1 200 OK",
-                     "Content-Type: text/html", "Content-Length: 4",
-                     "Connection: close", "\r\n\r\nthis")
+                     "Content-Type: text/html", "Content-Length: ",
+                     "Connection: close", "this")
   end
   it 'should return empty string on incomplete headers' do
@@ -41,20 +38,24 @@ describe Server do
   end
   it 'should POST from Net::HTTP' do
-    post('/', :arg => 'pirate').should == 'arg=pirate'
+    post('/', :arg => 'pirate').should include('arg=pirate')
   end
   it 'should handle big POST' do
     big = 'X' * (20 * 1024)
-    post('/', :big => big).size.should == big.size + 4
+    post('/', :big => big).should include(big)
   end
-  it "should handle GET in less then #{get_request_time = 5} ms" do
+  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 = 6} ms" do
-    proc { post('/', :file => 'X' * 1000) }.should be_faster_then(get_request_time)
+  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
@@ -77,4 +78,84 @@ describe Server do
     def post(url, params={})
       Net::HTTP.post_form(URI.parse('http://0.0.0.0:3333' + url), params).body
     end
+end
+describe Server, 'app configuration' 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
+describe Server, "on UNIX domain socket" do
+  before do
+    app = proc do |env|
+      [200, { 'Content-Type' => 'text/html' }, [env.inspect]]
+    end
+    server = Thin::Server.new('/tmp/thin_test.sock', nil, app)
+    server.timeout = 3
+    server.silent = true
+    @thread = Thread.new { server.start }
+    sleep 0.1 until @thread.status == 'sleep'
+  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
+  after do
+    @thread.kill
+  end
+  private
+    def get(url)
+      send_data("GET #{url} HTTP/1.1\r\n\r\n")
+    end
+    def send_data(data)
+      socket = UNIXSocket.new('/tmp/thin_test.sock')
+      socket.write data
+      out = socket.read
+      socket.close
+      out
+    end
 end

data/spec/spec_helper.rb CHANGED

@@ -4,6 +4,7 @@ require 'spec'
 require 'benchmark'
 require 'timeout'
 require 'fileutils'
+require 'benchmark_unit'
 include Thin
@@ -31,14 +32,33 @@ module Matchers
       @max_time = max_time
     end
-    def matches?(target)
-      @target = target
-      @time = Benchmark.measure { @target.call }.real * 1000
-      @time <= @max_time
+    # Base on benchmark_unit/assertions#compare_benchmarks
+    def matches?(proc)
+      @time, multiplier = 0, 1
+      while (@time < 0.01) do
+        @time = Benchmark::Unit.measure do
+          multiplier.times &proc
+        end
+        multiplier *= 10
+      end
+      multiplier /= 10
+      iterations = (Benchmark::Unit::CLOCK_TARGET / @time).to_i * multiplier
+      iterations = 1 if iterations < 1
+      total = Benchmark::Unit.measure do
+        iterations.times &proc
+      end
+      @time = total / iterations
+      @time < @max_time
     end
     def failure_message(less_more=:less)
-      "took #{@time} ms, should take #{less_more} then #{@max_time} ms"
+      "took <#{@time.inspect} RubySeconds>, should take #{less_more} than #{@max_time} RubySeconds."
     end
     def negative_failure_message