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

data/doc/rdoc/files/lib/thin/version_rb.html DELETED

@@ -1,171 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <title>
-  thin &raquo; File: version.rb
-  </title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <link rel="stylesheet" href="../../.././rdoc-style.css" type="text/css" media="screen" />
-  <script language="JavaScript" type="text/javascript">
-    // <![CDATA[
-    function toggleSource( id )
-    {
-    var elem
-    var link
-    if( document.getElementById )
-    {
-    elem = document.getElementById( id )
-    link = document.getElementById( "l_" + id )
-    }
-    else if ( document.all )
-    {
-    elem = eval( "document.all." + id )
-    link = eval( "document.all.l_" + id )
-    }
-    else
-    return false;
-    if( elem.style.display == "block" )
-    {
-    elem.style.display = "none"
-    link.innerHTML = "show source"
-    }
-    else
-    {
-    elem.style.display = "block"
-    link.innerHTML = "hide source"
-    }
-    }
-    function openCode( url )
-    {
-    window.open( url, "SOURCE_CODE", "width=400,height=400,scrollbars=yes" )
-    }
-    // ]]>
-  </script>
-</head>
-  <body>
-    <ul id="menu">
-      <li><a href="/thin/">home</a></li>
-      <li><a href="/thin/doc/">doc</a></li>
-      <li><a href="/thin/trac.fcgi/timeline">timeline</a></li>
-      <li><a href="/thin/trac.fcgi/browser">code</a></li>
-      <li><a href="/thin/trac.fcgi/report">tickets</a></li>
-      <li><a href="/thin/trac.fcgi/newticket">new ticket</a></li>
-    </ul>
-    <div id="sidebar">
-      <h2>Files</h2>
-      <ul class="list">
-        <li><a href="../../../files/README.html" value="File: README">README</a></li>
-        <li><a href="../../../files/lib/thin/cgi_rb.html" value="File: cgi.rb">lib/thin/cgi.rb</a></li>
-        <li><a href="../../../files/lib/thin/cluster_rb.html" value="File: cluster.rb">lib/thin/cluster.rb</a></li>
-        <li><a href="../../../files/lib/thin/command_rb.html" value="File: command.rb">lib/thin/command.rb</a></li>
-        <li><a href="../../../files/lib/thin/consts_rb.html" value="File: consts.rb">lib/thin/consts.rb</a></li>
-        <li><a href="../../../files/lib/thin/daemonizing_rb.html" value="File: daemonizing.rb">lib/thin/daemonizing.rb</a></li>
-        <li><a href="../../../files/lib/thin/handler_rb.html" value="File: handler.rb">lib/thin/handler.rb</a></li>
-        <li><a href="../../../files/lib/thin/headers_rb.html" value="File: headers.rb">lib/thin/headers.rb</a></li>
-        <li><a href="../../../files/lib/thin/logging_rb.html" value="File: logging.rb">lib/thin/logging.rb</a></li>
-        <li><a href="../../../files/lib/thin/mime_types_rb.html" value="File: mime_types.rb">lib/thin/mime_types.rb</a></li>
-        <li><a href="../../../files/lib/thin/rails_rb.html" value="File: rails.rb">lib/thin/rails.rb</a></li>
-        <li><a href="../../../files/lib/thin/recipes_rb.html" value="File: recipes.rb">lib/thin/recipes.rb</a></li>
-        <li><a href="../../../files/lib/thin/request_rb.html" value="File: request.rb">lib/thin/request.rb</a></li>
-        <li><a href="../../../files/lib/thin/response_rb.html" value="File: response.rb">lib/thin/response.rb</a></li>
-        <li><a href="../../../files/lib/thin/server_rb.html" value="File: server.rb">lib/thin/server.rb</a></li>
-        <li><a href="../../../files/lib/thin/statuses_rb.html" value="File: statuses.rb">lib/thin/statuses.rb</a></li>
-        <li><a href="../../../files/lib/thin/version_rb.html" value="File: version.rb">lib/thin/version.rb</a></li>
-        <li><a href="../../../files/bin/thin.html" value="File: thin">bin/thin</a></li>
-        <li><a href="../../../files/bin/thin_cluster.html" value="File: thin_cluster">bin/thin_cluster</a></li>
-      </ul>
-      <h2>Classes</h2>
-      <ul class="list">
-        <li><a href="../../../classes/Thin.html" title="Module: Thin">Thin</a></li>
-        <li><a href="../../../classes/Thin/Commands.html" title="Module: Thin::Commands">Thin::Commands</a></li>
-        <li><a href="../../../classes/Thin/Daemonizable.html" title="Module: Thin::Daemonizable">Thin::Daemonizable</a></li>
-        <li><a href="../../../classes/Thin/Daemonizable/ClassMethods.html" title="Module: Thin::Daemonizable::ClassMethods">Thin::Daemonizable::ClassMethods</a></li>
-        <li><a href="../../../classes/Thin/VERSION.html" title="Module: Thin::VERSION">Thin::VERSION</a></li>
-        <li><a href="../../../classes/Thin/Logging.html" title="Module: Thin::Logging">Thin::Logging</a></li>
-        <li><a href="../../../classes/Thin/DirHandler.html" title="Class: Thin::DirHandler">Thin::DirHandler</a></li>
-        <li><a href="../../../classes/Thin/InvalidRequest.html" title="Class: Thin::InvalidRequest">Thin::InvalidRequest</a></li>
-        <li><a href="../../../classes/Thin/CGIWrapper.html" title="Class: Thin::CGIWrapper">Thin::CGIWrapper</a></li>
-        <li><a href="../../../classes/Thin/Command.html" title="Class: Thin::Command">Thin::Command</a></li>
-        <li><a href="../../../classes/Thin/Response.html" title="Class: Thin::Response">Thin::Response</a></li>
-        <li><a href="../../../classes/Thin/Headers.html" title="Class: Thin::Headers">Thin::Headers</a></li>
-        <li><a href="../../../classes/Thin/Server.html" title="Class: Thin::Server">Thin::Server</a></li>
-        <li><a href="../../../classes/Thin/CommandError.html" title="Class: Thin::CommandError">Thin::CommandError</a></li>
-        <li><a href="../../../classes/Thin/Request.html" title="Class: Thin::Request">Thin::Request</a></li>
-        <li><a href="../../../classes/Thin/RailsServer.html" title="Class: Thin::RailsServer">Thin::RailsServer</a></li>
-        <li><a href="../../../classes/Thin/Cluster.html" title="Class: Thin::Cluster">Thin::Cluster</a></li>
-        <li><a href="../../../classes/Thin/RailsHandler.html" title="Class: Thin::RailsHandler">Thin::RailsHandler</a></li>
-        <li><a href="../../../classes/Thin/Handler.html" title="Class: Thin::Handler">Thin::Handler</a></li>
-        <li><a href="../../../classes/Process.html" title="Module: Process">Process</a></li>
-        <li><a href="../../../classes/Kernel.html" title="Module: Kernel">Kernel</a></li>
-      </ul>
-    </div>
-    <div id="container">
-      <div id="header">
-        <a href="/thin/" title="Home">
-          <img id="logo" src="../../../logo.gif" />
-        </a>
-        <h2 id="tag_line">A fast and very simple Ruby web server</h2>
-      </div>
-      <div id="content">
-        <h2>File: version.rb</h2>
-  <div id="lib/thin/version.rb" class="page_shade">
-<div class="page">
-<div class="header">
-  <div class="path">lib/thin/version.rb / Tue Dec 04 15:08:56 -0500 2007</div>
-</div>
-<h2>Set of Capistrano 2 recipes</h2>
-<p>
-To use, add on top of your Capfile file:
-</p>
-<pre>
- load 'config/deploy'
- # ...
- require 'thin'
- require 'thin/recipes'
-</pre>
-<h3>Configurable parameters</h3>
-<p>
-You can configure some parameters but it should work out of the box. Path
-to the thin_cluster script, don&#8216;t need to change this if you
-installed thin as a gem on the server.
-</p>
-<pre>
- set :thin_cluster, &quot;thin_cluster&quot;
-</pre>
-<p>
-Location of the config file:
-</p>
-<pre>
- set :thin_config, &quot;#{release_path}/config/thin.yml&quot;
-</pre>
-<strong>Requires:</strong>
-socket
-</ul>
-</div>
-</div>
-      </div>
-    </div>
-    <div id="footer">
-      <hr />
-      &copy; <a href="http://macournoyer.com">Marc-Andr&eacute; Cournoyer</a>
-    </div>
-  </body>
-</html>

