RubyGems - thin - Versions diffs - 0.4.1 → 0.5.0 - Mend

thin 0.4.1 → 0.5.0

Potentially problematic release.

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

Files changed (91) hide show

data/COPYING +18 -0
data/README +32 -45
data/Rakefile +66 -23
data/bin/thin +76 -45
data/doc/benchmarks.txt +64 -249
data/doc/rdoc/created.rid +1 -1
data/doc/rdoc/files/README.html +37 -100
data/doc/rdoc/rdoc-style.css +5 -0
data/example/config.ru +9 -0
data/ext/thin_parser/common.rl +54 -0
data/ext/thin_parser/ext_help.h +14 -0
data/ext/thin_parser/extconf.rb +6 -0
data/ext/thin_parser/parser.c +1199 -0
data/ext/thin_parser/parser.h +49 -0
data/ext/thin_parser/parser.rl +143 -0
data/ext/thin_parser/thin.c +424 -0
data/lib/rack/adapter/rails.rb +136 -0
data/lib/rack/handler/thin.rb +13 -0
data/lib/thin.rb +28 -12
data/lib/thin/connection.rb +47 -0
data/lib/thin/daemonizing.rb +5 -1
data/lib/thin/headers.rb +3 -2
data/lib/thin/logging.rb +6 -13
data/lib/thin/request.rb +53 -133
data/lib/thin/response.rb +21 -25
data/lib/thin/server.rb +30 -94
data/lib/thin/version.rb +2 -2
data/lib/thin_parser.bundle +0 -0
data/spec/daemonizing_spec.rb +94 -0
data/spec/headers_spec.rb +35 -0
data/spec/request_spec.rb +258 -0
data/spec/response_spec.rb +40 -0
data/spec/server_spec.rb +75 -0
data/spec/spec_helper.rb +126 -0
metadata +79 -99
data/bin/thin_cluster +0 -53
data/doc/rdoc/classes/Kernel.html +0 -182
data/doc/rdoc/classes/Process.html +0 -175
data/doc/rdoc/classes/Thin.html +0 -184
data/doc/rdoc/classes/Thin/CGIWrapper.html +0 -438
data/doc/rdoc/classes/Thin/Cluster.html +0 -392
data/doc/rdoc/classes/Thin/Command.html +0 -221
data/doc/rdoc/classes/Thin/CommandError.html +0 -154
data/doc/rdoc/classes/Thin/Commands.html +0 -145
data/doc/rdoc/classes/Thin/Daemonizable.html +0 -250
data/doc/rdoc/classes/Thin/Daemonizable/ClassMethods.html +0 -203
data/doc/rdoc/classes/Thin/DirHandler.html +0 -250
data/doc/rdoc/classes/Thin/Handler.html +0 -195
data/doc/rdoc/classes/Thin/Headers.html +0 -244
data/doc/rdoc/classes/Thin/InvalidRequest.html +0 -150
data/doc/rdoc/classes/Thin/Logging.html +0 -214
data/doc/rdoc/classes/Thin/RailsHandler.html +0 -234
data/doc/rdoc/classes/Thin/RailsServer.html +0 -175
data/doc/rdoc/classes/Thin/Request.html +0 -379
data/doc/rdoc/classes/Thin/Response.html +0 -311
data/doc/rdoc/classes/Thin/Server.html +0 -381
data/doc/rdoc/files/bin/thin.html +0 -188
data/doc/rdoc/files/bin/thin_cluster.html +0 -175
data/doc/rdoc/files/lib/thin/cgi_rb.html +0 -263
data/doc/rdoc/files/lib/thin/cluster_rb.html +0 -263
data/doc/rdoc/files/lib/thin/command_rb.html +0 -263
data/doc/rdoc/files/lib/thin/consts_rb.html +0 -263
data/doc/rdoc/files/lib/thin/daemonizing_rb.html +0 -263
data/doc/rdoc/files/lib/thin/handler_rb.html +0 -263
data/doc/rdoc/files/lib/thin/headers_rb.html +0 -263
data/doc/rdoc/files/lib/thin/logging_rb.html +0 -263
data/doc/rdoc/files/lib/thin/mime_types_rb.html +0 -263
data/doc/rdoc/files/lib/thin/rails_rb.html +0 -263
data/doc/rdoc/files/lib/thin/recipes_rb.html +0 -171
data/doc/rdoc/files/lib/thin/request_rb.html +0 -171
data/doc/rdoc/files/lib/thin/response_rb.html +0 -171
data/doc/rdoc/files/lib/thin/server_rb.html +0 -171
data/doc/rdoc/files/lib/thin/statuses_rb.html +0 -171
data/doc/rdoc/files/lib/thin/version_rb.html +0 -171
data/lib/thin/cgi.rb +0 -159
data/lib/thin/cluster.rb +0 -147
data/lib/thin/command.rb +0 -49
data/lib/thin/commands/cluster/base.rb +0 -24
data/lib/thin/commands/cluster/config.rb +0 -36
data/lib/thin/commands/cluster/restart.rb +0 -35
data/lib/thin/commands/cluster/start.rb +0 -40
data/lib/thin/commands/cluster/stop.rb +0 -28
data/lib/thin/commands/server/base.rb +0 -7
data/lib/thin/commands/server/start.rb +0 -33
data/lib/thin/commands/server/stop.rb +0 -29
data/lib/thin/consts.rb +0 -37
data/lib/thin/handler.rb +0 -57
data/lib/thin/mime_types.rb +0 -619
data/lib/thin/rails.rb +0 -44
data/lib/thin/recipes.rb +0 -36
data/lib/transat/parser.rb +0 -247

