mongrel2 0.10.0 → 0.11.0

data/ChangeLog

@@ -1,8 +1,21 @@
+2012-02-10  Michael Granger  <ged@FaerieMUD.org>
+
+	* examples/config.rb, lib/mongrel2/config/dsl.rb:
+	Start work on detailed docs for the config DSL
+	[fd35a1c88881] [tip]
+
 2012-02-06  Michael Granger  <ged@FaerieMUD.org>
 
+	* .rvm.gems, .rvmrc, .tm_properties, bin/m2sh.rb, examples/config.rb,
+	lib/mongrel2/config.rb, lib/mongrel2/config/dsl.rb,
+	lib/mongrel2/config/server.rb, spec/mongrel2/config/dsl_spec.rb,
+	spec/mongrel2/config_spec.rb:
+	Make the DSL declarations destructive.
+	[8c065a2dcebc]
+
 	* .hgtags:
 	Added tag v0.10.0 for changeset 1e9885cbcafd
-	[d3f06f6344ad] [tip]
+	[d3f06f6344ad]
 
 	* .hgsigs:
 	Added signature for changeset 948877fd6c9d
@@ -29,7 +42,7 @@
 	spec/mongrel2/config/filter_spec.rb,
 	spec/mongrel2/config/route_spec.rb:
 	Updating config database schema/classes for Mongrel 1.8.
-	[6d2608b23873] [github/master]
+	[6d2608b23873]
 
 	* examples/config.rb:
 	Move the example server back to port 8113

data/DSL.rdoc

