RubyGems - mongrel - Versions diffs - 0.3.3 → 0.3.4 - Mend

mongrel 0.3.3 → 0.3.4

Files changed (49) hide show

data/doc/rdoc/classes/Mongrel/HttpServer.src/M000031.html CHANGED

@@ -10,9 +10,9 @@
   <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 413</span>
-413:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">register</span>(<span class="ruby-identifier">uri</span>, <span class="ruby-identifier">handler</span>)
-414:       <span class="ruby-ivar">@classifier</span>.<span class="ruby-identifier">register</span>(<span class="ruby-identifier">uri</span>, <span class="ruby-identifier">handler</span>)
-415:     <span class="ruby-keyword kw">end</span></pre>
+  <pre>     <span class="ruby-comment cmt"># File lib/mongrel.rb, line 415</span>
+415:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">register</span>(<span class="ruby-identifier">uri</span>, <span class="ruby-identifier">handler</span>)
+416:       <span class="ruby-ivar">@classifier</span>.<span class="ruby-identifier">register</span>(<span class="ruby-identifier">uri</span>, <span class="ruby-identifier">handler</span>)
+417:     <span class="ruby-keyword kw">end</span></pre>
 </body>
 </html>

data/doc/rdoc/classes/Mongrel/HttpServer.src/M000032.html CHANGED

@@ -10,9 +10,9 @@
   <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 419</span>
-419:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">unregister</span>(<span class="ruby-identifier">uri</span>)
-420:       <span class="ruby-ivar">@classifier</span>.<span class="ruby-identifier">unregister</span>(<span class="ruby-identifier">uri</span>)
-421:     <span class="ruby-keyword kw">end</span></pre>
+  <pre>     <span class="ruby-comment cmt"># File lib/mongrel.rb, line 421</span>
+421:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">unregister</span>(<span class="ruby-identifier">uri</span>)
+422:       <span class="ruby-ivar">@classifier</span>.<span class="ruby-identifier">unregister</span>(<span class="ruby-identifier">uri</span>)
+423:     <span class="ruby-keyword kw">end</span></pre>
 </body>
 </html>

data/doc/rdoc/created.rid CHANGED

	@@ -1 +1 @@
1	- ~~Tue~~ Feb 14 08:17:08 EST 2006
1	+ Thu Feb 16 02:01:03 EST 2006

data/doc/rdoc/files/README.html CHANGED

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Mon Feb 13 18:33:41 EST 2006</td>
+      <td>Wed Feb 15 08:10:57 EST 2006</td>
     </tr>
     </table>
   </div>
@@ -158,7 +158,7 @@ example:
  h = Mongrel::HttpServer.new(&quot;0.0.0.0&quot;, &quot;3000&quot;)
  h.register(&quot;/test&quot;, SimpleHandler.new)
- h.register(&quot;/files&quot;, DirHandler.new(&quot;.&quot;))
+ h.register(&quot;/files&quot;, Mongrel::DirHandler.new(&quot;.&quot;))
  h.run.join
 </pre>
 <p>

data/doc/rdoc/files/lib/mongrel_rb.html CHANGED

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Tue Feb 14 08:08:55 EST 2006</td>
+      <td>Thu Feb 16 01:05:45 EST 2006</td>
     </tr>
     </table>
   </div>
@@ -78,6 +78,7 @@
       thread&nbsp;&nbsp;
       stringio&nbsp;&nbsp;
       timeout&nbsp;&nbsp;
+      cgi&nbsp;&nbsp;
       </div>
     </div>

data/doc/rdoc/fr_class_index.html CHANGED

@@ -22,6 +22,7 @@
   <div id="index-entries">
     <a href="classes/FactoryError.html">FactoryError</a><br />
     <a href="classes/Mongrel.html">Mongrel</a><br />
+    <a href="classes/Mongrel/CGIWrapper.html">Mongrel::CGIWrapper</a><br />
     <a href="classes/Mongrel/Const.html">Mongrel::Const</a><br />
     <a href="classes/Mongrel/DirHandler.html">Mongrel::DirHandler</a><br />
     <a href="classes/Mongrel/Error404Handler.html">Mongrel::Error404Handler</a><br />

