mongrel 0.3.3 → 0.3.4

data/README

@@ -71,7 +71,7 @@ example:
 
  h = Mongrel::HttpServer.new("0.0.0.0", "3000")
  h.register("/test", SimpleHandler.new)
- h.register("/files", DirHandler.new("."))
+ h.register("/files", Mongrel::DirHandler.new("."))
  h.run.join
 
 If you run this and access port 3000 with a browser it will say

data/Rakefile

@@ -8,7 +8,8 @@ require 'fileutils'
 include FileUtils
 
 setup_tests
-setup_clean ["ext/http11/Makefile", "pkg", "lib/*.bundle", "ext/http11/*.bundle", "doc/site/output"]
+setup_clean ["ext/http11/*.{bundle,so,obj,pdb,lib,def,exp}", "ext/http11/Makefile", "pkg", "lib/*.bundle", "*.gem", "doc/site/output", ".config"]
+
 setup_rdoc ['README', 'LICENSE', 'COPYING', 'lib/*.rb', 'doc/**/*.rdoc', 'ext/http11/http11.c']
 
 desc "Does a full compile, test run"
@@ -29,8 +30,25 @@ end
 
 setup_extension("http11", "http11")
 
+version="0.3.4"
 summary = "A small fast HTTP library and server that runs Rails, Camping, and Nitro apps."
 test_file = "test/test_ws.rb"
-setup_gem("mongrel", "0.3.3",  "Zed A. Shaw", summary, ['mongrel_rails'], test_file) do |spec|
+author="Zed A. Shaw"
+name="mongrel"
+
+setup_gem(name, version,  author, summary, ['mongrel_rails'], test_file) do |spec|
   spec.add_dependency('daemons', '>= 0.4.2')
 end
+
+desc "Build a binary gem for Win32"
+task :win32_gem => [:clean, :compile, :test, :package_win32]
+
+task :package_win32 do
+  setup_win32_gem(name, version,  version, summary, ['mongrel_rails'], test_file) do |spec|
+    spec.add_dependency('daemons', '>= 0.4.2')
+    spec.files << 'ext/http11/http11.so'
+    spec.extensions = []
+    spec.platform = Gem::Platform::WIN32
+  end
+end
+

data/bin/mongrel_rails

@@ -1,55 +1,9 @@
 require 'rubygems'
 require 'mongrel'
-require 'cgi'
 require 'daemons/daemonize'
 require 'mongrel/command'
 
 
-class CGIFixed < ::CGI
-  public :env_table
-  attr_reader :options
-  
-  def initialize(params, data, out, *args)
-    @env_table = params
-    @args = *args
-    @input = StringIO.new(data)
-    @out = out
-    @options = {}
-    super(*args)
-  end
-  
-  def header(options = "text/html")
-    if options.class == Hash
-      # passing in a header so need to keep the status around and other options
-      @options = options
-    end
-
-    super(options)
-  end
-
-  def status
-    s = @options["Status"] || @options["status"]
-    s[0 .. s.index(' ')] || "200"
-  end
-
-  def args
-    @args
-  end
-  
-  def env_table
-    @env_table
-  end
-  
-  def stdinput
-    @input
-  end
-  
-  def stdoutput
-    @out
-  end
-end
-
-
 class RailsHandler < Mongrel::HttpHandler
 
   def initialize(dir, mime_map = {})
@@ -63,26 +17,26 @@ class RailsHandler < Mongrel::HttpHandler
   def process(request, response)
     # not static, need to talk to rails
     return if response.socket.closed?
-    
+
     if @files.can_serve(request.params["PATH_INFO"])
       @files.process(request,response)
     else
-      cgi = CGIFixed.new(request.params, request.body, response.socket)
+      cgi = Mongrel::CGIWrapper.new(request, response)
+
       begin
-        
         @guard.synchronize do
           # Rails is not thread safe so must be run entirely within synchronize 
           Dispatcher.dispatch(cgi, ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS, response.body)
         end
-    
-        response.status = cgi.status
-        response.send_status
-        response.send_body
+
+        # This finalizes the output using the proper HttpResponse way
+        cgi.out {""}
       rescue Object => rails_error
         STDERR.puts "calling Dispatcher.dispatch #{rails_error}"
         STDERR.puts rails_error.backtrace.join("\n")
       end
     end
+
   end
 end
 

data/doc/rdoc/classes/Mongrel.html

@@ -101,6 +101,7 @@ to service web application requests fast as possible.
       <h3 class="section-bar">Classes and Modules</h3>
 
       Module <a href="Mongrel/Const.html" class="link">Mongrel::Const</a><br />
+Class <a href="Mongrel/CGIWrapper.html" class="link">Mongrel::CGIWrapper</a><br />
 Class <a href="Mongrel/DirHandler.html" class="link">Mongrel::DirHandler</a><br />
 Class <a href="Mongrel/Error404Handler.html" class="link">Mongrel::Error404Handler</a><br />
 Class <a href="Mongrel/HeaderOut.html" class="link">Mongrel::HeaderOut</a><br />