@@ -0,0 +1,300 @@
+= The Mongrel2 Config DSL
+
+The Mongrel2::Config::DSL module is a mixin that will add functions to your
+namespace that can create and replace configuration items in the current
+Mongrel2 config database.
+
+If you're creating a config that will be run standalone, you'll need to
+point the config classes to the right database before using the DSL:
+
+    #!/usr/bin/env ruby
+
+    require 'mongrel2'
+    require 'mongrel2/config'
+    require 'mongrel2/config/dsl'
+
+    Mongrel2::Config.configure( configdb: 'myconfig.sqlite' )
+    include Mongrel2::Config::DSL
+
+    server 'myserver' do
+        # ...
+    end
+
+If you're creating a config to be loaded via m2sh.rb, you don't need any of
+that, as m2sh.rb provides its own prelude before loading the config.
+
+== DSL Syntax
+
+There is basically one directive for each configuration item, and the layout follows the basic structure described in the {Mongrel2 manual}[http://mongrel2.org/static/book-finalch4.html#x6-260003.4].
+
+
+=== server
+
+    server <uuid> { <server config block> }
+
+This creates or replaces the server associated with the specified +uuid+. The
+<tt>server config block</tt> has directives for each of the server attributes,
+each of which corresponds to one of the columns in the configuration database's
++server+ table (descriptions largely borrowed from the
+manual[http://mongrel2.org/static/book-finalch4.html#x6-270003.4.1]):
+
+[chroot +directory+]   The directory that Mongrel2 should chroot to at startup.
+                       Defaults to <tt>/var/www</tt>.
+[access_log +path+]    The path to the access log file relative to the +chroot+.
+                       Usually starts with a ‘/’. Defaults to
+                       <tt>/logs/access.log</tt>.
+[error_log +path+]     The error log file, just like +access_log+. Defaults to
+                       <tt>/logs/error.log</tt>.
+[pid_file +path+]      The path to the PID file, relative to the +chroot+.
+                       Defaults to <tt>/run/mongrel2.pid</tt>.
+[default_host +name+]  Which +host+ in the server to use as the default if
+                       the +Host+ header doesn't match any host's +matching+
+                       attribute. Defaults to <tt>localhost</tt>.
+[bind_addr +ipaddr+]   The IP address to bind to; default is <tt>0.0.0.0</tt>.
+[port +int+]           The port the server should listen on for new connections;
+                       defaults to <tt>8888</tt>.
+
+The server will be saved immediately upon exiting the block, and will return the
+saved Mongrel2::Config::Server object.
+
+
+=== host
+
+    host <name> { <host config block> }
+
+This creates or replaces the named Host within a +server+ block. Inside the
+<tt>host config block</tt>, there are directives for further configuring the
+Host, adding Routes, and setting up Handler, Proxy, and Directory targets
+for Routes.
+
+[matching +pattern+]     This is a pattern that’s used to match incoming
+                         <tt>Host</tt> headers for routing purposes.
+[maintenance +boolean+]  This is a (currently unused) setting that will display
+                         a "down for maintenance" page.
+
+The rest of the block will likely be concerned with setting up the routes for
+the host using the +route+, +handler+, +directory+, and +proxy+ directives, e.g.:
+
+    host 'main' do
+      matching 'example.com'
+      maintenance false
+
+      # Hello world application
+      route '/hello', handler('tcp://127.0.0.1:9999', 'helloworld-handler')
+      # Contact form handler
+      route '/contact', handler('tcp://127.0.0.1:9995', 'contact-form')
+
+      # reverse proxy for a non-mongrel application listening on 8080
+      route '/api', proxy('127.0.0.1', 8080)
+    end
+    # => #<Mongrel2::Config::Host ...>
+
+Since the block is just a Ruby block, and each directive returns the configured
+object, you can use conditionals, assign targets to variables to be reused later,
+etc:
+
+    require 'socket'
+
+    host 'test' do
+      matching 'testing.example.com'
+
+      # Decide which address to listen to, and which app to use based on which
+      # host the config is running on.
+      testhandler =
+        if Socket.gethostname.include?( 'example.com' )
+          handler 'tcp://0.0.0.0:31218', 'ci-builder'
+        else
+          handler 'tcp://127.0.0.1', 'unittest-builder'
+        end
+
+      route '', testhandler
+    end
+
+=== route
+
+    route <pattern>, <target>, [<opts>]
+
+Create a route in the current host that will match the given +pattern+ and
+pass the request to the specified +target+, which should be a Handler, a
+Directory, or a Proxy.
+
+The only current option is +reversed+, which (if +true+) means that the pattern
+is bound to the end rather than the beginning of the path.
+
+It returns the configured Route object.
+
+    route '/demo', handler('tcp://localhost:9400', 'demo-handler')
+    # => #<Mongrel2::Config::Route ...>
+    route '.css', directory('/public/css', 'base.css', 'text/css'), reverse: true
+
+    # Use the same image-factory handler for each image type
+    image_handler = handler('tcp://localhost:9300', 'image-factory')
+    route '.jpg', image_handler, reverse: true
+    route '.gif', image_handler, reverse: true
+    route '.png', image_handler, reverse: true
+    route '.ico', image_handler, reverse: true
+
+=== handler
+
+    handler <send_spec>, <send_ident>, [<recv_spec>[, <recv_ident>]], [<options>]
+
+Create a Handler that will send and receive on +send_spec+ and +recv_spec+ 0mq
+sockets, respectively. The application's +send_ident+ is an identifier (usually
+a UUID) that will be used to register the send socket so messages persist
+through crashes.
+
+If no +recv_spec+ is given, the port immediately below the +send_spec+ is used.
+
+The +recv_ident+ is another UUID if you want the receive socket to subscribe to
+its messages. Handlers properly mention the send_ident on all returned
+messages, so you should either set this to nothing and don’t subscribe, or set
+it to the same as +send_ident+.
+
+Valid +options+ for Handlers are:
+
+[raw_payload +boolean+]  ?
+[protocol +name+]        The protocol used to communicate with the handler. Should
+                         be either 'tnetstring' or 'json' (the default).
+
+As with the other directives, +handler+ returns the newly-saved Handler object.
+This means that you can either assign it to a variable for later inclusion in
+one or more Route declarations, or you can define it in the <tt>route</tt> itself:
+
+    route '/gravatar/:email', handler('tcp://localhost:1480', 'gravatar-service')
+    # => #<Mongrel2::Config::Route ...>
+
+See the documentation for @route@ for more examples of this.
+
+
+=== directory
+
+    directory <base>, [<index_file>[, <default_ctype>[, <options>]]]
+
+Create a Dir target for a route that will serve static content from the
+specified +base+ directory. Returns the saved Dir object.
+
+There aren't currently any supported +options+, but the Mongrel2 manual
+says that "eventually you’ll be able to tweak more and more of the
+settings to control how Dirs work."
+
+
+=== proxy
+
+    proxy <addr>[, <port>]
+
+Create a Proxy target for a route that will proxy another server listening
+on the given +addr+ and +port+. If not specified, +port+ defaults to
+<tt>80</tt>. Returns the saved Proxy object.
+
+
+=== filter
+
+    filter <path>[, <settings>]
+
+Set up a Filter[http://mongrel2.org/static/book-finalch6.html#x8-840005.8]
+for the containing Server by loading the object from the specified +path+
+and passing it the specified +options+ as a
+TNetstring[http://tnetstrings.org/].
+
+
+=== setting/settings
+
+    setting <name>, <value>
+    settings <name1> => <value1>[, <name2> => <value2>, ...]
+
+Set one or more of Mongrel2's internal settings. See the
+{tweakable expert settings section}[http://mongrel2.org/static/book-finalch4.html#x6-410003.10]
+of the manual for valid values and more details on what these do.
+
+An example (from the manual):
+
+    settings "zeromq.threads" => 1,
+        "upload.temp_store" => "/home/zedshaw/projects/mongrel2/tmp/upload.XXXXXX",
+        "upload.temp_store_mode" => "0666"
+    # => [ #<Mongrel2::Config::Setting ...>, #<Mongrel2::Config::Setting ...>, ... ]
+
+=== mimetype/mimetypes
+
+    mimetype <extension>, <mimetype>
+    mimetypes <extension1> => <mimetype1>[, <extension2> => <mimetype2>]
+
+Map one or more file +extension+s to a +mimetype+.
+
+An example:
+
+    mimetypes '.ttf' => 'application/x-font-truetype',
+              '.otf' => 'application/x-font-opentype'
+    # => [#<Mongrel2::Config::Mimetype ...>, ... ]
+
+
+== Example
+
+This is the mongrel2.org config re-expressed in the Ruby DSL:
+
+    # the server to run them all
+    server '2f62bd5-9e59-49cd-993c-3b6013c28f05' do
+
+        access_log   "/logs/access.log"
+        error_log    "/logs/error.log"
+        chroot       "./"
+        pid_file     "/run/mongrel2.pid"
+        default_host "mongrel2.org"
+        name         "main"
+        port         6767
+
+        # your main host
+        host "mongrel2.org" do
+
+            # 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:9998'
+            )
+
+            route '/handlertest', handler(
+                '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 )
+
+            route '/chat/', web_app_proxy
+            route '/', web_app_proxy
+
+            # here's a sample directory
+            test_directory = directory(
+                'tests/',
+                :index_file => 'index.html',
+                :default_ctype => 'text/plain'
+            )
+
+            route '/tests/', test_directory
+            route '/testsmulti/(.*.json)', test_directory
+
+            chat_demo_dir = directory(
+                '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',
+                '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"
+    )
+

data/History.rdoc

@@ -1,3 +1,11 @@
+== v0.11.0 [2012-02-15] Michael Granger <ged@FaerieMUD.org>
+
+- Make the DSL declarations replace existing records.
+- Flesh out the documentation for the DSL
+- Provide convenience methods for resetting an HTTP request's
+  Content-type and Content-encoding headers.
+
+
 == v0.10.0 [2012-02-06] Michael Granger <ged@FaerieMUD.org>
 
 This release includes updates for Mongrel 1.8 and finishes up the m2sh.rb tool.

data/Manifest.txt

@@ -1,6 +1,7 @@
 .autotest
 .gemtest
 ChangeLog
+DSL.rdoc
 History.rdoc
 Manifest.txt
 README.rdoc

data/Rakefile

@@ -20,7 +20,7 @@ Hoe.plugins.delete :rubyforge
 hoespec = Hoe.spec 'mongrel2' do
 	self.readme_file = 'README.rdoc'
 	self.history_file = 'History.rdoc'
-	self.extra_rdoc_files << 'README.rdoc' << 'History.rdoc'
+	self.extra_rdoc_files = Rake::FileList[ '*.rdoc' ]
 	self.spec_extras[:rdoc_options] = ['-t', 'Ruby-Mongrel2']
 
 	self.developer 'Michael Granger', 'ged@FaerieMUD.org'

data/bin/m2sh.rb

@@ -293,7 +293,7 @@ class Mongrel2::M2SHCommand
 
 		header "Loading config from #{configfile}"
 		source = File.read( configfile )
-		Mongrel2::Config.init_database!
+
 		runspace.module_eval( source, configfile, 0 )
 	end
 	help :load, "Overwrite the config database with the values from the speciifed CONFIGFILE."
@@ -406,7 +406,7 @@ class Mongrel2::M2SHCommand
 	def servers_command( * )
 		header 'SERVERS:'
 		Mongrel2::Config.servers.each do |server|
-			message "%s  [%s]: %s" % [
+			message "%s [%s]: %s" % [
 				self.prompt.color( server.name, :key ),
 				server.default_host,
 				server.uuid,

data/examples/config.rb

@@ -1,52 +1,37 @@
 #!/usr/bin/env ruby
 
-# The Mongrel config used by the examples. 
+# The Mongrel config used by the examples. Load it with:
+#
+#   m2sh.rb -c examples.sqlite load examples/config.rb
+#
 
-BEGIN {
-	require 'pathname'
-	basedir = Pathname( __FILE__ ).dirname.parent
-	libdir = basedir + 'lib'
-
-	$LOAD_PATH.unshift( libdir.to_s )
-}
-
-require 'rubygems'
-require 'fileutils'
-require 'mongrel2'
-require 'mongrel2/config'
-
-include FileUtils::Verbose
-
-Mongrel2.log.level = Logger::INFO
-Mongrel2::Config.configure( :configdb => 'examples.sqlite' )
-include Mongrel2::Config::DSL
+# samples server
+server '34D8E57C-3E91-4F24-9BBE-0B53C1827CB4' do
 
-Mongrel2::Config.init_database!
+	name         'main'
+	default_host 'www.example.com'
 
-# the server to run them all 
-server '34D8E57C-3E91-4F24-9BBE-0B53C1827CB4' do
+	access_log   '/logs/access.log'
+	error_log    '/logs/error.log'
+	chroot       '/var/mongrel2'
+	pid_file     '/run/mongrel2.pid'
 
-    access_log   "/logs/access.log"
-    error_log    "/logs/error.log"
-    chroot       "/var/mongrel2"
-    pid_file     "/run/mongrel2.pid"
-    default_host "localhost"
-    name         "main"
-    port         8113
+	bind_addr    '0.0.0.0'
+	port         8113
 
-	# your main host 
-	host "localhost" do
+	# your main host
+	host 'www.example.com' do
 
 		route '/', directory( 'data/mongrel2/', 'bootstrap.html', 'text/html' )
 		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",
+	filter '/usr/local/lib/mongrel2/filters/null.so',
 		extensions: ["*.html", "*.txt"],
 		min_size: 1000
 
@@ -54,6 +39,3 @@ end
 
 setting "zeromq.threads", 1
 
-mkdir_p 'run'
-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.10.0'
+	VERSION = '0.11.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: b3ed6f931afa $
+	REVISION = %q$Revision: 5d438ea6037a $
 
 
 	require 'mongrel2/logging'

data/lib/mongrel2/config.rb

@@ -146,7 +146,7 @@ module Mongrel2
 
 			return setting_hash
 		end
-		
+
 
 		### Return the contents of the configuration schema SQL file.
 		def self::load_config_schema

data/lib/mongrel2/config/dsl.rb

@@ -3,79 +3,7 @@
 require 'mongrel2' unless defined?( Mongrel2 )
 require 'mongrel2/config' unless defined?( Mongrel2::Config )
 
-# Mongrel2 configuration DSL mixin
-#
-# == Example
-#
-# This is the mongrel2.org config re-expressed in the Ruby DSL:
-#
-#	# the server to run them all
-#	server '2f62bd5-9e59-49cd-993c-3b6013c28f05' do
-#
-#	    access_log   "/logs/access.log"
-#	    error_log    "/logs/error.log"
-#	    chroot       "./"
-#	    pid_file     "/run/mongrel2.pid"
-#	    default_host "mongrel2.org"
-#	    name         "main"
-#	    port         6767
-#
-#	    # your main host
-#	    host "mongrel2.org" do
-#
-#	        # 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:9998'
-#	        )
-#
-#	        route '/handlertest', handler(
-#	            '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 )
-#
-#	        route '/chat/', web_app_proxy
-#	        route '/', web_app_proxy
-#
-#	        # here's a sample directory
-#	        test_directory = directory(
-#	            'tests/',
-#	            :index_file => 'index.html',
-#	            :default_ctype => 'text/plain'
-#	        )
-#
-#	        route '/tests/', test_directory
-#	        route '/testsmulti/(.*.json)', test_directory
-#
-#	        chat_demo_dir = directory(
-#	            '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',
-#	            '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"
-#	)
-#
+# See DSL.rdoc for details on how to use this mixin.
 module Mongrel2::Config::DSL
 
 
@@ -85,10 +13,19 @@ module Mongrel2::Config::DSL
 	class Adapter
 		include Mongrel2::Loggable
 
-		### Adapt the specified +target+ to use a declarative interface.
+		### Create an instance of the specified +targetclass+ using the specified +opts+
+		### as initial values. The first pair of +opts+ will be used in the filter to
+		### find any previous instance and delete it.
 		def initialize( targetclass, opts={} )
 			self.log.debug "Wrapping a %p" % [ targetclass ]
 			@targetclass = targetclass
+
+			# Use the first pair as the primary key
+			unless opts.empty?
+				first_pair = Hash[ *opts.first ]
+				@targetclass.filter( first_pair ).destroy
+			end
+
 			@target = @targetclass.new( opts )
 			self.decorate_with_column_declaratives( @target )
 			self.decorate_with_custom_declaratives( @targetclass )
@@ -147,11 +84,32 @@ module Mongrel2::Config::DSL
 	### 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
+		adapter = nil
+
+		Mongrel2.log.info "Entering transaction for server %p" % [ uuid ]
+		Mongrel2::Config.db.transaction do
+			Mongrel2.log.info "  ensuring db is set up..."
+			Mongrel2::Config.init_database
+
+			# Set up the options hash with the UUID and reasonable defaults
+			# for everything else
+			server_opts = {
+				uuid:         uuid,
+			    access_log:   "/logs/access.log",
+			    error_log:    "/logs/error.log",
+			    pid_file:     "/run/mongrel2.pid",
+			    default_host: "localhost",
+			    port:         8888,
+			}
+
+			Mongrel2.log.debug "Server [%s] (block: %p)" % [ uuid, block ]
+			adapter = Adapter.new( Mongrel2::Config::Server, server_opts )
+			adapter.instance_eval( &block ) if block
+
+			Mongrel2.log.info "  saving server %p..." % [ uuid ]
+			adapter.target.save
+		end
 
-		Mongrel2.log.debug "Server [%s] (block: %p)" % [ uuid, block ]
-		adapter = Adapter.new( Mongrel2::Config::Server, :uuid => uuid )
-		adapter.instance_eval( &block ) if block
 		return adapter.target
 	end
 
@@ -159,7 +117,9 @@ module Mongrel2::Config::DSL
 	### Set the value of one of the 'Tweakable Expert Settings'
 	def setting( key, val )
 		Mongrel2::Config.init_database
-		return Mongrel2::Config::Setting.create( :key => key, :value => val )
+		setting = Mongrel2::Config::Setting.find_or_create( key: key )
+		setting.value = val
+		setting.save
 	end
 
 
@@ -181,7 +141,7 @@ module Mongrel2::Config::DSL
 	def mimetype( extension, mimetype )
 		Mongrel2::Config.init_database
 
-		type = Mongrel2::Config::Mimetype.find_or_create( :extension => extension )
+		type = Mongrel2::Config::Mimetype.find_or_create( extension: extension )
 		type.mimetype = mimetype
 		type.save
 

data/lib/mongrel2/config/server.rb

@@ -90,12 +90,13 @@ class Mongrel2::Config::Server < Mongrel2::Config( :server )
 			self.target.save( :validate => false )
 
 			Mongrel2.log.debug "Host [%s] (block: %p)" % [ name, block ]
-			adapter = Mongrel2::Config::DSL::Adapter.new( Mongrel2::Config::Host,
-				:name => name, :matching => name )
+			adapter = Mongrel2::Config::DSL::Adapter.new( Mongrel2::Config::Host, name: name )
+			adapter.target.matching = name
 			adapter.instance_eval( &block ) if block
 			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={} )

data/lib/mongrel2/httprequest.rb

@@ -60,12 +60,24 @@ class Mongrel2::HTTPRequest < Mongrel2::Request
 	end
 
 
+	### Set the current request's Content-Type.
+	def content_type=( type )
+		return self.headers.content_type = type
+	end
+
+
 	### Fetch the encoding type of the request's content, as set in its header.
 	def content_encoding
 		return self.headers.content_encoding
 	end
 
 
+	### Set the request's encoding type.
+	def content_encoding=( type )
+		return self.headers.content_encoding = type
+	end
+
+
 
 	#########
 	protected

data/spec/mongrel2/config/dsl_spec.rb

@@ -31,6 +31,13 @@ describe Mongrel2::Config::DSL do
 		setup_config_db()
 	end
 
+	before( :each ) do
+		Mongrel2::Config::Server.truncate
+		Mongrel2::Config::Host.truncate
+		Mongrel2::Config::Route.truncate
+		Mongrel2::Config::Filter.truncate
+	end
+
 	after( :all ) do
 		reset_logging()
 	end
@@ -161,6 +168,14 @@ describe Mongrel2::Config::DSL do
 
 	describe 'settings' do
 
+		before( :all ) do
+			@ids = Mongrel2::Config::Setting.map( :id )
+		end
+
+		after( :each ) do
+			Mongrel2::Config::Setting.dataset.filter( ~:id => @ids ).delete
+		end
+
 		it "can set the expert tweakable settings en masse" do
 			result = settings(
 				"zeromq.threads"         => 8,

data/spec/mongrel2/config_spec.rb

@@ -54,7 +54,8 @@ describe Mongrel2::Config do
 
 	it "has a convenience method for fetching an Array of all of its configured servers" do
 		Mongrel2::Config.init_database
-		Mongrel2::Config::Server.dataset.truncate
+		Mongrel2::Config::Server.truncate
+
 		s = Mongrel2::Config::Server.create(
 			uuid: TEST_UUID,
 			access_log: '/log/access.log',

data/spec/mongrel2/httprequest_spec.rb

@@ -97,10 +97,20 @@ describe Mongrel2::HTTPRequest do
 			@req.content_type.should == 'application/x-pdf'
 		end
 
+		it "provides a convenience method for resetting the 'Content-type' header" do
+			@req.content_type = 'application/json'
+			@req.content_type.should == 'application/json'
+		end
+
 		it "provides a convenience method for fetching the 'Content-encoding' header" do
 			@req.content_encoding.should == 'gzip'
 		end
 
+		it "provides a convenience method for resetting the 'Content-encoding' header" do
+			@req.content_encoding = 'identity'
+			@req.content_encoding.should == 'identity'
+		end
+
 	end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongrel2
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
   prerelease: 
 platform: ruby
 authors:
@@ -48,11 +48,11 @@ cert_chain:
   -----END CERTIFICATE-----
 
 '
-date: 2012-02-06 00:00:00.000000000 Z
+date: 2012-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70339771539100 !ruby/object:Gem::Requirement
+  requirement: &70337700771620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -60,10 +60,10 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70339771539100
+  version_requirements: *70337700771620
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &70339771538660 !ruby/object:Gem::Requirement
+  requirement: &70337700771160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -71,10 +71,10 @@ dependencies:
         version: '3.31'
   type: :runtime
   prerelease: false
-  version_requirements: *70339771538660
+  version_requirements: *70337700771160
 - !ruby/object:Gem::Dependency
   name: amalgalite
-  requirement: &70339771538220 !ruby/object:Gem::Requirement
+  requirement: &70337700770600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -82,10 +82,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70339771538220
+  version_requirements: *70337700770600
 - !ruby/object:Gem::Dependency
   name: tnetstring
-  requirement: &70339771537780 !ruby/object:Gem::Requirement
+  requirement: &70337700770060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -93,10 +93,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70339771537780
+  version_requirements: *70337700770060
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70339771537340 !ruby/object:Gem::Requirement
+  requirement: &70337700769520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -104,10 +104,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70339771537340
+  version_requirements: *70337700769520
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70339771536880 !ruby/object:Gem::Requirement
+  requirement: &70337700769020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -115,10 +115,10 @@ dependencies:
         version: '1.16'
   type: :runtime
   prerelease: false
-  version_requirements: *70339771536880
+  version_requirements: *70337700769020
 - !ruby/object:Gem::Dependency
   name: sysexits
-  requirement: &70339771536400 !ruby/object:Gem::Requirement
+  requirement: &70337700768500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -126,10 +126,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70339771536400
+  version_requirements: *70337700768500
 - !ruby/object:Gem::Dependency
   name: zmq
-  requirement: &70339771535960 !ruby/object:Gem::Requirement
+  requirement: &70337700767980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -137,10 +137,10 @@ dependencies:
         version: 2.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70339771535960
+  version_requirements: *70337700767980
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
-  requirement: &70339771535500 !ruby/object:Gem::Requirement
+  requirement: &70337700767500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -148,10 +148,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *70339771535500
+  version_requirements: *70337700767500
 - !ruby/object:Gem::Dependency
   name: hoe-highline
-  requirement: &70339771535040 !ruby/object:Gem::Requirement
+  requirement: &70337700766940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -159,10 +159,10 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *70339771535040
+  version_requirements: *70337700766940
 - !ruby/object:Gem::Dependency
   name: configurability
-  requirement: &70339771534580 !ruby/object:Gem::Requirement
+  requirement: &70337700766400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -170,10 +170,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70339771534580
+  version_requirements: *70337700766400
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70339771534040 !ruby/object:Gem::Requirement
+  requirement: &70337700765860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -181,29 +181,29 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70339771534040
+  version_requirements: *70337700765860
 - !ruby/object:Gem::Dependency
-  name: hoe
-  requirement: &70339771533600 !ruby/object:Gem::Requirement
+  name: rdoc
+  requirement: &70337700765360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *70339771533600
+  version_requirements: *70337700765360
 - !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: &70339771667280 !ruby/object:Gem::Requirement
+  name: hoe
+  requirement: &70337700764820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: *70339771667280
+  version_requirements: *70337700764820
 description: ! "Ruby-Mongrel2 is a complete Ruby (1.9-only) connector for \nMongrel2[http://mongrel2.org/].\n\nThis
   library includes configuration-database ORM classes, a Ruby\nimplementation of the
   'm2sh' tool, a configuration DSL for generating config\ndatabases in pure Ruby,
@@ -227,12 +227,14 @@ extensions: []
 extra_rdoc_files:
 - Manifest.txt
 - examples/README.txt
-- README.rdoc
+- DSL.rdoc
 - History.rdoc
+- README.rdoc
 files:
 - .autotest
 - .gemtest
 - ChangeLog
+- DSL.rdoc
 - History.rdoc
 - Manifest.txt
 - README.rdoc
@@ -327,7 +329,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mongrel2
-rubygems_version: 1.8.14
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Ruby-Mongrel2 is a complete Ruby (1.9-only) connector for  Mongrel2[http://mongrel2.org/]