data/lib/thin/cgi.rb DELETED

@@ -1,159 +0,0 @@
-require 'cgi'
-module Thin
-  # Class largely based on Mongrel::CGIWrapper
-  # http://mongrel.rubyforge.org by Zed A. Shaw <zedshaw at zedshaw dot com>
-  class CGIWrapper < ::CGI
-    public :env_table
-    attr_reader :options
-    # Set this to false if you want calls to CGIWrapper.out to not actually send
-    # the response until you force it.
-    attr_accessor :default_really_final
-    # these are stripped out of any keys passed to CGIWrapper.header function
-    REMOVED_KEYS = [ "nph","status","server","connection","type",
-                     "charset","length","language","expires"]
-    # Takes an HttpRequest and HttpResponse object, plus any additional arguments
-    # normally passed to CGI.  These are used internally to create a wrapper around
-    # the real CGI while maintaining Mongrel's view of the world.
-    def initialize(request, response, *args)
-      @request = request
-      @response = response
-      @args = *args
-      @input = request.body
-      @head = {}
-      @out_called = false
-      @default_really_final = true
-      super(*args)
-    end
-    # The header is typically called to send back the header.  In our case we
-    # collect it into a hash for later usage.
-    #
-    # nph -- Mostly ignored.  It'll output the date.
-    # connection -- Completely ignored.  Why is CGI doing this?
-    # length -- Ignored since Mongrel figures this out from what you write to output.
-    #
-    def header(options = "text/html")
-      # if they pass in a string then just write the Content-Type
-      if options.class == String
-        @head['Content-Type'] = options unless @head['Content-Type']
-      else
-        # convert the given options into what Mongrel wants
-        @head['Content-Type'] = options['type'] || "text/html"
-        @head['Content-Type'] += "; charset=" + options['charset'] if options.has_key? "charset" if options['charset']
-        # setup date only if they use nph
-        @head['Date'] = CGI::rfc1123_date(Time.now) if options['nph']
-        # setup the server to use the default or what they set
-        @head['Server'] = options['server'] || env_table['SERVER_SOFTWARE']
-        # remaining possible options they can give
-        @head['Status'] = options['status'] if options['status']
-        @head['Content-Language'] = options['language'] if options['language']
-        @head['Expires'] = options['expires'] if options['expires']
-        # drop the keys we don't want anymore
-        REMOVED_KEYS.each {|k| options.delete(k) }
-        # finally just convert the rest raw (which puts 'cookie' directly)
-        # 'cookie' is translated later as we write the header out
-        options.each{|k,v| @head[k] = v}
-      end
-      # doing this fakes out the cgi library to think the headers are empty
-      # we then do the real headers in the out function call later
-      ""
-    end
-    # Takes any 'cookie' setting and sends it over the Mongrel header,
-    # then removes the setting from the options. If cookie is an
-    # Array or Hash then it sends those on with .to_s, otherwise
-    # it just calls .to_s on it and hopefully your "cookie" can
-    # write itself correctly.
-    def send_cookies(to)
-      # convert the cookies based on the myriad of possible ways to set a cookie
-      if @head['cookie']
-        cookie = @head['cookie']
-        case cookie
-        when Array
-          cookie.each {|c| to['Set-Cookie'] = c.to_s }
-        when Hash
-          cookie.each_value {|c| to['Set-Cookie'] = c.to_s}
-        else
-          to['Set-Cookie'] = options['cookie'].to_s
-        end
-        @head.delete('cookie')
-      end
-      # @output_cookies seems to never be used, but we'll process it just in case
-      @output_cookies.each {|c| to['Set-Cookie'] = c.to_s } if @output_cookies
-    end
-    # The dumb thing is people can call header or this or both and in any order.
-    # So, we just reuse header and then finalize the HttpResponse the right way.
-    # Status is taken from the various options and converted to what Mongrel needs
-    # via the CGIWrapper.status function.
-    #
-    # We also prevent Rails from actually doing the final send by adding a
-    # second parameter "really_final".  Only Mongrel calls this after Rails
-    # is done.  Since this will break other frameworks, it defaults to
-    # a different setting for rails (false) and (true) for others.
-    def out(options = "text/html", really_final=@default_really_final)
-      if @out_called || !really_final
-        # don't do it more than once or if it's not the really final call
-        return
-      end
-      header(options)
-      @response.start status do |head, body|
-        send_cookies(head)
-        @head.each {|k,v| head[k] = v}
-        body.write(yield || "")
-      end
-      @out_called = true
-    end
-    # Computes the status once, but lazily so that people who call header twice
-    # don't get penalized.  Because CGI insists on including the options status
-    # message in the status we have to do a bit of parsing.
-    def status
-      if not @status
-        stat = @head["Status"]
-        stat = stat.split(' ')[0] if stat
-        @status = stat || "200"
-      end
-      @status
-    end
-    # Used to wrap the normal args variable used inside CGI.
-    def args
-      @args
-    end
-    # Used to wrap the normal env_table variable used inside CGI.
-    def env_table
-      @request.params
-    end
-    # Used to wrap the normal stdinput variable used inside CGI.
-    def stdinput
-      @input
-    end
-    # The stdoutput should be completely bypassed but we'll drop a warning just in case
-    def stdoutput
-      STDERR.puts "WARNING: Your program is doing something not expected.  Please tell Zed that stdoutput was used and what software you are running.  Thanks."
-      @response.body
-    end
-  end
-end

