mongrel 0.3.11 → 0.3.12

data/lib/mongrel/stats.rb

@@ -0,0 +1,71 @@
+# A very simple little class for doing some basic fast statistics sampling.
+# You feed it either samples of numeric data you want measured or you call
+# Stats.tick to get it to add a time delta between the last time you called it.
+# When you're done either call sum, sumsq, n, min, max, mean or sd to get 
+# the information.  The other option is to just call dump and see everything.
+#
+# It does all of this very fast and doesn't take up any memory since the samples
+# are not stored but instead all the values are calculated on the fly.
+class Stats
+  attr_reader :sum, :sumsq, :n, :min, :max
+
+  def initialize(name)
+    @name = name
+    reset
+  end
+
+  # Resets the internal counters so you can start sampling again.
+  def reset
+    @sum = 0.0
+    @sumsq = 0.0
+    @last_time = Time.new
+    @n = 0.0
+    @min = 0.0
+    @max = 0.0
+  end
+
+  # Adds a sampling to the calculations.
+  def sample(s)
+    @sum += s
+    @sumsq += s * s
+    if @n == 0
+      @min = @max = s
+    else
+      @min = s if @min > s
+      @max = s if @max < s
+    end
+    @n+=1
+  end
+
+  # Dump this Stats object with an optional additional message.
+  def dump(msg = "")
+    STDERR.puts "[#{@name}] #{msg} : SUM=#@sum, SUMSQ=#@sumsq, N=#@n, MEAN=#{mean}, SD=#{sd}, MIN=#@min, MAX=#@max"
+  end
+
+  # Calculates and returns the mean for the data passed so far.
+  def mean
+    @sum / @n
+  end
+
+  # Calculates the standard deviation of the data so far.
+  def sd
+    # (sqrt( ((s).sumsq - ( (s).sum * (s).sum / (s).n)) / ((s).n-1) ))
+    Math.sqrt( (@sumsq - ( @sum * @sum / @n)) / (@n-1) )
+  end
+
+
+  # Adds a time delta between now and the last time you called this.  This
+  # will give you the average time between two activities.
+  # 
+  # An example is:
+  #
+  #  t = Stats.new("do_stuff")
+  #  10000.times { do_stuff(); t.tick }
+  #  t.dump("time")
+  #
+  def tick
+    now = Time.now
+    sample(now - @last_time)
+    @last_time = now
+  end
+end

data/test/test_configurator.rb

@@ -0,0 +1,67 @@
+require 'test/unit'
+require 'mongrel'
+
+$test_plugin_fired = 0
+
+class TestPlugin < GemPlugin::Plugin "/handlers"
+  include Mongrel::HttpHandlerPlugin
+
+  def process(request, response)
+    $test_plugin_fired += 1
+  end
+end
+
+
+class Sentinel < GemPlugin::Plugin "/handlers"
+  include Mongrel::HttpHandlerPlugin
+
+  def process(request, response)
+    raise "This Sentinel plugin shouldn't run."
+  end
+end
+
+
+class ConfiguratorTest < Test::Unit::TestCase
+
+  def test_base_handler_config
+    config = Mongrel::Configurator.new :host => "localhost" do
+      listener :port => 3111 do
+        # 2 in front should run, but the sentinel shouldn't since dirhandler processes the request
+        uri "/", :handler => plugin("/handlers/testplugin")
+        uri "/", :handler => plugin("/handlers/testplugin")
+        uri "/", :handler => Mongrel::DirHandler.new(".", load_mime_map("examples/mime.yaml"))
+        uri "/", :handler => plugin("/handlers/testplugin")
+
+        uri "/test", :handler => plugin("/handlers/testplugin")
+        uri "/test", :handler => plugin("/handlers/testplugin")
+        uri "/test", :handler => Mongrel::DirHandler.new(".", load_mime_map("examples/mime.yaml"))
+        uri "/test", :handler => plugin("/handlers/testplugin")
+        run
+      end
+    end
+
+
+    config.listeners.each do |host,listener| 
+      puts "Registered URIs: #{listener.classifier.uris.inspect}"
+      assert listener.classifier.uris.length == 2, "Wrong number of registered URIs"
+      assert listener.classifier.uris.include?("/"),  "/ not registered"
+      assert listener.classifier.uris.include?("/test"), "/test not registered"
+    end
+
+    res = Net::HTTP.get(URI.parse('http://localhost:3111/test'))
+    assert res != nil, "Didn't get a response"
+    assert $test_plugin_fired == 3, "Test filter plugin didn't run 3 times."
+
+
+    res = Net::HTTP.get(URI.parse('http://localhost:3111/'))
+    assert res != nil, "Didn't get a response"
+    assert $test_plugin_fired == 6, "Test filter plugin didn't run 6 times."
+
+    config.stop
+    
+    assert_raise Errno::EBADF, Errno::ECONNREFUSED do
+      res = Net::HTTP.get(URI.parse("http://localhost:3111/"))
+    end
+  end
+
+end