data/doc/rdoc/fr_method_index.html CHANGED

@@ -22,10 +22,12 @@
   <div id="index-entries">
     <a href="classes/Mongrel/HeaderOut.html#M000034">[]= (Mongrel::HeaderOut)</a><br />
     <a href="classes/Mongrel/DirHandler.html#M000027">add_mime_type (Mongrel::DirHandler)</a><br />
+    <a href="classes/Mongrel/CGIWrapper.html#M000051">args (Mongrel::CGIWrapper)</a><br />
     <a href="classes/Mongrel/DirHandler.html#M000023">can_serve (Mongrel::DirHandler)</a><br />
     <a href="classes/PluginFactory.html#M000009">create (PluginFactory)</a><br />
     <a href="classes/PluginFactory.html#M000008">derivativeClasses (PluginFactory)</a><br />
     <a href="classes/PluginFactory.html#M000005">derivatives (PluginFactory)</a><br />
+    <a href="classes/Mongrel/CGIWrapper.html#M000052">env_table (Mongrel::CGIWrapper)</a><br />
     <a href="classes/Mongrel/HttpParser.html#M000019">error? (Mongrel::HttpParser)</a><br />
     <a href="classes/Mongrel/HttpParser.html#M000018">execute (Mongrel::HttpParser)</a><br />
     <a href="classes/PluginFactory.html#M000004">extend_object (PluginFactory)</a><br />
@@ -35,27 +37,30 @@
     <a href="classes/Mongrel/HttpParser.html#M000020">finished? (Mongrel::HttpParser)</a><br />
     <a href="classes/PluginFactory.html#M000012">getModuleName (PluginFactory)</a><br />
     <a href="classes/PluginFactory.html#M000010">getSubclass (PluginFactory)</a><br />
+    <a href="classes/Mongrel/CGIWrapper.html#M000048">header (Mongrel::CGIWrapper)</a><br />
     <a href="classes/PluginFactory.html#M000003">included (PluginFactory)</a><br />
     <a href="classes/PluginFactory.html#M000007">inherited (PluginFactory)</a><br />
     <a href="classes/PluginFactory.html#M000011">loadDerivative (PluginFactory)</a><br />
     <a href="classes/PluginFactory.html#M000002">log (PluginFactory)</a><br />
     <a href="classes/PluginFactory.html#M000014">makeRequirePath (PluginFactory)</a><br />
-    <a href="classes/Mongrel/HttpParser.html#M000015">new (Mongrel::HttpParser)</a><br />
     <a href="classes/Mongrel/DirHandler.html#M000022">new (Mongrel::DirHandler)</a><br />
+    <a href="classes/Mongrel/CGIWrapper.html#M000047">new (Mongrel::CGIWrapper)</a><br />
+    <a href="classes/Mongrel/Error404Handler.html#M000055">new (Mongrel::Error404Handler)</a><br />
+    <a href="classes/Mongrel/HttpParser.html#M000015">new (Mongrel::HttpParser)</a><br />
+    <a href="classes/Mongrel/HttpServer.html#M000028">new (Mongrel::HttpServer)</a><br />
+    <a href="classes/Mongrel/HeaderOut.html#M000033">new (Mongrel::HeaderOut)</a><br />
     <a href="classes/Mongrel/HttpResponse.html#M000040">new (Mongrel::HttpResponse)</a><br />
     <a href="classes/Mongrel/URIClassifier.html#M000035">new (Mongrel::URIClassifier)</a><br />
-    <a href="classes/Mongrel/HeaderOut.html#M000033">new (Mongrel::HeaderOut)</a><br />
-    <a href="classes/Mongrel/Error404Handler.html#M000047">new (Mongrel::Error404Handler)</a><br />
     <a href="classes/FactoryError.html#M000001">new (FactoryError)</a><br />
