mongrel2 0.9.2 → 0.10.0

data/data/mongrel2/bootstrap.html

@@ -21,7 +21,7 @@
 
 		<footer>
 			<p>Copyright © 2011 Michael Granger &lt;<a href="mailto:ged@FaerieMUD.org">ged@FaerieMUD.org</a>&gt;.</p>
-			<p><tt>$Id$</tt></p>
+			<p><tt>$Id: bootstrap.html,v 032124c021b5 2011/09/18 20:01:52 ged $</tt></p>
 		</footer>
 	</body>
 </html>

data/data/mongrel2/config.sql

@@ -1,5 +1,3 @@
-begin transaction;
-
 DROP TABLE IF EXISTS server;
 DROP TABLE IF EXISTS host;
 DROP TABLE IF EXISTS handler;
@@ -9,6 +7,7 @@ DROP TABLE IF EXISTS statistic;
 DROP TABLE IF EXISTS mimetype;
 DROP TABLE IF EXISTS setting;
 DROP TABLE IF EXISTS directory;
+DROP TABLE IF EXISTS filter;
 
 CREATE TABLE server (id INTEGER PRIMARY KEY,
     uuid TEXT,
@@ -53,14 +52,12 @@ CREATE TABLE route (id INTEGER PRIMARY KEY,
     target_id INTEGER,
     target_type TEXT);
 
-
 CREATE TABLE setting (id INTEGER PRIMARY KEY, key TEXT, value TEXT);
 
-
 CREATE TABLE statistic (id SERIAL,
     other_type TEXT,
     other_id INTEGER,
-    name text,
+    name TEXT,
     sum REAL,
     sumsq REAL,
     n INTEGER,
@@ -70,9 +67,13 @@ CREATE TABLE statistic (id SERIAL,
     sd REAL,
     primary key (other_type, other_id, name));
 
-
 CREATE TABLE mimetype (id INTEGER PRIMARY KEY, mimetype TEXT, extension TEXT);
 
+CREATE TABLE filter (id INTEGER PRIMARY KEY,
+    server_id INTEGER,
+    name TEXT,
+    settings TEXT);
+
 CREATE TABLE IF NOT EXISTS log(id INTEGER PRIMARY KEY,
     who TEXT,
     what TEXT,
@@ -81,4 +82,3 @@ CREATE TABLE IF NOT EXISTS log(id INTEGER PRIMARY KEY,
     how TEXT,
     why TEXT);
 
-commit;

data/examples/config.rb

@@ -28,7 +28,7 @@ server '34D8E57C-3E91-4F24-9BBE-0B53C1827CB4' do
 
     access_log   "/logs/access.log"
     error_log    "/logs/error.log"
-    chroot       "./"
+    chroot       "/var/mongrel2"
     pid_file     "/run/mongrel2.pid"
     default_host "localhost"
     name         "main"
@@ -41,14 +41,19 @@ server '34D8E57C-3E91-4F24-9BBE-0B53C1827CB4' do
 		route '/source', directory( 'examples/', 'README.txt', 'text/plain' )
 
 		# Handlers
-    	route '/hello', handler( 'tcp://127.0.0.1:9999',  'helloworld-handler' ) 
-    	route '/dump', handler( 'tcp://127.0.0.1:9997', 'request-dumper' ) 
+		route '/hello', handler( 'tcp://127.0.0.1:9999',  'helloworld-handler' ) 
+		route '/dump', handler( 'tcp://127.0.0.1:9997', 'request-dumper' ) 
 
 	end
 
+	filter "/usr/local/lib/mongrel2/filters/null.so",
+		extensions: ["*.html", "*.txt"],
+		min_size: 1000
+
 end
 
-setting "zeromq.threads", 2
+setting "zeromq.threads", 1
 
 mkdir_p 'run'
-mkdir_p 'logs'
+mkdir_p 'logs'
+

data/lib/mongrel2.rb

@@ -14,10 +14,10 @@ module Mongrel2
 	abort "\n\n>>> Mongrel2 requires Ruby 1.9.2 or later. <<<\n\n" if RUBY_VERSION < '1.9.2'
 
 	# Library version constant
-	VERSION = '0.9.2'
+	VERSION = '0.10.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: c0a5ad8a50f7 $
+	REVISION = %q$Revision: b3ed6f931afa $
 
 
 	require 'mongrel2/logging'

data/lib/mongrel2/config.rb

@@ -1,7 +1,10 @@
 #!/usr/bin/ruby
 
+require 'yajl'
+require 'yaml'
 require 'pathname'
 require 'uri'
+require 'tnetstring'
 
 require 'sequel'
 
@@ -45,6 +48,9 @@ module Mongrel2
 
 		plugin :validation_helpers
 		plugin :subclasses
+		plugin :json_serializer
+		plugin :serialization
+
 
 		# Configuration defaults
 		DEFAULTS = {
@@ -73,6 +79,12 @@ module Mongrel2
 		end
 
 
+		# Register custom serializer/deserializer type
+		Sequel::Plugins::Serialization.register_format( :tnetstring,
+			TNetstring.method( :dump ),
+			lambda {|raw| TNetstring.parse( raw ).first} )
+
+
 		### Return a bound Method object to the Sequel constructor of choice for the
 		### config DB. This is used to choose either 'amalgalite' or 'sqlite3', preferring
 		### the former.
@@ -124,6 +136,18 @@ module Mongrel2
 		end
 
 
+		### Return a Hash of current settings from the config database. The keys are converted to
+		### Symbols.
+		def self::settings
+			setting_hash = Mongrel2::Config::Setting.to_hash( :key, :value )
+			setting_hash.keys.each do |k|
+				setting_hash[ k.to_sym ] = setting_hash.delete( k )
+			end
+
+			return setting_hash
+		end
+		
+
 		### Return the contents of the configuration schema SQL file.
 		def self::load_config_schema
 			return CONFIG_SQL.read
@@ -182,7 +206,7 @@ module Mongrel2
 	def self::Config( source )
 		unless Sequel::Model::ANONYMOUS_MODEL_CLASSES.key?( source )
 			anonclass = nil
-		 	if source.is_a?( Sequel::Database )
+			if source.is_a?( Sequel::Database )
 				anonclass = Class.new( Mongrel2::Config )
 				anonclass.db = source
 			else
@@ -196,6 +220,7 @@ module Mongrel2
 	end
 
 	require 'mongrel2/config/directory'
+	require 'mongrel2/config/filter'
 	require 'mongrel2/config/handler'
 	require 'mongrel2/config/host'
 	require 'mongrel2/config/proxy'

data/lib/mongrel2/config/dsl.rb

@@ -9,7 +9,7 @@ require 'mongrel2/config' unless defined?( Mongrel2::Config )
 #
 # This is the mongrel2.org config re-expressed in the Ruby DSL:
 #
-#	# the server to run them all 
+#	# the server to run them all
 #	server '2f62bd5-9e59-49cd-993c-3b6013c28f05' do
 #
 #	    access_log   "/logs/access.log"
@@ -20,29 +20,29 @@ require 'mongrel2/config' unless defined?( Mongrel2::Config )
 #	    name         "main"
 #	    port         6767
 #
-#	    # your main host 
+#	    # your main host
 #	    host "mongrel2.org" do
 #
-#	        # a sample of doing some handlers 
+#	        # a sample of doing some handlers
 #	        route '@chat', handler(
-#	            'tcp://127.0.0.1:9999', 
-#	            '54c6755b-9628-40a4-9a2d-cc82a816345e', 
+#	            'tcp://127.0.0.1:9999',
+#	            '54c6755b-9628-40a4-9a2d-cc82a816345e',
 #	            'tcp://127.0.0.1:9998'
-#	        ) 
+#	        )
 #
 #	        route '/handlertest', handler(
-#	            'tcp://127.0.0.1:9997', 
-#	            '34f9ceee-cd52-4b7f-b197-88bf2f0ec378', 
+#	            'tcp://127.0.0.1:9997',
+#	            '34f9ceee-cd52-4b7f-b197-88bf2f0ec378',
 #	            'tcp://127.0.0.1:9996'
-#	        ) 
+#	        )
 #
-#	        # a sample proxy route 
-#	        web_app_proxy = proxy( '127.0.0.1', 8080 ) 
+#	        # a sample proxy route
+#	        web_app_proxy = proxy( '127.0.0.1', 8080 )
 #
 #	        route '/chat/', web_app_proxy
 #	        route '/', web_app_proxy
 #
-#	        # here's a sample directory 
+#	        # here's a sample directory
 #	        test_directory = directory(
 #	            'tests/',
 #	            :index_file => 'index.html',
@@ -53,34 +53,34 @@ require 'mongrel2/config' unless defined?( Mongrel2::Config )
 #	        route '/testsmulti/(.*.json)', test_directory
 #
 #	        chat_demo_dir = directory(
-#	            'examples/chat/static/', 
-#	            :index_file => 'index.html', 
+#	            'examples/chat/static/',
+#	            :index_file => 'index.html',
 #	            :default_ctype => 'text/plain'
 #	        )
 #
 #	        route '/chatdemo/', chat_demo_dir
 #	        route '/static/', chat_demo_dir
 #
-#	        route '/mp3stream', handler( 
-#	            'tcp://127.0.0.1:9995', 
-#	            '53f9f1d1-1116-4751-b6ff-4fbe3e43d142', 
+#	        route '/mp3stream', handler(
+#	            'tcp://127.0.0.1:9995',
+#	            '53f9f1d1-1116-4751-b6ff-4fbe3e43d142',
 #	            'tcp://127.0.0.1:9994'
-#	        ) 
+#	        )
 #	    end
 #
 #	end
 #
 #	settings(
 #	    "zeromq.threads"         => 1,
-#	    "upload.temp_store"      => "/home/zedshaw/projects/mongrel2/tmp/upload.XXXXXX", 
-#	    "upload.temp_store_mode" => "0666" 
+#	    "upload.temp_store"      => "/home/zedshaw/projects/mongrel2/tmp/upload.XXXXXX",
+#	    "upload.temp_store_mode" => "0666"
 #	)
 #
 module Mongrel2::Config::DSL
 
 
 	# A decorator object that provides the DSL-ish interface to the various Config
-	# objects. It derives its interface on the fly from columns of the class it's 
+	# objects. It derives its interface on the fly from columns of the class it's
 	# created with and a DSLMethods mixin if the target class defines one.
 	class Adapter
 		include Mongrel2::Loggable
@@ -144,7 +144,7 @@ module Mongrel2::Config::DSL
 	end # class Adapter
 
 
-	### Create a Mongrel2::Config::Server with the specified +uuid+, evaluate 
+	### Create a Mongrel2::Config::Server with the specified +uuid+, evaluate
 	### the block (if given) within its context, and return it.
 	def server( uuid, &block )
 		Mongrel2::Config.init_database

data/lib/mongrel2/config/filter.rb

@@ -0,0 +1,24 @@
+#!/usr/bin/env ruby
+
+require 'tnetstring'
+
+require 'mongrel2' unless defined?( Mongrel2 )
+require 'mongrel2/config' unless defined?( Mongrel2::Config )
+
+# Mongrel2 Host configuration class
+class Mongrel2::Config::Filter < Mongrel2::Config( :filter )
+
+	### As of Mongrel2/1.7.5:
+	# CREATE TABLE filter (id INTEGER PRIMARY KEY,
+	#     server_id INTEGER,
+	#     name TEXT,
+	#     settings TEXT);
+
+	many_to_one :server
+
+
+	# Serialize the settings column as TNetStrings
+	plugin :serialization, :tnetstring, :settings
+
+end # class Mongrel2::Config::Filter
+

data/lib/mongrel2/config/server.rb

@@ -1,5 +1,8 @@
 #!/usr/bin/env ruby
 
+require 'uri'
+require 'pathname'
+
 require 'mongrel2' unless defined?( Mongrel2 )
 require 'mongrel2/config' unless defined?( Mongrel2::Config )
 
@@ -21,6 +24,8 @@ class Mongrel2::Config::Server < Mongrel2::Config( :server )
 	#     use_ssl INTEGER default 0);
 
 	one_to_many :hosts
+	one_to_many :filters
+
 
 	##
 	# Look up a server by its +uuid+.
@@ -30,6 +35,40 @@ class Mongrel2::Config::Server < Mongrel2::Config( :server )
 	def_dataset_method( :by_uuid ) {|uuid| filter(:uuid => uuid).first }
 
 
+	### Return the URI for its control socket.
+	def control_socket_uri
+		# Find the control socket relative to the server's chroot
+		csock_uri = Mongrel2::Config.settings[:control_port] || DEFAULT_CONTROL_SOCKET
+		Mongrel2.log.debug "Chrooted control socket uri is: %p" % [ csock_uri ]
+
+		scheme, sock_path = csock_uri.split( '://', 2 )
+		Mongrel2.log.debug "  chrooted socket path is: %p" % [ sock_path ]
+
+		csock_path = Pathname( self.chroot ) + sock_path
+		Mongrel2.log.debug "  fully-qualified path is: %p" % [ csock_path ]
+		csock_uri = "%s:/%s" % [ scheme, csock_path ]
+
+		Mongrel2.log.debug "  control socket URI is: %p" % [ csock_uri ]
+		return csock_uri
+	end
+
+
+	### Return the Mongrel2::Control object for the server's control socket.
+	def control_socket
+		return Mongrel2::Control.new( self.control_socket_uri )
+	end
+
+
+	### Return a Pathname for the server's PID file with its chroot directory prepended.
+	def pid_file_path
+		base = Pathname( self.chroot )
+		pidfile = self.pid_file
+		pidfile.slice!( 0, 1 ) if pidfile.start_with?( '/' )
+
+		return base + pidfile
+	end
+
+
 	#
 	# :section: Validation Callbacks
 	#
@@ -41,7 +80,6 @@ class Mongrel2::Config::Server < Mongrel2::Config( :server )
 	end
 
 
-
 	### DSL methods for the Server context besides those automatically-generated from its
 	### columns.
 	module DSLMethods
@@ -58,6 +96,14 @@ class Mongrel2::Config::Server < Mongrel2::Config( :server )
 			self.target.add_host( adapter.target )
 		end
 
+		### Add a Mongrel2::Config::Filter to the Server object with the specified
+		### +path+ (name) and +settings+ hash.
+		def filter( path, settings={} )
+			self.target.save( :validate => false )
+
+			Mongrel2.log.debug "Filter [%s]: %p" % [ path, settings ]
+			self.target.add_filter( name: path, settings: settings )
+		end
 
 	end # module DSLMethods
 

data/lib/mongrel2/constants.rb

@@ -11,6 +11,9 @@ module Mongrel2::Constants
 	# The path to the default Sqlite configuration database
 	DEFAULT_CONFIG_URI = 'config.sqlite'
 
+	# The default URI of the control socket
+	DEFAULT_CONTROL_SOCKET = 'ipc://run/control'
+
 	# Maximum number of identifiers that can be included in a broadcast response
 	MAX_BROADCAST_IDENTS = 100
 

data/lib/mongrel2/httpresponse.rb

@@ -163,19 +163,19 @@ class Mongrel2::HTTPResponse < Mongrel2::Response
 	### one, or using #seek and #tell if it implements those. If neither of those are
 	### possible, an exception is raised.
 	def get_content_length
-		if @body.respond_to?( :bytesize )
-			return @body.bytesize
-		elsif @body.respond_to?( :seek ) && @body.respond_to?( :tell )
-			starting_pos = @body.tell
-			@body.seek( 0, IO::SEEK_END )
-			length = @body.tell - starting_pos
-			@body.seek( starting_pos, IO::SEEK_SET )
+		if self.body.respond_to?( :bytesize )
+			return self.body.bytesize
+		elsif self.body.respond_to?( :seek ) && self.body.respond_to?( :tell )
+			starting_pos = self.body.tell
+			self.body.seek( 0, IO::SEEK_END )
+			length = self.body.tell - starting_pos
+			self.body.seek( starting_pos, IO::SEEK_SET )
 
 			return length
 		else
 			raise Mongrel2::ResponseError,
 				"No way to calculate the content length of the response (a %s)." %
-				[ @body.class.name ]
+				[ self.body.class.name ]
 		end
 	end
 

data/lib/mongrel2/response.rb

@@ -49,8 +49,8 @@ class Mongrel2::Response
 
 	# The body of the response
 	attr_accessor :body
-	# The request that this response is for, if there is one
 
+	# The request that this response is for, if there is one
 	attr_accessor :request
 
 
@@ -75,6 +75,7 @@ class Mongrel2::Response
 		return self.body
 	end
 
+
 	### Returns a string containing a human-readable representation of the Response,
 	### suitable for debugging.
 	def inspect

data/lib/mongrel2/table.rb

@@ -41,6 +41,10 @@ class Mongrel2::Table
 	end
 
 
+	#################################################################
+	###	I N S T A N C E   M E T H O D S
+	#################################################################
+
 	### Create a new Mongrel2::Table using the given +hash+ for initial
 	### values.
 	def initialize( initial_values={} )