data/test/test_debug.rb

@@ -0,0 +1,31 @@
+require 'fileutils'
+FileUtils.mkdir_p "log/mongrel_debug"
+
+require 'test/unit'
+require 'mongrel/rails'
+require 'mongrel/debug'
+
+
+class MongrelDbgTest < Test::Unit::TestCase
+
+  def setup
+    FileUtils.rm_rf "log/mongrel_debug"
+    MongrelDbg::configure
+  end
+
+
+  def test_tracing_to_log
+    MongrelDbg::begin_trace(:rails)
+    MongrelDbg::trace(:rails, "Good stuff")
+    MongrelDbg::end_trace(:rails)
+
+    assert File.exist?("log/mongrel_debug"), "Didn't make logging directory"
+    assert File.exist?("log/mongrel_debug/rails.log"), "Didn't make the rails.log file"
+    assert File.size("log/mongrel_debug/rails.log") > 0, "Didn't write anything to the log."
+
+    Class.report_object_creations
+    Class.reset_object_creations
+    Class.report_object_creations
+  end
+
+end

data/test/test_http11.rb

@@ -1,6 +1,9 @@
 require 'test/unit'
 require 'http11'
+require 'mongrel'
+require 'benchmark'
 
+include Mongrel
 
 class HttpParserTest < Test::Unit::TestCase
     
@@ -34,5 +37,18 @@ class HttpParserTest < Test::Unit::TestCase
     assert !parser.finished?, "Parser shouldn't be finished"
     assert parser.error?, "Parser SHOULD have error"
   end
+
+  def test_query_parse
+    puts HttpRequest.query_parse("zed=1&frank=2").inspect
+    puts HttpRequest.query_parse("zed=1&zed=2&zed=3&frank=11;zed=45").inspect
+
+    puts Benchmark.measure {
+      10000.times do |i|
+        g = HttpRequest.query_parse("zed=1&zed=2&zed=3&frank=11").inspect
+      end
+    }        
+  end
+
+
 end
 

data/test/test_response.rb

@@ -1,5 +1,6 @@
 require 'test/unit'
 require 'mongrel'
+require 'benchmark'
 
 include Mongrel
 
@@ -25,6 +26,8 @@ class ResponseTest < Test::Unit::TestCase
       out.write("tested")
       out.write("hello!")
     end
+
+    resp.finished
     assert io.length > 0, "output didn't have data"
   end
 
@@ -37,8 +40,10 @@ class ResponseTest < Test::Unit::TestCase
       out.write("NOT FOUND")
     end
 
+    resp.finished
     assert io.length > 0, "output didn't have data"
   end
 
+
 end
 

data/test/test_stats.rb

@@ -0,0 +1,28 @@
+require 'test/unit'
+require 'mongrel/stats'
+
+class StatsTest < Test::Unit::TestCase
+
+  def test_sampling_speed
+    s = Stats.new("test")
+    t = Stats.new("time")
+
+    10000.times { s.sample(rand(20)); t.tick }
+
+    s.dump("FIRST")
+    t.dump("FIRST")
+    
+    old_mean = s.mean
+    old_sd = s.sd
+
+    s.reset
+    t.reset
+    10000.times { s.sample(rand(20)); t.tick }
+    
+    s.dump("SECOND")
+    t.dump("SECOND")
+    assert_not_equal old_mean, s.mean
+    assert_not_equal old_mean, s.sd    
+  end
+
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: mongrel
 version: !ruby/object:Gem::Version 