@@ -0,0 +1,40 @@
+require File.dirname(__FILE__) + '/spec_helper'
+describe Response do
+  before do
+    @response = Response.new
+    @response.headers['Content-Type'] = 'text/html'
+  end
+  it 'should output headers' do
+    @response.headers_output.should == "Content-Type: text/html\r\nContent-Length: 0\r\nConnection: close\r\n"
+  end
+  it 'should output head' do
+    @response.head.should == "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nContent-Length: 0\r\nConnection: close\r\n\r\n"
+  end
+  it 'should allow duplicates in headers' do
+    @response.headers['Set-Cookie'] = 'mium=7'
+    @response.headers['Set-Cookie'] = 'hi=there'
+    @response.head.should == "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nSet-Cookie: mium=7\r\nSet-Cookie: hi=there\r\nContent-Length: 0\r\nConnection: close\r\n\r\n"
+  end
+  it 'should output body' do
+    @response.body << '<html></html>'
+    @response.to_s.should == "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nContent-Length: 13\r\nConnection: close\r\n\r\n<html></html>"
+  end
+  it "should be faster then #{max_parsing_time = 0.06} ms" do
+    @response.body << <<-EOS
+<html><head><title>Dir listing</title></head>
+<body><h1>Listing stuff</h1><ul>
+#{'<li>Hi!</li>' * 100}
+</ul></body></html>
+EOS
+    proc { @response.to_s }.should be_faster_then(max_parsing_time)
+  end
+end

data/spec/server_spec.rb ADDED