data/lib/thin/cluster.rb DELETED

@@ -1,147 +0,0 @@
-module Thin
-  # Control a set of servers. Generate start and stop commands and run them.
-  class Cluster
-    include Logging
-    attr_accessor :environment, :log_file, :pid_file, :user, :group, :timeout
-    attr_reader   :address, :first_port, :size
-    # Script to run
-    def self.thin=(value)
-      @@thin = value
-    end
-    @@thin = 'thin'
-    # Create a new cluster of servers bound to +host+
-    # on ports +first_port+ to <tt>first_port + size - 1</tt>.
-    def initialize(dir, address, first_port, size)
-      @address    = address
-      @first_port = first_port
-      @size       = size
-      @log_file   = 'thin.log'
-      @pid_file   = 'thin.pid'
-      @timeout    = 60 # sec
-      Dir.chdir dir if dir
-    end
-    # Start the servers
-    def start
-      with_each_instance do |port|
-        start_on_port port
-      end
-    end
-    # Start the server on a single port
-    def start_on_port(port)
-      logc "Starting #{address}:#{port} ... "
-      run :start, :port        => port,
-                  :address     => @address,
-                  :environment => @environment,
-                  :daemonize   => true,
-                  :pid_file    => pid_file_for(port),
-                  :log_file    => log_file_for(port),
-                  :user        => @user,
-                  :group       => @group,
-                  :timeout     => @timeout,
-                  :trace       => @trace
-      if wait_until_pid(:exist, port)
-        log "started in #{pid_for(port)}" if $?.success?
-      else
-        log 'failed to start'
-      end
-    end
-    # Stop the servers
-    def stop
-      with_each_instance do |port|
-        stop_on_port port
-      end
-    end
-    # Stop the server running on +port+
-    def stop_on_port(port)
-      logc "Stopping #{address}:#{port} ... "
-      run :stop, :pid_file => pid_file_for(port),
-                 :timeout  => @timeout
-      if wait_until_pid(!:exist, port)
-        log 'stopped' if $?.success?
-      else
-        log 'failed to stop'
-      end
-    end
-    # Restart the servers one at the time.
-    # Prevent downtime by making sure only one is stopped at the time.
-    # See http://blog.carlmercier.com/2007/09/07/a-better-approach-to-restarting-a-mongrel-cluster/
-    def restart
-      with_each_instance do |port|
-        stop_on_port port
-        sleep 0.1 # Let the OS do his thang
-        start_on_port port
-      end
-    end
-    def log_file_for(port)
-      include_port_number @log_file, port
-    end
-    def pid_file_for(port)
-      include_port_number @pid_file, port
-    end
-    def pid_for(port)
-      File.read(pid_file_for(port)).chomp.to_i
-    end
-    private
-      # Send the command to the +thin+ script
-      def run(cmd, options={})
-        shell_cmd = shellify(cmd, options)
-        trace shell_cmd
-        `#{shell_cmd}`
-      end
-      # Turn into a runnable shell command
-      def shellify(cmd, options={})
-        shellified_options = options.inject([]) do |args, (name, value)|
-          args << case value
-          when NilClass
-          when TrueClass then "--#{name}"
-          else                "--#{name.to_s.tr('_', '-')}=#{value.inspect}"
-          end
-        end
-        "#{@@thin} #{cmd} #{shellified_options.compact.join(' ')}"
-      end
-      # Wait for the pid file to be created (exist=true) of deleted (exist=false)
-      def wait_until_pid(exist, port)
-        Timeout.timeout(@timeout) do
-          sleep 0.1 until File.exist?(pid_file_for(port)) == !!exist
-        end
-        true
-      rescue Timeout::Error
-        false
-      end
-      def with_each_instance
-        @size.times do |n|
-          port = @first_port + n
-          yield port
-        end
-      end
-      # Add the port numbers in the filename
-      # so each instance get its own file
-      def include_port_number(path, port)
-        raise ArgumentError, "filename '#{path}' must include an extension" unless path =~ /\./
-        path.gsub(/\.(.+)$/) { ".#{port}.#{$1}" }
-      end
-  end
-end