-    <a href="classes/Mongrel/HttpServer.html#M000028">new (Mongrel::HttpServer)</a><br />
-    <a href="classes/Mongrel/HttpRequest.html#M000049">new (Mongrel::HttpRequest)</a><br />
+    <a href="classes/Mongrel/HttpRequest.html#M000057">new (Mongrel::HttpRequest)</a><br />
     <a href="classes/Mongrel/HttpParser.html#M000021">nread (Mongrel::HttpParser)</a><br />
-    <a href="classes/Mongrel/Error404Handler.html#M000048">process (Mongrel::Error404Handler)</a><br />
-    <a href="classes/Mongrel/HttpHandler.html#M000039">process (Mongrel::HttpHandler)</a><br />
+    <a href="classes/Mongrel/CGIWrapper.html#M000049">out (Mongrel::CGIWrapper)</a><br />
     <a href="classes/Mongrel/DirHandler.html#M000026">process (Mongrel::DirHandler)</a><br />
+    <a href="classes/Mongrel/Error404Handler.html#M000056">process (Mongrel::Error404Handler)</a><br />
+    <a href="classes/Mongrel/HttpHandler.html#M000039">process (Mongrel::HttpHandler)</a><br />
     <a href="classes/Mongrel/HttpServer.html#M000029">process_client (Mongrel::HttpServer)</a><br />
-    <a href="classes/Mongrel/HttpServer.html#M000031">register (Mongrel::HttpServer)</a><br />
     <a href="classes/Mongrel/URIClassifier.html#M000036">register (Mongrel::URIClassifier)</a><br />
+    <a href="classes/Mongrel/HttpServer.html#M000031">register (Mongrel::HttpServer)</a><br />
     <a href="classes/PluginFactory.html#M000013">requireDerivative (PluginFactory)</a><br />
     <a href="classes/Mongrel/HttpResponse.html#M000042">reset (Mongrel::HttpResponse)</a><br />
     <a href="classes/Mongrel/HttpParser.html#M000016">reset (Mongrel::HttpParser)</a><br />
@@ -67,8 +72,11 @@
     <a href="classes/Mongrel/HttpResponse.html#M000044">send_header (Mongrel::HttpResponse)</a><br />
     <a href="classes/Mongrel/HttpResponse.html#M000043">send_status (Mongrel::HttpResponse)</a><br />
     <a href="classes/Mongrel/HttpResponse.html#M000041">start (Mongrel::HttpResponse)</a><br />
-    <a href="classes/Mongrel/HttpServer.html#M000032">unregister (Mongrel::HttpServer)</a><br />
+    <a href="classes/Mongrel/CGIWrapper.html#M000050">status (Mongrel::CGIWrapper)</a><br />
+    <a href="classes/Mongrel/CGIWrapper.html#M000053">stdinput (Mongrel::CGIWrapper)</a><br />
+    <a href="classes/Mongrel/CGIWrapper.html#M000054">stdoutput (Mongrel::CGIWrapper)</a><br />
     <a href="classes/Mongrel/URIClassifier.html#M000037">unregister (Mongrel::URIClassifier)</a><br />
+    <a href="classes/Mongrel/HttpServer.html#M000032">unregister (Mongrel::HttpServer)</a><br />
   </div>
 </div>
 </body>

data/lib/mongrel.rb CHANGED

@@ -3,6 +3,8 @@ require 'http11'
 require 'thread'
 require 'stringio'
 require 'timeout'
+require 'cgi'
 # Mongrel module containing all of the classes (include C extensions) for running
 # a Mongrel web server.  It contains a minimalist HTTP server with just enough
@@ -110,7 +112,7 @@ module Mongrel
     SERVER_SOFTWARE='SERVER_SOFTWARE'
     # Current Mongrel version (used for SERVER_SOFTWARE and other response headers).
