mongrel2 0.38.0 → 0.39.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5bdea37b7c56e0c93406a5653f43c7f567c5037
-  data.tar.gz: ed56dd644330b5f948426f9255e9210647299735
+  metadata.gz: 9a891b9b342ed29169b81e8d5db135f3cd4d9e1b
+  data.tar.gz: 9467b6614c8df8892d0a6c027dfec33be3824843
 SHA512:
-  metadata.gz: e47dfa343b471dd317ca448de04be667702d9d54321128478368487ea9b6e08d20bc8e02c4066237bdb32e6d6732c804bae4a0ec5e252bba23b4ff668e445ae8
-  data.tar.gz: 185e0c1e5d8d02a031365216baa1d5cdcfdfa5b48cea64f4f23aa56c460e0c724c8b9d4da6ab49399639f80666ac25200eb6cb3939efb2efb53f034fe0e9975c
+  metadata.gz: 52c633d2fba86266d991f5f7d6cabd735b303406b6f3c96ae734f47a2dfc77e3b45a435a35de6a7abecea03ece007e2ae64e9040c9eff34b58bb60bbb27340a7
+  data.tar.gz: 943c432e477cccb2cde8feac08dd7f8574ee39961830f7f9f465d9b20c83f473e1b2b310854cb3ad7133da5ac1e2e139f12acc111c3a33a9d6a1a112e0eb1f9a

data/History.rdoc

@@ -1,3 +1,9 @@
+== v0.39.0 [2013-09-25] Michael Granger <ged@FaerieMUD.org>
+
+- Replace stagnant zmq library with rbczmq.
+- Add config support for 1.8.1's "X-Requests"
+
+
 == v0.38.0 [2013-09-18] Michael Granger <ged@FaerieMUD.org>
 
 - Update dependencies, add Gemfile.

data/Manifest.txt

@@ -38,6 +38,7 @@ lib/mongrel2/config/route.rb
 lib/mongrel2/config/server.rb
 lib/mongrel2/config/setting.rb
 lib/mongrel2/config/statistic.rb
+lib/mongrel2/config/xrequest.rb
 lib/mongrel2/connection.rb
 lib/mongrel2/constants.rb
 lib/mongrel2/control.rb
@@ -52,9 +53,9 @@ lib/mongrel2/table.rb
 lib/mongrel2/testing.rb
 lib/mongrel2/websocket.rb
 lib/mongrel2/xmlrequest.rb
-spec/lib/constants.rb
-spec/lib/helpers.rb
-spec/lib/matchers.rb
+spec/constants.rb
+spec/helpers.rb
+spec/matchers.rb
 spec/mongrel2/config/directory_spec.rb
 spec/mongrel2/config/dsl_spec.rb
 spec/mongrel2/config/filter_spec.rb
@@ -66,6 +67,7 @@ spec/mongrel2/config/route_spec.rb
 spec/mongrel2/config/server_spec.rb
 spec/mongrel2/config/setting_spec.rb
 spec/mongrel2/config/statistic_spec.rb
+spec/mongrel2/config/xrequest_spec.rb
 spec/mongrel2/config_spec.rb
 spec/mongrel2/connection_spec.rb
 spec/mongrel2/constants_spec.rb

data/Rakefile

@@ -28,12 +28,12 @@ hoespec = Hoe.spec 'mongrel2' do
 	self.developer 'Michael Granger', 'ged@FaerieMUD.org'
 
 	self.dependency 'nokogiri',   '~> 1.5'
-	self.dependency 'sequel',     '~> 3.44'
+	self.dependency 'sequel',     '~> 4.2'
 	self.dependency 'tnetstring', '~> 0.3'
 	self.dependency 'yajl-ruby',  '~> 1.0'
 	self.dependency 'trollop',    '~> 2.0'
 	self.dependency 'sysexits',   '~> 1.1'
-	self.dependency 'zmq',        '~> 2.1'
+	self.dependency 'rbczmq',     '~> 1.7'
 	self.dependency 'loggability','~> 0.5'
 	self.dependency 'sqlite3',    '~> 1.3'
 

data/data/mongrel2/config.sql