-  version: 0.3.11
-date: 2006-03-15 00:00:00 -05:00
+  version: 0.3.12
+date: 2006-03-30 00:00:00 -05:00
 summary: A small fast HTTP library and server that runs Rails, Camping, and Nitro apps.
 require_paths: 
 - lib
@@ -35,19 +35,240 @@ files:
 - bin/mongrel_rails
 - bin/mongrel_rails_service
 - bin/mongrel_rails_svc
+- doc/rdoc/classes
+- doc/rdoc/created.rid
+- doc/rdoc/files
+- doc/rdoc/fr_class_index.html
+- doc/rdoc/fr_file_index.html
+- doc/rdoc/fr_method_index.html
+- doc/rdoc/index.html
+- doc/rdoc/rdoc-style.css
+- doc/rdoc/classes/Class.html
+- doc/rdoc/classes/Class.src
+- doc/rdoc/classes/IO.html
+- doc/rdoc/classes/IO.src
+- doc/rdoc/classes/Kernel.html
+- doc/rdoc/classes/Kernel.src
+- doc/rdoc/classes/Mongrel
+- doc/rdoc/classes/Mongrel.html
+- doc/rdoc/classes/MongrelDbg.html
+- doc/rdoc/classes/MongrelDbg.src
+- doc/rdoc/classes/ObjectTracker.html
+- doc/rdoc/classes/ObjectTracker.src
+- doc/rdoc/classes/RequestLog
+- doc/rdoc/classes/RequestLog.html
+- doc/rdoc/classes/Stats.html
+- doc/rdoc/classes/Stats.src
+- doc/rdoc/classes/TCPServer.html
+- doc/rdoc/classes/TCPServer.src
+- doc/rdoc/classes/Class.src/M000001.html
+- doc/rdoc/classes/Class.src/M000002.html
+- doc/rdoc/classes/Class.src/M000003.html
+- doc/rdoc/classes/Class.src/M000004.html
+- doc/rdoc/classes/IO.src/M000005.html
+- doc/rdoc/classes/IO.src/M000006.html
+- doc/rdoc/classes/Kernel.src/M000025.html
+- doc/rdoc/classes/Kernel.src/M000026.html
+- doc/rdoc/classes/Mongrel/Camping
+- doc/rdoc/classes/Mongrel/Camping.html
+- doc/rdoc/classes/Mongrel/Camping.src
+- doc/rdoc/classes/Mongrel/CGIWrapper.html
+- doc/rdoc/classes/Mongrel/CGIWrapper.src
+- doc/rdoc/classes/Mongrel/Command
+- doc/rdoc/classes/Mongrel/Command.html
+- doc/rdoc/classes/Mongrel/Configurator.html
+- doc/rdoc/classes/Mongrel/Configurator.src
+- doc/rdoc/classes/Mongrel/Const.html
+- doc/rdoc/classes/Mongrel/DirHandler.html
+- doc/rdoc/classes/Mongrel/DirHandler.src
+- doc/rdoc/classes/Mongrel/Error404Handler.html
+- doc/rdoc/classes/Mongrel/Error404Handler.src
+- doc/rdoc/classes/Mongrel/HeaderOut.html
+- doc/rdoc/classes/Mongrel/HeaderOut.src
+- doc/rdoc/classes/Mongrel/HttpHandler.html
+- doc/rdoc/classes/Mongrel/HttpHandler.src
+- doc/rdoc/classes/Mongrel/HttpHandlerPlugin.html
+- doc/rdoc/classes/Mongrel/HttpHandlerPlugin.src
+- doc/rdoc/classes/Mongrel/HttpParser.html
+- doc/rdoc/classes/Mongrel/HttpParser.src
+- doc/rdoc/classes/Mongrel/HttpRequest.html
+- doc/rdoc/classes/Mongrel/HttpRequest.src
+- doc/rdoc/classes/Mongrel/HttpResponse.html
+- doc/rdoc/classes/Mongrel/HttpResponse.src
+- doc/rdoc/classes/Mongrel/HttpServer.html
+- doc/rdoc/classes/Mongrel/HttpServer.src
+- doc/rdoc/classes/Mongrel/Rails
+- doc/rdoc/classes/Mongrel/Rails.html
+- doc/rdoc/classes/Mongrel/StopServer.html
+- doc/rdoc/classes/Mongrel/URIClassifier.html
+- doc/rdoc/classes/Mongrel/URIClassifier.src
+- doc/rdoc/classes/Mongrel/Camping/CampingHandler.html
+- doc/rdoc/classes/Mongrel/Camping/CampingHandler.src
+- doc/rdoc/classes/Mongrel/Camping/CampingHandler.src/M000049.html
+- doc/rdoc/classes/Mongrel/Camping/CampingHandler.src/M000050.html
+- doc/rdoc/classes/Mongrel/Camping.src/M000048.html
+- doc/rdoc/classes/Mongrel/CGIWrapper.src/M000090.html
+- doc/rdoc/classes/Mongrel/CGIWrapper.src/M000091.html
+- doc/rdoc/classes/Mongrel/CGIWrapper.src/M000092.html
+- doc/rdoc/classes/Mongrel/CGIWrapper.src/M000093.html
+- doc/rdoc/classes/Mongrel/CGIWrapper.src/M000094.html
+- doc/rdoc/classes/Mongrel/CGIWrapper.src/M000095.html
+- doc/rdoc/classes/Mongrel/CGIWrapper.src/M000096.html
+- doc/rdoc/classes/Mongrel/CGIWrapper.src/M000097.html
+- doc/rdoc/classes/Mongrel/CGIWrapper.src/M000098.html
+- doc/rdoc/classes/Mongrel/Command/Base.html
+- doc/rdoc/classes/Mongrel/Command/Base.src
+- doc/rdoc/classes/Mongrel/Command/Registry.html
+- doc/rdoc/classes/Mongrel/Command/Registry.src
+- doc/rdoc/classes/Mongrel/Command/Base.src/M000029.html
+- doc/rdoc/classes/Mongrel/Command/Base.src/M000030.html
+- doc/rdoc/classes/Mongrel/Command/Base.src/M000031.html
+- doc/rdoc/classes/Mongrel/Command/Base.src/M000032.html
+- doc/rdoc/classes/Mongrel/Command/Base.src/M000033.html
+- doc/rdoc/classes/Mongrel/Command/Base.src/M000034.html
+- doc/rdoc/classes/Mongrel/Command/Base.src/M000035.html
+- doc/rdoc/classes/Mongrel/Command/Base.src/M000036.html
+- doc/rdoc/classes/Mongrel/Command/Base.src/M000037.html
+- doc/rdoc/classes/Mongrel/Command/Base.src/M000038.html
+- doc/rdoc/classes/Mongrel/Command/Registry.src/M000039.html
+- doc/rdoc/classes/Mongrel/Command/Registry.src/M000040.html
+- doc/rdoc/classes/Mongrel/Command/Registry.src/M000041.html
+- doc/rdoc/classes/Mongrel/Configurator.src/M000099.html
+- doc/rdoc/classes/Mongrel/Configurator.src/M000100.html
+- doc/rdoc/classes/Mongrel/Configurator.src/M000101.html
+- doc/rdoc/classes/Mongrel/Configurator.src/M000102.html
+- doc/rdoc/classes/Mongrel/Configurator.src/M000103.html
+- doc/rdoc/classes/Mongrel/Configurator.src/M000104.html
+- doc/rdoc/classes/Mongrel/Configurator.src/M000105.html
+- doc/rdoc/classes/Mongrel/Configurator.src/M000106.html
+- doc/rdoc/classes/Mongrel/Configurator.src/M000107.html
+- doc/rdoc/classes/Mongrel/Configurator.src/M000108.html
+- doc/rdoc/classes/Mongrel/Configurator.src/M000109.html
+- doc/rdoc/classes/Mongrel/Configurator.src/M000110.html
+- doc/rdoc/classes/Mongrel/Configurator.src/M000111.html
+- doc/rdoc/classes/Mongrel/Configurator.src/M000112.html
+- doc/rdoc/classes/Mongrel/Configurator.src/M000113.html
+- doc/rdoc/classes/Mongrel/Configurator.src/M000114.html
+- doc/rdoc/classes/Mongrel/DirHandler.src/M000058.html
+- doc/rdoc/classes/Mongrel/DirHandler.src/M000059.html
+- doc/rdoc/classes/Mongrel/DirHandler.src/M000060.html
+- doc/rdoc/classes/Mongrel/DirHandler.src/M000061.html
+- doc/rdoc/classes/Mongrel/DirHandler.src/M000062.html
+- doc/rdoc/classes/Mongrel/DirHandler.src/M000063.html
+- doc/rdoc/classes/Mongrel/Error404Handler.src/M000115.html
+- doc/rdoc/classes/Mongrel/Error404Handler.src/M000116.html
+- doc/rdoc/classes/Mongrel/HeaderOut.src/M000072.html
+- doc/rdoc/classes/Mongrel/HeaderOut.src/M000073.html
+- doc/rdoc/classes/Mongrel/HttpHandler.src/M000074.html
+- doc/rdoc/classes/Mongrel/HttpHandlerPlugin.src/M000027.html
+- doc/rdoc/classes/Mongrel/HttpHandlerPlugin.src/M000028.html
+- doc/rdoc/classes/Mongrel/HttpParser.src/M000051.html
+- doc/rdoc/classes/Mongrel/HttpParser.src/M000052.html
+- doc/rdoc/classes/Mongrel/HttpParser.src/M000053.html
+- doc/rdoc/classes/Mongrel/HttpParser.src/M000054.html
+- doc/rdoc/classes/Mongrel/HttpParser.src/M000055.html
+- doc/rdoc/classes/Mongrel/HttpParser.src/M000056.html
+- doc/rdoc/classes/Mongrel/HttpParser.src/M000057.html
+- doc/rdoc/classes/Mongrel/HttpRequest.src/M000117.html
+- doc/rdoc/classes/Mongrel/HttpRequest.src/M000118.html
+- doc/rdoc/classes/Mongrel/HttpRequest.src/M000119.html
+- doc/rdoc/classes/Mongrel/HttpRequest.src/M000120.html
+- doc/rdoc/classes/Mongrel/HttpResponse.src/M000075.html
+- doc/rdoc/classes/Mongrel/HttpResponse.src/M000076.html
+- doc/rdoc/classes/Mongrel/HttpResponse.src/M000077.html
+- doc/rdoc/classes/Mongrel/HttpResponse.src/M000078.html
+- doc/rdoc/classes/Mongrel/HttpResponse.src/M000079.html
+- doc/rdoc/classes/Mongrel/HttpResponse.src/M000080.html
+- doc/rdoc/classes/Mongrel/HttpResponse.src/M000081.html
+- doc/rdoc/classes/Mongrel/HttpResponse.src/M000082.html
+- doc/rdoc/classes/Mongrel/HttpResponse.src/M000083.html
+- doc/rdoc/classes/Mongrel/HttpServer.src/M000064.html
+- doc/rdoc/classes/Mongrel/HttpServer.src/M000065.html
+- doc/rdoc/classes/Mongrel/HttpServer.src/M000066.html
+- doc/rdoc/classes/Mongrel/HttpServer.src/M000067.html
+- doc/rdoc/classes/Mongrel/HttpServer.src/M000068.html
+- doc/rdoc/classes/Mongrel/HttpServer.src/M000069.html
+- doc/rdoc/classes/Mongrel/HttpServer.src/M000070.html
+- doc/rdoc/classes/Mongrel/HttpServer.src/M000071.html
+- doc/rdoc/classes/Mongrel/Rails/RailsConfigurator.html
+- doc/rdoc/classes/Mongrel/Rails/RailsConfigurator.src
+- doc/rdoc/classes/Mongrel/Rails/RailsHandler.html
+- doc/rdoc/classes/Mongrel/Rails/RailsHandler.src
+- doc/rdoc/classes/Mongrel/Rails/RailsConfigurator.src/M000042.html
+- doc/rdoc/classes/Mongrel/Rails/RailsConfigurator.src/M000043.html
+- doc/rdoc/classes/Mongrel/Rails/RailsConfigurator.src/M000044.html
+- doc/rdoc/classes/Mongrel/Rails/RailsHandler.src/M000045.html
+- doc/rdoc/classes/Mongrel/Rails/RailsHandler.src/M000046.html
+- doc/rdoc/classes/Mongrel/Rails/RailsHandler.src/M000047.html
+- doc/rdoc/classes/Mongrel/URIClassifier.src/M000084.html
+- doc/rdoc/classes/Mongrel/URIClassifier.src/M000085.html
+- doc/rdoc/classes/Mongrel/URIClassifier.src/M000086.html
+- doc/rdoc/classes/Mongrel/URIClassifier.src/M000087.html
+- doc/rdoc/classes/Mongrel/URIClassifier.src/M000088.html
+- doc/rdoc/classes/Mongrel/URIClassifier.src/M000089.html
+- doc/rdoc/classes/MongrelDbg.src/M000020.html
+- doc/rdoc/classes/MongrelDbg.src/M000021.html
+- doc/rdoc/classes/MongrelDbg.src/M000022.html
+- doc/rdoc/classes/MongrelDbg.src/M000023.html
+- doc/rdoc/classes/MongrelDbg.src/M000024.html
+- doc/rdoc/classes/ObjectTracker.src/M000016.html
+- doc/rdoc/classes/ObjectTracker.src/M000017.html
+- doc/rdoc/classes/ObjectTracker.src/M000018.html
+- doc/rdoc/classes/ObjectTracker.src/M000019.html
+- doc/rdoc/classes/RequestLog/Files.html
+- doc/rdoc/classes/RequestLog/Files.src
+- doc/rdoc/classes/RequestLog/Objects.html
+- doc/rdoc/classes/RequestLog/Objects.src
+- doc/rdoc/classes/RequestLog/Params.html
+- doc/rdoc/classes/RequestLog/Params.src
+- doc/rdoc/classes/RequestLog/Files.src/M000121.html
+- doc/rdoc/classes/RequestLog/Objects.src/M000122.html
+- doc/rdoc/classes/RequestLog/Params.src/M000123.html
+- doc/rdoc/classes/Stats.src/M000009.html
+- doc/rdoc/classes/Stats.src/M000010.html
+- doc/rdoc/classes/Stats.src/M000011.html
+- doc/rdoc/classes/Stats.src/M000012.html
+- doc/rdoc/classes/Stats.src/M000013.html
+- doc/rdoc/classes/Stats.src/M000014.html
+- doc/rdoc/classes/Stats.src/M000015.html
+- doc/rdoc/classes/TCPServer.src/M000007.html
+- doc/rdoc/files/COPYING.html
+- doc/rdoc/files/ext
+- doc/rdoc/files/lib
+- doc/rdoc/files/LICENSE.html
+- doc/rdoc/files/README.html
+- doc/rdoc/files/ext/http11
+- doc/rdoc/files/ext/http11/http11_c.html
+- doc/rdoc/files/lib/mongrel
+- doc/rdoc/files/lib/mongrel_rb.html
+- doc/rdoc/files/lib/mongrel/camping_rb.html
+- doc/rdoc/files/lib/mongrel/cgi_rb.html
+- doc/rdoc/files/lib/mongrel/command_rb.html
+- doc/rdoc/files/lib/mongrel/debug_rb.html
+- doc/rdoc/files/lib/mongrel/handlers_rb.html
+- doc/rdoc/files/lib/mongrel/init_rb.html
+- doc/rdoc/files/lib/mongrel/rails_rb.html
+- doc/rdoc/files/lib/mongrel/stats_rb.html
+- doc/rdoc/files/lib/mongrel/tcphack_rb.html
+- test/test_configurator.rb
+- test/test_debug.rb
 - test/test_http11.rb
 - test/test_response.rb
+- test/test_stats.rb
 - test/test_uriclassifier.rb
 - test/test_ws.rb
+- lib/http11.bundle
 - lib/mongrel
 - lib/mongrel.rb
 - lib/mongrel/camping.rb
 - lib/mongrel/cgi.rb
 - lib/mongrel/command
 - lib/mongrel/command.rb
+- lib/mongrel/debug.rb
 - lib/mongrel/handlers.rb
 - lib/mongrel/init.rb
 - lib/mongrel/rails.rb
+- lib/mongrel/stats.rb
 - lib/mongrel/tcphack.rb
 - ext/http11/ext_help.h
 - ext/http11/http11_parser.h
@@ -61,6 +282,7 @@ files:
 - ext/http11/tst_insert.c
 - ext/http11/tst_search.c
 - ext/http11/extconf.rb
+- examples/builder.rb
 - examples/mongrel_simple_ctrl.rb
 - examples/mongrel_simple_service.rb
 - examples/simpletest.rb