-    MONGREL_VERSION='Mongrel 0.2.2'
+    MONGREL_VERSION='Mongrel 0.3.4'
     # The standard empty 404 response for bad requests.  Use Error4040Handler for custom stuff.
     ERROR_404_RESPONSE="HTTP/1.1 404 Not Found\r\nConnection: close\r\nServer: #{MONGREL_VERSION}\r\n\r\nNOT FOUND"
@@ -243,7 +245,8 @@ module Mongrel
     end
     def send_status
-      @socket.write("HTTP/1.1 #{@status.to_i} #{HTTP_STATUS_CODES[@status.to_i]}\r\nContent-Length:#{body.length}\r\nConnection: close\r\n")
+      status = "HTTP/1.1 #{@status} #{HTTP_STATUS_CODES[@status]}\r\nContent-Length: #{@body.length}\r\nConnection: close\r\n"
+      @socket.write(status)
     end
     def send_header
@@ -254,7 +257,6 @@ module Mongrel
     def send_body
       @body.rewind
       # connection: close is also added to ensure that the client does not pipeline.
       @socket.write(@body.read)
     end
@@ -590,4 +592,88 @@ module Mongrel
   end
+  # The beginning of a complete wrapper around Mongrel'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.
+  class CGIWrapper < ::CGI
+    public :env_table
+    attr_reader :options
+    def initialize(request, response, *args)
+      @request = request
+      @response = response
+      @args = *args
+      @input = StringIO.new(request.body)
+      @options = {}
+      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.  Options passed to this function
+    # are capitalized properly (unlike CGI), sanitized and then just stored.
+    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.merge(options)
+      else
+        @options["Content-Type"] = options
+      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
+    # 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.
+    def out(options = "text/html")
+      header(options)
+      @response.start status do |head, out|
+        @options.each {|k,v| head[k.capitalize] = v}
+        out.write(yield || "")
+      end
+    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
+        @status = @options["Status"] || @options["status"]
+        if @status
+          @status[0 ... @status.index(' ')] || "200"
+        else
+          @status = "200"
+        end
+      end
+    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/mongrel/command.rb CHANGED

@@ -158,7 +158,7 @@ module Mongrel
         cmd_name = args.shift
         $0 = "#{cmd_name}"
-        if cmd_name == "?" or cmd_name == "help"
+        if !cmd_name or cmd_name == "?" or cmd_name == "help"
           print_command_list
           return true
         end

data/tools/rakehelp.rb CHANGED

@@ -1,7 +1,7 @@
 def make(makedir)
     Dir.chdir(makedir) do
-        sh 'make'
+        sh(PLATFORM =~ /win32/ ? 'nmake' : 'make')
     end
 end
@@ -64,14 +64,14 @@ def setup_extension(dir, extension)
 end
-def setup_gem(pkg_name, pkg_version, author, summary, executables, test_file)
+def base_gem_spec(pkg_name, pkg_version, author, summary, executables, test_file)
   pkg_version = pkg_version
   pkg_name    = pkg_name
   pkg_file_name = "#{pkg_name}-#{pkg_version}"
-  spec = Gem::Specification.new do |s|
+  Gem::Specification.new do |s|
     s.name = pkg_name
     s.version = pkg_version
+    s.required_ruby_version = '>= 1.8.3'
     s.platform = Gem::Platform::RUBY
     s.author = author
     s.summary = summary
@@ -90,14 +90,22 @@ def setup_gem(pkg_name, pkg_version, author, summary, executables, test_file)
     s.executables = executables
     s.bindir = "bin"
-    if block_given?
-      yield s
-    end
   end
+end
+def setup_gem(pkg_name, pkg_version, author, summary, executables, test_file)
+  spec = base_gem_spec(pkg_name, pkg_version, author, summary, executables, test_file)
+  yield spec if block_given?
   Rake::GemPackageTask.new(spec) do |p|
     p.gem_spec = spec
     p.need_tar = true
   end
 end
+def setup_win32_gem(pkg_name, pkg_version, author, summary, executables, test_file)
+  spec = base_gem_spec(pkg_name, pkg_version, author, summary, executables, test_file)
+  yield spec if block_given?
+  Gem::Builder.new(spec).build
+end