data/doc/rdoc/classes/Mongrel/CGIWrapper.html

@@ -0,0 +1,300 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <title>Class: Mongrel::CGIWrapper</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+  <meta http-equiv="Content-Script-Type" content="text/javascript" />
+  <link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
+  <script type="text/javascript">
+  // <![CDATA[
+
+  function popupCode( url ) {
+    window.open(url, "Code", "resizable=yes,scrollbars=yes,toolbar=no,status=no,height=150,width=400")
+  }
+
+  function toggleCode( id ) {
+    if ( document.getElementById )
+      elem = document.getElementById( id );
+    else if ( document.all )
+      elem = eval( "document.all." + id );
+    else
+      return false;
+
+    elemStyle = elem.style;
+    
+    if ( elemStyle.display != "block" ) {
+      elemStyle.display = "block"
+    } else {
+      elemStyle.display = "none"
+    }
+
+    return true;
+  }
+  
+  // Make codeblocks hidden by default
+  document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" )
+  
+  // ]]>
+  </script>
+
+</head>
+<body>
+
+
+
+    <div id="classHeader">
+        <table class="header-table">
+        <tr class="top-aligned-row">
+          <td><strong>Class</strong></td>
+          <td class="class-name-in-header">Mongrel::CGIWrapper</td>
+        </tr>
+        <tr class="top-aligned-row">
+            <td><strong>In:</strong></td>
+            <td>
+                <a href="../../files/lib/mongrel_rb.html">
+                lib/mongrel.rb
+                </a>
+        <br />
+            </td>
+        </tr>
+
+        <tr class="top-aligned-row">
+            <td><strong>Parent:</strong></td>
+            <td>
+                ::CGI
+            </td>
+        </tr>
+        </table>
+    </div>
+  <!-- banner header -->
+
+  <div id="bodyContent">
+
+
+
+  <div id="contextContent">
+
+    <div id="description">
+      <p>
+The beginning of a complete wrapper around <a
+href="../Mongrel.html">Mongrel</a>&#8217;s internal HTTP processing system
+but maintaining the original Ruby CGI module. Use this only as a crutch to
+get existing CGI based systems working. It should handle everything, but
+please notify me if you see special warnings. This work is still very alpha
+so I need testers to help work out the various corner cases.
+</p>
+
+    </div>
+
+
+   </div>
+
+    <div id="method-list">
+      <h3 class="section-bar">Methods</h3>
+
+      <div class="name-list">
+      <a href="#M000051">args</a>&nbsp;&nbsp;
+      <a href="#M000052">env_table</a>&nbsp;&nbsp;
+      <a href="#M000048">header</a>&nbsp;&nbsp;
+      <a href="#M000047">new</a>&nbsp;&nbsp;
+      <a href="#M000049">out</a>&nbsp;&nbsp;
+      <a href="#M000050">status</a>&nbsp;&nbsp;
+      <a href="#M000053">stdinput</a>&nbsp;&nbsp;
+      <a href="#M000054">stdoutput</a>&nbsp;&nbsp;
+      </div>
+    </div>
+
+  </div>
+
+
+    <!-- if includes -->
+
+    <div id="section">
+
+
+
+
+
+    <div id="attribute-list">
+      <h3 class="section-bar">Attributes</h3>
+
+      <div class="name-list">
+        <table>
+        <tr class="top-aligned-row context-row">
+          <td class="context-item-name">options</td>
+          <td class="context-item-value">&nbsp;[R]&nbsp;</td>
+          <td class="context-item-desc"></td>
+        </tr>
+        </table>
+      </div>
+    </div>
+      
+
+
+    <!-- if method_list -->
+    <div id="methods">
+      <h3 class="section-bar">Public Class methods</h3>
+
+      <div id="method-M000047" class="method-detail">
+        <a name="M000047"></a>
+
+        <div class="method-heading">
+          <a href="CGIWrapper.src/M000047.html" target="Code" class="method-signature"
+            onclick="popupCode('CGIWrapper.src/M000047.html');return false;">
+          <span class="method-name">new</span><span class="method-args">(request, response, *args)</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+        </div>
+      </div>
+
+      <h3 class="section-bar">Public Instance methods</h3>
+
+      <div id="method-M000051" class="method-detail">
+        <a name="M000051"></a>
+
+        <div class="method-heading">
+          <a href="CGIWrapper.src/M000051.html" target="Code" class="method-signature"
+            onclick="popupCode('CGIWrapper.src/M000051.html');return false;">
+          <span class="method-name">args</span><span class="method-args">()</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p>
+Used to wrap the normal args variable used inside CGI.
+</p>
+        </div>
+      </div>
+
+      <div id="method-M000052" class="method-detail">
+        <a name="M000052"></a>
+
+        <div class="method-heading">
+          <a href="CGIWrapper.src/M000052.html" target="Code" class="method-signature"
+            onclick="popupCode('CGIWrapper.src/M000052.html');return false;">
+          <span class="method-name">env_table</span><span class="method-args">()</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p>
+Used to wrap the normal <a href="CGIWrapper.html#M000052">env_table</a>
+variable used inside CGI.
+</p>
+        </div>
+      </div>
+
+      <div id="method-M000048" class="method-detail">
+        <a name="M000048"></a>
+
+        <div class="method-heading">
+          <a href="CGIWrapper.src/M000048.html" target="Code" class="method-signature"
+            onclick="popupCode('CGIWrapper.src/M000048.html');return false;">
+          <span class="method-name">header</span><span class="method-args">(options = &quot;text/html&quot;)</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p>
+The header is typically called to send back the header. In our case we
+collect it into a hash for later usage. Options passed to this function are
+capitalized properly (unlike CGI), sanitized and then just stored.
+</p>
+        </div>
+      </div>
+
+      <div id="method-M000049" class="method-detail">
+        <a name="M000049"></a>
+
+        <div class="method-heading">
+          <a href="CGIWrapper.src/M000049.html" target="Code" class="method-signature"
+            onclick="popupCode('CGIWrapper.src/M000049.html');return false;">
+          <span class="method-name">out</span><span class="method-args">(options = &quot;text/html&quot;) {||| &quot;&quot;)| ...}</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p>
+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 <a
+href="HttpResponse.html">HttpResponse</a> the right way. Status is taken
+from the various options and converted to what <a
+href="../Mongrel.html">Mongrel</a> needs via the <a
+href="CGIWrapper.html#M000050">CGIWrapper.status</a> function.
+</p>
+        </div>
+      </div>
+
+      <div id="method-M000050" class="method-detail">
+        <a name="M000050"></a>
+
+        <div class="method-heading">
+          <a href="CGIWrapper.src/M000050.html" target="Code" class="method-signature"
+            onclick="popupCode('CGIWrapper.src/M000050.html');return false;">
+          <span class="method-name">status</span><span class="method-args">()</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p>
+Computes the status once, but lazily so that people who call header twice
+don&#8217;t get penalized. Because CGI insists on including the options
+status message in the status we have to do a bit of parsing.
+</p>
+        </div>
+      </div>
+
+      <div id="method-M000053" class="method-detail">
+        <a name="M000053"></a>
+
+        <div class="method-heading">
+          <a href="CGIWrapper.src/M000053.html" target="Code" class="method-signature"
+            onclick="popupCode('CGIWrapper.src/M000053.html');return false;">
+          <span class="method-name">stdinput</span><span class="method-args">()</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p>
+Used to wrap the normal stdinput variable used inside CGI.
+</p>
+        </div>
+      </div>
+
+      <div id="method-M000054" class="method-detail">
+        <a name="M000054"></a>
+
+        <div class="method-heading">
+          <a href="CGIWrapper.src/M000054.html" target="Code" class="method-signature"
+            onclick="popupCode('CGIWrapper.src/M000054.html');return false;">
+          <span class="method-name">stdoutput</span><span class="method-args">()</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p>
+The stdoutput should be completely bypassed but we&#8217;ll drop a warning
+just in case
+</p>
+        </div>
+      </div>
+
+
+    </div>
+
+
+  </div>
+
+
+<div id="validator-badges">
+  <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
+</div>
+
+</body>
+</html>

data/doc/rdoc/classes/Mongrel/CGIWrapper.src/M000047.html

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html>
+<head>
+  <title>new (Mongrel::CGIWrapper)</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" />
+</head>
+<body class="standalone-code">
+  <pre>     <span class="ruby-comment cmt"># File lib/mongrel.rb, line 605</span>
+605:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">request</span>, <span class="ruby-identifier">response</span>, <span class="ruby-operator">*</span><span class="ruby-identifier">args</span>)
+606:       <span class="ruby-ivar">@request</span> = <span class="ruby-identifier">request</span>
+607:       <span class="ruby-ivar">@response</span> = <span class="ruby-identifier">response</span>
+608:       <span class="ruby-ivar">@args</span> = <span class="ruby-operator">*</span><span class="ruby-identifier">args</span>
+609:       <span class="ruby-ivar">@input</span> = <span class="ruby-constant">StringIO</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">request</span>.<span class="ruby-identifier">body</span>)
+610:       <span class="ruby-ivar">@options</span> = {}
+611:       <span class="ruby-keyword kw">super</span>(<span class="ruby-operator">*</span><span class="ruby-identifier">args</span>)
+612:     <span class="ruby-keyword kw">end</span></pre>
+</body>
+</html>