@@ -0,0 +1,75 @@
+require File.dirname(__FILE__) + '/spec_helper'
+require 'net/http'
+require 'socket'
+describe Server do
+  before do
+    app = proc do |env|
+      body = [env['QUERY_STRING'], env['rack.input'].read].compact
+      [200, { 'Content-Type' => 'text/html' }, 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
+    sleep 0.1 until @thread.status == 'sleep'
+  end
+  it 'should GET from Net::HTTP' do
+    get('/?cthis').should == 'cthis'
+  end
+  it 'should GET from TCPSocket' do
+    raw('0.0.0.0', 3333, "GET /?this HTTP/1.1\r\n\r\n").should == "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nContent-Length: 4\r\nConnection: close\r\n\r\nthis"
+  end
+  it 'should return empty string on incomplete headers' do
+    raw('0.0.0.0', 3333, "GET /?this HTTP/1.1\r\nHost:").should be_empty
+  end
+  it 'should return empty string on incorrect Content-Length' do
+    raw('0.0.0.0', 3333, "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 == 'arg=pirate'
+  end
+  it 'should handle big POST' do
+    big = 'X' * (20 * 1024)
+    post('/', :big => big).size.should == big.size + 4
+  end
+  it "should handle GET in less then #{get_request_time = 5} ms" 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)
+  end
+  after do
+    @thread.kill
+  end
+  private
+    def get(url)
+      Net::HTTP.get(URI.parse('http://0.0.0.0:3333' + url))
+    end
+    def raw(host, port, data)
+      socket = TCPSocket.new(host, port)
+      socket.write data
+      out = socket.read
+      socket.close
+      out
+    end
+    def post(url, params={})
+      Net::HTTP.post_form(URI.parse('http://0.0.0.0:3333' + url), params).body
+    end
+end

data/spec/spec_helper.rb ADDED

@@ -0,0 +1,126 @@
+require 'rubygems'
+require File.dirname(__FILE__) + '/../lib/thin'
+require 'spec'
+require 'benchmark'
+require 'timeout'
+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
+module Matchers
+  class BeFasterThen
+    def initialize(max_time)
+      @max_time = max_time
+    end
+    def matches?(target)
+      @target = target
+      @time = Benchmark.measure { @target.call }.real * 1000
+      @time <= @max_time
+    end
+    def failure_message(less_more=:less)
+      "took #{@time} ms, should take #{less_more} then #{@max_time} ms"
+    end
+    def negative_failure_message
+      failure_message :more
+    end
+  end
+  class ValidateWithLint
+    def matches?(request)
+      @request = request
+      Rack::Lint.new(proc{[200, {'Content-Type' => 'text/html'}, []]}).call(@request.env)
+      true
+    rescue Rack::Lint::LintError => e
+      @message = e.message
+      false
+    end
+    def failure_message(negation=nil)
+      "should#{negation} validate with Rack Lint"
+    end
+    def negative_failure_message
+      failure_message ' not'
+    end
+  end
+  class TakeLessThen
+    def initialize(time)
+      @time = time
+    end
+    def matches?(proc)
+      Timeout.timeout(@time) { proc.call }
+      true
+    rescue Timeout::Error
+      false
+    end
+    def failure_message(negation=nil)
+      "should#{negation} take less then #{@time} sec to run"
+    end
+    def negative_failure_message
+      failure_message ' not'
+    end
+  end
+  # Actual matchers that are exposed.
+  def be_faster_then(time)
+    BeFasterThen.new(time)
+  end
+  def validate_with_lint
+    ValidateWithLint.new
+  end
+  def take_less_then(time)
+    TakeLessThen.new(time)
+  end
+end
+module Helpers
+  # Silences any stream for the duration of the block.
+  #
+  #   silence_stream(STDOUT) do
+  #     puts 'This will never be seen'
+  #   end
+  #
+  #   puts 'But this will'
+  #
+  # (Taken from ActiveSupport)
+  def silence_stream(stream)
+    old_stream = stream.dup
+    stream.reopen(RUBY_PLATFORM =~ /mswin/ ? 'NUL:' : '/dev/null')
+    stream.sync = true
+    yield
+  ensure
+    stream.reopen(old_stream)
+  end
+end
+Spec::Runner.configure do |config|
+  config.include Matchers
+  config.include Helpers
+end

metadata CHANGED

@@ -1,133 +1,113 @@
 --- !ruby/object:Gem::Specification
-rubygems_version: 0.9.4
-specification_version: 1
 name: thin
 version: !ruby/object:Gem::Version
-  version: 0.4.1
-date: 2007-12-04 00:00:00 -05:00
-summary: Thin and fast web server
-require_paths:
-- lib
-email: macournoyer@gmail.com
-homepage: http://code.macournoyer.com/thin/
-rubyforge_project:
-description: Thin and fast web server
-autorequire:
-default_executable:
-bindir: bin
-has_rdoc: false
-required_ruby_version: !ruby/object:Gem::Version::Requirement
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: 1.8.6
-  version:
+  version: 0.5.0
 platform: ruby
-signing_key:
-cert_chain:
-post_install_message:
 authors:
 - Marc-Andre Cournoyer
+autorequire:
+bindir: bin
+cert_chain: []
+date: 2008-01-01 00:00:00 -05:00
+default_executable:
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  version_requirement:
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+    version:
+- !ruby/object:Gem::Dependency
+  name: rack
+  version_requirement:
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+    version:
+description: A thin and fast web server
+email: macournoyer@gmail.com
+executables:
+- thin
+extensions:
+- ext/thin_parser/extconf.rb
+extra_rdoc_files: []
 files:
+- COPYING
 - README
 - Rakefile
 - bin/thin
-- bin/thin_cluster
 - doc/benchmarks.txt
 - doc/rdoc
 - doc/rdoc/classes
-- doc/rdoc/classes/Kernel.html
-- doc/rdoc/classes/Process.html
-- doc/rdoc/classes/Thin
-- doc/rdoc/classes/Thin/CGIWrapper.html
-- doc/rdoc/classes/Thin/Cluster.html
-- doc/rdoc/classes/Thin/Command.html
-- doc/rdoc/classes/Thin/CommandError.html
-- doc/rdoc/classes/Thin/Commands.html
-- doc/rdoc/classes/Thin/Daemonizable
-- doc/rdoc/classes/Thin/Daemonizable/ClassMethods.html
-- doc/rdoc/classes/Thin/Daemonizable.html
-- doc/rdoc/classes/Thin/DirHandler.html
-- doc/rdoc/classes/Thin/Handler.html
-- doc/rdoc/classes/Thin/Headers.html
-- doc/rdoc/classes/Thin/InvalidRequest.html
-- doc/rdoc/classes/Thin/Logging.html
-- doc/rdoc/classes/Thin/RailsHandler.html
-- doc/rdoc/classes/Thin/RailsServer.html
-- doc/rdoc/classes/Thin/Request.html
-- doc/rdoc/classes/Thin/Response.html
-- doc/rdoc/classes/Thin/Server.html
-- doc/rdoc/classes/Thin.html
 - doc/rdoc/created.rid
 - doc/rdoc/files
-- doc/rdoc/files/bin
-- doc/rdoc/files/bin/thin.html
-- doc/rdoc/files/bin/thin_cluster.html
-- doc/rdoc/files/lib
-- doc/rdoc/files/lib/thin
-- doc/rdoc/files/lib/thin/cgi_rb.html
-- doc/rdoc/files/lib/thin/cluster_rb.html
-- doc/rdoc/files/lib/thin/command_rb.html
-- doc/rdoc/files/lib/thin/consts_rb.html
-- doc/rdoc/files/lib/thin/daemonizing_rb.html
-- doc/rdoc/files/lib/thin/handler_rb.html
-- doc/rdoc/files/lib/thin/headers_rb.html
-- doc/rdoc/files/lib/thin/logging_rb.html
-- doc/rdoc/files/lib/thin/mime_types_rb.html
-- doc/rdoc/files/lib/thin/rails_rb.html
-- doc/rdoc/files/lib/thin/recipes_rb.html
-- doc/rdoc/files/lib/thin/request_rb.html
-- doc/rdoc/files/lib/thin/response_rb.html
-- doc/rdoc/files/lib/thin/server_rb.html
-- doc/rdoc/files/lib/thin/statuses_rb.html
-- doc/rdoc/files/lib/thin/version_rb.html
 - doc/rdoc/files/README.html
 - doc/rdoc/index.html
 - doc/rdoc/logo.gif
 - doc/rdoc/rdoc-style.css
+- spec/daemonizing_spec.rb
+- spec/headers_spec.rb
+- spec/request_spec.rb
+- 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/cgi.rb
-- lib/thin/cluster.rb
-- lib/thin/command.rb
-- lib/thin/commands
-- lib/thin/commands/cluster
-- lib/thin/commands/cluster/base.rb
-- lib/thin/commands/cluster/config.rb
-- lib/thin/commands/cluster/restart.rb
-- lib/thin/commands/cluster/start.rb
-- lib/thin/commands/cluster/stop.rb
-- lib/thin/commands/server
-- lib/thin/commands/server/base.rb
-- lib/thin/commands/server/start.rb
-- lib/thin/commands/server/stop.rb
-- lib/thin/consts.rb
+- lib/thin/connection.rb
 - lib/thin/daemonizing.rb
-- lib/thin/handler.rb
 - lib/thin/headers.rb
 - lib/thin/logging.rb
-- lib/thin/mime_types.rb
-- lib/thin/rails.rb
-- lib/thin/recipes.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/transat
-- lib/transat/parser.rb
-test_files: []
+- lib/thin_parser.bundle
+- example/config.ru
+- ext/thin_parser/ext_help.h
+- ext/thin_parser/parser.h
+- ext/thin_parser/parser.c
+- ext/thin_parser/thin.c
+- ext/thin_parser/extconf.rb
+- ext/thin_parser/common.rl
+- ext/thin_parser/parser.rl
+has_rdoc: false
+homepage: http://code.macournoyer.com/thin/
+post_install_message:
 rdoc_options: []
-extra_rdoc_files: []
-executables:
-- thin
-- thin_cluster
-extensions: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: 1.8.6
+  version:
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: "0"
+  version:
 requirements: []
-dependencies: []
+rubyforge_project:
+rubygems_version: 1.0.1
+signing_key:
+specification_version: 2
+summary: A thin and fast web server
+test_files: []