@@ -72,12 +72,17 @@ 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 mimetype (id INTEGER PRIMARY KEY, mimetype TEXT, extension TEXT);
+CREATE TABLE xrequest (id INTEGER PRIMARY KEY,
+    server_id INTEGER,
+    name TEXT,
+    settings TEXT);
 
 CREATE TABLE IF NOT EXISTS log(id INTEGER PRIMARY KEY,
     who TEXT,

data/lib/mongrel2.rb

@@ -1,6 +1,9 @@
 # -*- ruby -*-
 #encoding: utf-8
 
+# Ensure this is used instead of 'zmq' if it's also installed
+gem 'rbczmq'
+
 require 'loggability'
 require 'zmq'
 
@@ -22,10 +25,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.38.0'
+	VERSION = '0.39.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 0ea16429b0cf $
+	REVISION = %q$Revision: 36202f7a03c9 $
 
 
 	require 'mongrel2/constants'

data/lib/mongrel2/config.rb

@@ -267,6 +267,7 @@ module Mongrel2
 	require 'mongrel2/config/mimetype'
 	require 'mongrel2/config/log'
 	require 'mongrel2/config/statistic'
+	require 'mongrel2/config/xrequest'
 
 	require 'mongrel2/config/dsl'
 

data/lib/mongrel2/config/server.rb

@@ -46,6 +46,11 @@ class Mongrel2::Config::Server < Mongrel2::Config( :server )
 	# The filters[rdoc-ref:Mongrel2::Config::Filter] that will be loaded by this server.
 	one_to_many :filters
 
+	##
+	# The xrequest handlers[rdoc-ref:Mongrel2::Config::XRequest] that will be loaded by this server.
+	one_to_many :xrequests,
+		:class => 'Mongrel2::Config::XRequest'
+
 
 	##
 	# :method: uuid
@@ -207,6 +212,16 @@ class Mongrel2::Config::Server < Mongrel2::Config( :server )
 			self.target.add_filter( name: path, settings: settings )
 		end
 
+
+		### Add a Mongrel2::Config::XRequest to the Server object with the specified
+		### +path+ (name) and +settings+ hash.
+		def xrequest( path, settings={} )
+			self.target.save( :validate => false )
+
+			self.log.debug "XRequest [%s]: %p" % [ path, settings ]
+			self.target.add_xrequest( name: path, settings: settings )
+		end
+
 	end # module DSLMethods
 
 end # class Mongrel2::Config::Server

data/lib/mongrel2/config/xrequest.rb

@@ -0,0 +1,45 @@
+#!/usr/bin/env ruby
+
+require 'tnetstring'
+
+require 'mongrel2' unless defined?( Mongrel2 )
+require 'mongrel2/config' unless defined?( Mongrel2::Config )
+
+# Mongrel2 X-Request configuration class
+#
+#   # Using the config DSL:
+#   xrequest '/usr/local/lib/mongrel2/filters/watermark.so',
+#       extensions: ['*.jpg', '*.png'],
+#       src: '/usr/local/var/image/acme.png'
+#
+#   # Which is the same as:
+#   Mongrel2::Config::XRequest.create(
+#       name: '/usr/local/lib/mongrel2/filters/sendfile.so',
+#       settings: {
+#         min_size: 1000
+#       }
+#
+#   # Or:
+#   server.add_xrequest(
+#       name: '/usr/local/lib/mongrel2/filters/sendfile.so',
+#       settings: {
+#         min_size: 1000
+#       })
+#
+class Mongrel2::Config::XRequest < Mongrel2::Config( :xrequest )
+
+	### As of Mongrel2/1.8.1:
+	# CREATE TABLE xrequest (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::XRequest
+

data/lib/mongrel2/connection.rb

@@ -70,14 +70,13 @@ class Mongrel2::Connection
 		self.log.debug "0mq Context is: %p" % [ ctx ]
 
 		self.log.info "Connecting PULL request socket (%s)" % [ self.sub_addr ]
-		@request_sock = ctx.socket( ZMQ::PULL )
-		@request_sock.setsockopt( ZMQ::LINGER, 0 )
+		@request_sock = ctx.socket( :PULL )
+		@request_sock.linger = 0
 		@request_sock.connect( self.sub_addr )
 
 		self.log.info "Connecting PUB response socket (%s)" % [ self.pub_addr ]
-		@response_sock = ctx.socket( ZMQ::PUB )
-		@response_sock.setsockopt( ZMQ::IDENTITY, self.identifier )
-		@response_sock.setsockopt( ZMQ::LINGER, 0 )
+		@response_sock = ctx.socket( :PUB )
+		@response_sock.linger = 0
 		@response_sock.connect( self.pub_addr )
 	end
 

data/lib/mongrel2/control.rb

@@ -28,8 +28,8 @@ class Mongrel2::Control
 	def initialize( port=DEFAULT_PORT )
 		check_port( port )
 		@ctx = Mongrel2.zmq_context
-		@socket = @ctx.socket( ZMQ::REQ )
-		@socket.setsockopt( ZMQ::LINGER, 0 )
+		@socket = @ctx.socket( :REQ )
+		@socket.linger = 0
 		@socket.connect( port.to_s )
 	end
 

data/lib/mongrel2/handler.rb

@@ -156,7 +156,7 @@ class Mongrel2::Handler
 		self.restore_signal_handlers
 		self.log.info "Done: %p" % [ self ]
 		@conn.close
-		Mongrel2.zmq_context.close
+		Mongrel2.zmq_context.close if Mongrel2.zmq_context.respond_to?( :close )
 	end
 
 

data/spec/{lib/constants.rb → constants.rb}

@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 
 require 'uri'
-require 'yajl'
-require 'tnetstring'
 
 require 'mongrel2' unless defined?( Mongrel2 )
 

data/spec/{lib/helpers.rb → helpers.rb}

@@ -1,15 +1,8 @@
 #!/usr/bin/ruby
 # coding: utf-8
 
-BEGIN {
-	require 'pathname'
-	basedir = Pathname.new( __FILE__ ).dirname.parent
-
-	libdir = basedir + "lib"
-
-	$LOAD_PATH.unshift( basedir.to_s ) unless $LOAD_PATH.include?( basedir.to_s )
-	$LOAD_PATH.unshift( libdir.to_s ) unless $LOAD_PATH.include?( libdir.to_s )
-}
+require_relative 'constants'
+require_relative 'matchers'
 
 # SimpleCov test coverage reporting; enable this using the :coverage rake task
 if ENV['COVERAGE']
@@ -44,8 +37,6 @@ require 'loggability/spechelpers'
 require 'sequel'
 require 'sequel/model'
 
-require 'spec/lib/constants'
-require 'spec/lib/matchers'
 
 
 ### RSpec helper functions that are used to test Mongrel2 itself.
@@ -226,7 +217,13 @@ end
 RSpec.configure do |c|
 	include Mongrel2::TestConstants
 
-	c.mock_with :rspec
+	c.treat_symbols_as_metadata_keys_with_true_values = true
+	c.run_all_when_everything_filtered = true
+	c.filter_run :focus
+	c.order = 'random'
+	c.mock_with( :rspec ) do |config|
+		config.syntax = :expect
+	end
 
 	c.extend( Mongrel2::TestConstants )
 	c.include( Mongrel2::TestConstants )

data/spec/{lib/matchers.rb → matchers.rb}

@@ -1,21 +1,11 @@
 #!/usr/bin/ruby
 # coding: utf-8
 
-BEGIN {
-	require 'pathname'
-	basedir = Pathname.new( __FILE__ ).dirname.parent
-
-	libdir = basedir + "lib"
-
-	$LOAD_PATH.unshift( libdir.to_s ) unless $LOAD_PATH.include?( libdir.to_s )
-}
-
-require 'rspec'
-require 'mongrel2'
+require 'mongrel2' unless defined?( Mongrel2 )
 
 
 ### RSpec matchers for Mongrel2 specs
-module Mongrel2::Matchers
+module Mongrel2::Matchers # :nodoc:
 
     ### A matcher for unordered array contents
 	class EnumerableAllBeMatcher

data/spec/mongrel2/config/directory_spec.rb

@@ -1,19 +1,8 @@
 #!/usr/bin/env ruby
 
-BEGIN {
-	require 'pathname'
-	basedir = Pathname.new( __FILE__ ).dirname.parent.parent.parent
-
-	libdir = basedir + "lib"
-
-	$LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
-	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
-}
+require_relative '../../helpers'
 
 require 'rspec'
-
-require 'spec/lib/helpers'
-
 require 'mongrel2'
 require 'mongrel2/config'
 
@@ -25,7 +14,7 @@ require 'mongrel2/config'
 describe Mongrel2::Config::Directory do
 
 	before( :all ) do
-		setup_logging( :fatal )
+		setup_logging()
 		setup_config_db()
 	end
 
@@ -43,48 +32,48 @@ describe Mongrel2::Config::Directory do
 
 
 	it "is valid if its base, index_file, and default_ctype are all valid" do
-		@dir.should be_valid()
+		expect( @dir ).to be_valid()
 	end
 
 	it "isn't valid if it doesn't have a base" do
 		@dir.base = nil
-		@dir.should_not be_valid()
-		@dir.errors.full_messages.first.should =~ /missing or nil/i
+		expect( @dir ).to_not be_valid()
+		expect( @dir.errors.full_messages.first ).to match( /missing or nil/i )
 	end
 
 	it "isn't valid when its base starts with '/'" do
 		@dir.base = '/var/www/public/'
-		@dir.should_not be_valid()
-		@dir.errors.full_messages.first.should =~ %r{shouldn't start with '/'}i
+		expect( @dir ).to_not be_valid()
+		expect( @dir.errors.full_messages.first ).to match( %r{shouldn't start with '/'}i )
 	end
 
 	it "isn't valid when its base doesn't end with '/'" do
 		@dir.base = 'var/www/public'
-		@dir.should_not be_valid()
-		@dir.errors.full_messages.first.should =~ %r{must end with '/'}i
+		expect( @dir ).to_not be_valid()
+		expect( @dir.errors.full_messages.first ).to match( %r{must end with '/'}i )
 	end
 
 	it "isn't valid if it doesn't have an index file" do
 		@dir.index_file = nil
-		@dir.should_not be_valid()
-		@dir.errors.full_messages.first.should =~ /must not be nil/i
+		expect( @dir ).to_not be_valid()
+		expect( @dir.errors.full_messages.first ).to match( /must not be nil/i )
 	end
 
 	it "isn't valid if it doesn't have a default content-type" do
 		@dir.default_ctype = nil
-		@dir.should_not be_valid()
-		@dir.errors.full_messages.first.should =~ /must not be nil/i
+		expect( @dir ).to_not be_valid()
+		expect( @dir.errors.full_messages.first ).to match( /must not be nil/i )
 	end
 
 	it "isn't valid if its cache TTL is set to a negative value" do
 		@dir.cache_ttl = -5
-		@dir.should_not be_valid()
-		@dir.errors.full_messages.first.should =~ /not a positive integer/i
+		expect( @dir ).to_not be_valid()
+		expect( @dir.errors.full_messages.first ).to match( /not a positive integer/i )
 	end
 
 	it "is valid if its cache TTL is set to zero" do
 		@dir.cache_ttl = 0
-		@dir.should be_valid()
+		expect( @dir ).to be_valid()
 	end
 
 end

data/spec/mongrel2/config/dsl_spec.rb

@@ -1,19 +1,8 @@
 #!/usr/bin/env ruby
 
-BEGIN {
-	require 'pathname'
-	basedir = Pathname.new( __FILE__ ).dirname.parent.parent.parent
-
-	libdir = basedir + "lib"
-
-	$LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
-	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
-}
+require_relative '../../helpers'
 
 require 'rspec'
-
-require 'spec/lib/helpers'
-
 require 'mongrel2'
 require 'mongrel2/config'
 
@@ -27,7 +16,7 @@ describe Mongrel2::Config::DSL do
 	include described_class
 
 	before( :all ) do
-		setup_logging( :fatal )
+		setup_logging()
 		setup_config_db()
 	end
 
@@ -36,6 +25,7 @@ describe Mongrel2::Config::DSL do
 		Mongrel2::Config::Host.truncate
 		Mongrel2::Config::Route.truncate
 		Mongrel2::Config::Filter.truncate
+		Mongrel2::Config::XRequest.truncate
 	end
 
 	after( :all ) do
@@ -47,8 +37,8 @@ describe Mongrel2::Config::DSL do
 		it "can generate a default server config using the 'server' declarative" do
 			result = server '965A7196-99BC-46FA-945B-3478AE92BFB5'
 
-			result.should be_a( Mongrel2::Config::Server )
-			result.uuid.should == '965A7196-99BC-46FA-945B-3478AE92BFB5'
+			expect( result ).to be_a( Mongrel2::Config::Server )
+			expect( result.uuid ).to eq( '965A7196-99BC-46FA-945B-3478AE92BFB5' )
 		end
 
 
@@ -61,13 +51,13 @@ describe Mongrel2::Config::DSL do
 				control_port '/var/run/intranet.sock'
 			end
 
-			result.should be_a( Mongrel2::Config::Server )
-			result.uuid.should == '965A7196-99BC-46FA-945B-3478AE92BFB5'
-			result.name.should == 'Intranet'
-			result.chroot.should == '/service/mongrel2'
-			result.access_log.should == '/var/log/access'
-			result.error_log.should == '/var/log/errors'
-			result.control_port.should == '/var/run/intranet.sock'
+			expect( result ).to be_a( Mongrel2::Config::Server )
+			expect( result.uuid ).to eq( '965A7196-99BC-46FA-945B-3478AE92BFB5' )
+			expect( result.name ).to eq( 'Intranet' )
+			expect( result.chroot ).to eq( '/service/mongrel2' )
+			expect( result.access_log ).to eq( '/var/log/access' )
+			expect( result.error_log ).to eq( '/var/log/errors' )
+			expect( result.control_port ).to eq( '/var/run/intranet.sock' )
 		end
 	end
 
@@ -80,12 +70,12 @@ describe Mongrel2::Config::DSL do
 
 			end
 
-			result.should be_a( Mongrel2::Config::Server )
-			result.hosts.should have( 1 ).member
+			expect( result ).to be_a( Mongrel2::Config::Server )
+			expect( result.hosts ).to have( 1 ).member
 			host = result.hosts.first
 
-			host.should be_a( Mongrel2::Config::Host )
-			host.name.should == 'localhost'
+			expect( host ).to be_a( Mongrel2::Config::Host )
+			expect( host.name ).to eq( 'localhost' )
 		end
 
 		it "can add several elaborately-configured hosts to a server via a block" do
@@ -118,51 +108,51 @@ describe Mongrel2::Config::DSL do
 
 			end
 
-			result.should be_a( Mongrel2::Config::Server )
-			result.hosts.should have( 2 ).members
+			expect( result ).to be_a( Mongrel2::Config::Server )
+			expect( result.hosts ).to have( 2 ).members
 			host1, host2 = result.hosts
 
-			host1.should be_a( Mongrel2::Config::Host )
-			host1.name.should == 'brillianttaste'
-			host1.matching.should == '*.brillianttasteinthefoodmouth.com'
-			host1.routes.should have( 6 ).members
-			host1.routes.should all_be_a( Mongrel2::Config::Route )
-
-			host1.routes[0].path.should == '/images'
-			host1.routes[0].target.should be_a( Mongrel2::Config::Directory )
-			host1.routes[0].target.base.should == 'var/www/images/'
-
-			host1.routes[1].path.should == '/css'
-			host1.routes[1].target.should be_a( Mongrel2::Config::Directory )
-			host1.routes[1].target.base.should == 'var/www/css/'
-
-			host1.routes[2].path.should == '/vote'
-			host1.routes[2].target.should be_a( Mongrel2::Config::Proxy )
-			host1.routes[2].target.addr.should == 'localhost'
-			host1.routes[2].target.port.should == 6667
-
-			host1.routes[3].path.should == '/admin'
-			host1.routes[3].target.should be_a( Mongrel2::Config::Handler )
-			host1.routes[3].target.send_ident.should == 'D613E7EE-E2EB-4699-A200-5C8ECAB45D5E'
-			host1.routes[3].target.send_spec.should == 'tcp://127.0.0.1:9998'
-			host1.routes[3].target.recv_ident.should == ''
-			host1.routes[3].target.recv_spec.should == 'tcp://127.0.0.1:9997'
-
-			host1.routes[4].path.should == '@directory'
-			host1.routes[4].target.should be_a( Mongrel2::Config::Handler )
-			host1.routes[4].target.send_ident.should == 'B7EFA46D-FEE4-432B-B80F-E8A9A2CC6FDB'
-			host1.routes[4].target.send_spec.should == 'tcp://127.0.0.1:9996'
-			host1.routes[4].target.recv_spec.should == 'tcp://127.0.0.1:9992'
-			host1.routes[4].target.recv_ident.should == ''
-			host1.routes[4].target.protocol.should == 'tnetstring'
-
-			host1.routes[5].path.should == '/directory'
-			host1.routes[5].target.should == host1.routes[4].target
-
-			host2.should be_a( Mongrel2::Config::Host )
-			host2.name.should == 'deveiate.org'
-			host2.routes.should have( 1 ).member
-			host2.routes.first.should be_a( Mongrel2::Config::Route )
+			expect( host1 ).to be_a( Mongrel2::Config::Host )
+			expect( host1.name ).to eq( 'brillianttaste' )
+			expect( host1.matching ).to eq( '*.brillianttasteinthefoodmouth.com' )
+			expect( host1.routes ).to have( 6 ).members
+			expect( host1.routes ).to all_be_a( Mongrel2::Config::Route )
+
+			expect( host1.routes[0].path ).to eq( '/images' )
+			expect( host1.routes[0].target ).to be_a( Mongrel2::Config::Directory )
+			expect( host1.routes[0].target.base ).to eq( 'var/www/images/' )
+
+			expect( host1.routes[1].path ).to eq( '/css' )
+			expect( host1.routes[1].target ).to be_a( Mongrel2::Config::Directory )
+			expect( host1.routes[1].target.base ).to eq( 'var/www/css/' )
+
+			expect( host1.routes[2].path ).to eq( '/vote' )
+			expect( host1.routes[2].target ).to be_a( Mongrel2::Config::Proxy )
+			expect( host1.routes[2].target.addr ).to eq( 'localhost' )
+			expect( host1.routes[2].target.port ).to eq( 6667 )
+
+			expect( host1.routes[3].path ).to eq( '/admin' )
+			expect( host1.routes[3].target ).to be_a( Mongrel2::Config::Handler )
+			expect( host1.routes[3].target.send_ident ).to eq( 'D613E7EE-E2EB-4699-A200-5C8ECAB45D5E' )
+			expect( host1.routes[3].target.send_spec ).to eq( 'tcp://127.0.0.1:9998' )
+			expect( host1.routes[3].target.recv_ident ).to eq( '' )
+			expect( host1.routes[3].target.recv_spec ).to eq( 'tcp://127.0.0.1:9997' )
+
+			expect( host1.routes[4].path ).to eq( '@directory' )
+			expect( host1.routes[4].target ).to be_a( Mongrel2::Config::Handler )
+			expect( host1.routes[4].target.send_ident ).to eq( 'B7EFA46D-FEE4-432B-B80F-E8A9A2CC6FDB' )
+			expect( host1.routes[4].target.send_spec ).to eq( 'tcp://127.0.0.1:9996' )
+			expect( host1.routes[4].target.recv_spec ).to eq( 'tcp://127.0.0.1:9992' )
+			expect( host1.routes[4].target.recv_ident ).to eq( '' )
+			expect( host1.routes[4].target.protocol ).to eq( 'tnetstring' )
+
+			expect( host1.routes[5].path ).to eq( '/directory' )
+			expect( host1.routes[5].target ).to eq( host1.routes[4].target )
+
+			expect( host2 ).to be_a( Mongrel2::Config::Host )
+			expect( host2.name ).to eq( 'deveiate.org' )
+			expect( host2.routes ).to have( 1 ).member
+			expect( host2.routes.first ).to be_a( Mongrel2::Config::Route )
 		end
 
 
@@ -185,22 +175,22 @@ describe Mongrel2::Config::DSL do
 				"upload.temp_store_mode" => "0666"
 			)
 
-			result.should be_an( Array )
-			result.should have( 3 ).members
-			result.should all_be_a( Mongrel2::Config::Setting )
-			result[0].key.should == 'zeromq.threads'
-			result[0].value.should == '8'
-			result[1].key.should == 'upload.temp_store'
-			result[1].value.should == '/home/zedshaw/projects/mongrel2/tmp/upload.XXXXXX'
-			result[2].key.should == 'upload.temp_store_mode'
-			result[2].value.should == '0666'
+			expect( result ).to be_an( Array )
+			expect( result ).to have( 3 ).members
+			expect( result ).to all_be_a( Mongrel2::Config::Setting )
+			expect( result[0].key ).to eq( 'zeromq.threads' )
+			expect( result[0].value ).to eq( '8' )
+			expect( result[1].key ).to eq( 'upload.temp_store' )
+			expect( result[1].value ).to eq( '/home/zedshaw/projects/mongrel2/tmp/upload.XXXXXX' )
+			expect( result[2].key ).to eq( 'upload.temp_store_mode' )
+			expect( result[2].value ).to eq( '0666' )
 		end
 
 		it "can set a single expert setting" do
 			result = setting "zeromq.threads", 16
-			result.should be_a( Mongrel2::Config::Setting )
-			result.key.should == 'zeromq.threads'
-			result.value.should == '16'
+			expect( result ).to be_a( Mongrel2::Config::Setting )
+			expect( result.key ).to eq( 'zeromq.threads' )
+			expect( result.value ).to eq( '16' )
 		end
 
 	end
@@ -213,20 +203,20 @@ describe Mongrel2::Config::DSL do
 				'.textile' => 'text/x-textile'
 			)
 
-			result.should be_an( Array )
-			result.should have( 2 ).members
-			result.should all_be_a( Mongrel2::Config::Mimetype )
-			result[0].extension.should == '.md'
-			result[0].mimetype.should == 'text/x-markdown'
-			result[1].extension.should == '.textile'
-			result[1].mimetype.should == 'text/x-textile'
+			expect( result ).to be_an( Array )
+			expect( result ).to have( 2 ).members
+			expect( result ).to all_be_a( Mongrel2::Config::Mimetype )
+			expect( result[0].extension ).to eq( '.md' )
+			expect( result[0].mimetype ).to eq( 'text/x-markdown' )
+			expect( result[1].extension ).to eq( '.textile' )
+			expect( result[1].mimetype ).to eq( 'text/x-textile' )
 		end
 
 		it "can set a single mimetype mapping" do
 			result = mimetype '.tmpl', 'text/x-inversion-template'
-			result.should be_a( Mongrel2::Config::Mimetype )
-			result.extension.should == '.tmpl'
-			result.mimetype.should == 'text/x-inversion-template'
+			expect( result ).to be_a( Mongrel2::Config::Mimetype )
+			expect( result.extension ).to eq( '.tmpl' )
+			expect( result.mimetype ).to eq( 'text/x-inversion-template' )
 		end
 
 	end
@@ -238,9 +228,9 @@ describe Mongrel2::Config::DSL do
 				filter '/usr/lib/mongrel2/null.so'
 			end
 
-			result.filters.should have( 1 ).member
-			result.filters.first.should be_a( Mongrel2::Config::Filter )
-			result.filters.first.settings.should == {}
+			expect( result.filters ).to have( 1 ).member
+			expect( result.filters.first ).to be_a( Mongrel2::Config::Filter )
+			expect( result.filters.first.settings ).to eq( {} )
 		end
 
 		it "can add a filter with settings to a server" do
@@ -250,10 +240,37 @@ describe Mongrel2::Config::DSL do
 					min_size: 1000
 			end
 
-			result.filters.should have( 1 ).member
-			result.filters.first.should be_a( Mongrel2::Config::Filter )
-			result.filters.first.settings.should ==
-				{ 'extensions' => ["*.html", "*.txt"], 'min_size' => 1000 }
+			expect( result.filters ).to have( 1 ).member
+			expect( result.filters.first ).to be_a( Mongrel2::Config::Filter )
+			expect( result.filters.first.settings ).
+				to eq({ 'extensions' => ["*.html", "*.txt"], 'min_size' => 1000 })
+		end
+
+	end
+
+	describe 'xrequests' do
+
+		it "can add an xrequest to a server" do
+			result = server '965A7196-99BC-46FA-945B-3478AE92BFB5' do
+				xrequest '/usr/lib/mongrel2/null.so'
+			end
+
+			expect( result.xrequests ).to have( 1 ).member
+			expect( result.xrequests.first ).to be_a( Mongrel2::Config::XRequest )
+			expect( result.xrequests.first.settings ).to eq( {} )
+		end
+
+		it "can add a filter with settings to a server" do
+			result = server '965A7196-99BC-46FA-945B-3478AE92BFB5' do
+				xrequest '/usr/lib/mongrel2/null.so',
+					extensions: ["*.html", "*.txt"],
+					min_size: 1000
+			end
+
+			expect( result.xrequests ).to have( 1 ).member
+			expect( result.xrequests.first ).to be_a( Mongrel2::Config::XRequest )
+			expect( result.xrequests.first.settings ).
+				to eq({ 'extensions' => ["*.html", "*.txt"], 'min_size' => 1000 })
 		end
 
 	end