metadata CHANGED

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: mongrel
 version: !ruby/object:Gem::Version
-  version: 0.3.3
-date: 2006-02-14 00:00:00 -05:00
+  version: 0.3.4
+date: 2006-02-16 00:00:00 -05:00
 summary: A small fast HTTP library and server that runs Rails, Camping, and Nitro apps.
 require_paths:
 - lib
@@ -18,9 +18,9 @@ bindir: bin
 has_rdoc: true
 required_ruby_version: !ruby/object:Gem::Version::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 0.0.0
+      version: 1.8.3
   version:
 platform: ruby
 signing_key:
@@ -50,6 +50,8 @@ files:
 - doc/rdoc/classes/PluginFactory.html
 - doc/rdoc/classes/PluginFactory.src
 - doc/rdoc/classes/FactoryError.src/M000001.html
+- doc/rdoc/classes/Mongrel/CGIWrapper.html
+- doc/rdoc/classes/Mongrel/CGIWrapper.src
 - doc/rdoc/classes/Mongrel/Const.html
 - doc/rdoc/classes/Mongrel/DirHandler.html
 - doc/rdoc/classes/Mongrel/DirHandler.src
@@ -69,14 +71,22 @@ files:
 - doc/rdoc/classes/Mongrel/HttpServer.src
 - doc/rdoc/classes/Mongrel/URIClassifier.html
 - doc/rdoc/classes/Mongrel/URIClassifier.src
+- doc/rdoc/classes/Mongrel/CGIWrapper.src/M000047.html
+- doc/rdoc/classes/Mongrel/CGIWrapper.src/M000048.html
+- doc/rdoc/classes/Mongrel/CGIWrapper.src/M000049.html
+- doc/rdoc/classes/Mongrel/CGIWrapper.src/M000050.html
+- doc/rdoc/classes/Mongrel/CGIWrapper.src/M000051.html
+- doc/rdoc/classes/Mongrel/CGIWrapper.src/M000052.html
+- doc/rdoc/classes/Mongrel/CGIWrapper.src/M000053.html
+- doc/rdoc/classes/Mongrel/CGIWrapper.src/M000054.html
 - doc/rdoc/classes/Mongrel/DirHandler.src/M000022.html
 - doc/rdoc/classes/Mongrel/DirHandler.src/M000023.html
 - doc/rdoc/classes/Mongrel/DirHandler.src/M000024.html
 - doc/rdoc/classes/Mongrel/DirHandler.src/M000025.html
 - doc/rdoc/classes/Mongrel/DirHandler.src/M000026.html
 - doc/rdoc/classes/Mongrel/DirHandler.src/M000027.html
-- doc/rdoc/classes/Mongrel/Error404Handler.src/M000047.html
-- doc/rdoc/classes/Mongrel/Error404Handler.src/M000048.html
+- doc/rdoc/classes/Mongrel/Error404Handler.src/M000055.html
+- doc/rdoc/classes/Mongrel/Error404Handler.src/M000056.html
 - doc/rdoc/classes/Mongrel/HeaderOut.src/M000033.html
 - doc/rdoc/classes/Mongrel/HeaderOut.src/M000034.html
 - doc/rdoc/classes/Mongrel/HttpHandler.src/M000039.html
@@ -87,7 +97,7 @@ files:
 - doc/rdoc/classes/Mongrel/HttpParser.src/M000019.html
 - doc/rdoc/classes/Mongrel/HttpParser.src/M000020.html
 - doc/rdoc/classes/Mongrel/HttpParser.src/M000021.html
-- doc/rdoc/classes/Mongrel/HttpRequest.src/M000049.html
+- doc/rdoc/classes/Mongrel/HttpRequest.src/M000057.html
 - doc/rdoc/classes/Mongrel/HttpResponse.src/M000040.html
 - doc/rdoc/classes/Mongrel/HttpResponse.src/M000041.html
 - doc/rdoc/classes/Mongrel/HttpResponse.src/M000042.html