mongrel2 0.25.0 → 0.26.0

data/ChangeLog

@@ -1,11 +1,61 @@
+2012-06-26  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/mongrel2/config/handler.rb, lib/mongrel2/config/host.rb,
+	lib/mongrel2/config/route.rb, lib/mongrel2/config/server.rb,
+	lib/mongrel2/connection.rb, lib/mongrel2/handler.rb,
+	lib/mongrel2/httprequest.rb, lib/mongrel2/request.rb,
+	spec/mongrel2/handler_spec.rb, spec/mongrel2/httprequest_spec.rb,
+	spec/mongrel2/request_spec.rb:
+	Fix the async upload body path
+	[782174dcba2e] [tip]
+
+2012-06-21  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.25.0 for changeset 79bf424c93cd
+	[0cb15359e25b]
+
+	* .hgsigs:
+	Added signature for changeset 893e0493be04
+	[79bf424c93cd] [v0.25.0]
+
+	* History.rdoc, lib/mongrel2.rb, lib/mongrel2/request.rb:
+	Bumped minor version, updated history
+	[893e0493be04]
+
+	* lib/mongrel2/httprequest.rb, lib/mongrel2/request.rb,
+	lib/mongrel2/response.rb, spec/mongrel2/httprequest_spec.rb,
+	spec/mongrel2/request_spec.rb:
+	Make similar stream adjustments to request as had previously been
+	done to response.
+	[9f061f269db6]
+
+	* spec/mongrel2/response_spec.rb:
+	Fix spelling
+	[7fcb08e469ae]
+
+	* lib/mongrel2/response.rb, spec/mongrel2/response_spec.rb:
+	Don't try to wrap objects that don't support #to_str in a StringIO.
+	[22f3d1c88c37]
+
 2012-06-20  Michael Granger  <ged@FaerieMUD.org>
 
+	* examples/request-dumper.rb, examples/request-dumper.tmpl,
+	lib/mongrel2/connection.rb, lib/mongrel2/request.rb,
+	spec/mongrel2/request_spec.rb:
+	Add support for Content-type charset to Mongrel2::Request.
+	[dae4f2b16ef7]
+
+	* lib/mongrel2/request.rb:
+	Set the body on Mongrel2::Request if constructed with an IO, too.
+	[8721f2abc3c0]
+
 	* examples/async-upload.rb, examples/config.rb,
 	lib/mongrel2/httprequest.rb, lib/mongrel2/request.rb,
 	lib/mongrel2/testing.rb, spec/mongrel2/httprequest_spec.rb,
 	spec/mongrel2/request_spec.rb:
 	Hook up the async uploaded entity body to the request
-	[349c0049a4a1] [tip]
+	[349c0049a4a1]
 
 2012-06-19  Michael Granger  <ged@FaerieMUD.org>
 

data/History.rdoc

@@ -1,3 +1,9 @@
+== v0.26.0 [2012-06-26] Michael Granger <ged@FaerieMUD.org>
+
+- Fix the derived path to the async upload body
+- Add a default async upload handler method that cancels the upload
+
+
 == v0.25.0 [2012-06-20] Michael Granger <ged@FaerieMUD.org>
 
 NOTE: This revision contains non-backward-compatible changes to

data/lib/mongrel2.rb

@@ -20,10 +20,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.25.0'
+	VERSION = '0.26.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 893e0493be04 $
+	REVISION = %q$Revision: c2eac469ca66 $
 
 
 	require 'mongrel2/constants'

data/lib/mongrel2/config/handler.rb

@@ -16,6 +16,15 @@ class Mongrel2::Config::Handler < Mongrel2::Config( :handler )
 	#    protocol TEXT DEFAULT 'json');
 
 
+	#
+	# :section: Associations
+	#
+
+	##
+	# The routes[rdoc-ref:Mongrel2::Config::Route] that refer to this Handler
+	one_to_many :routes, :key => :target_id, :conditions => { target_type: 'handler' }
+
+
 	# The list of 0mq transports Mongrel2 can use; "You need to use the
 	# ZeroMQ syntax for configuring them, but this means with one
 	# configuration format you can use handlers that are using UDP, TCP,

data/lib/mongrel2/config/host.rb

@@ -13,16 +13,34 @@ class Mongrel2::Config::Host < Mongrel2::Config( :host )
 	#     name TEXT,
 	#     matching TEXT);
 
+
+	#
+	# :section: Associations
+	#
+
+	##
+	# The routes[rdoc-ref:Mongrel2::Config::Route] that this host has.
 	one_to_many :routes
+
+	##
+	# The server[rdoc-ref:Mongrel2::Config::Server] this host belongs to.
 	many_to_one :server
 
 
+	#
+	# :section: Hooks
+	#
+
 	### Clean up the host's routes when it's destroyed.
 	def before_destroy
 		self.routes.each( &:destroy )
 	end
 
 
+	#
+	# :section: DSL mixin
+	#
+
 	### DSL methods for the Server context besides those automatically-generated from its
 	### columns.
 	module DSLMethods

data/lib/mongrel2/config/route.rb

@@ -14,6 +14,23 @@ class Mongrel2::Config::Route < Mongrel2::Config( :route )
 	#     target_id INTEGER,
 	#     target_type TEXT);
 
+
+	### Return the Route that corresponds to the given +request+.
+	def self::for_request( request )
+		pattern = request.headers.pattern
+		return self.filter( path: pattern ).first
+	end
+
+
+	#
+	# :section: Associations
+	#
+
+	##
+	# The Mongrel2::Config::Host this route belongs to.
+	many_to_one :host
+
+
 	### Fetch the route's target, which is either a Mongrel2::Config::Directory, 
 	### Mongrel2::Config::Proxy, or Mongrel2::Config::Handler object.
 	def target

data/lib/mongrel2/config/server.rb

@@ -25,10 +25,23 @@ class Mongrel2::Config::Server < Mongrel2::Config( :server )
 	#     port INTEGER,
 	#     use_ssl INTEGER default 0);
 
+	#
+	# :section: Associations
+	#
+
+	##
+	# The hosts[rdoc-ref:Mongrel2::Config::Host] that belong to this server.
 	one_to_many :hosts
+
+	##
+	# The filters[rdoc-ref:Mongrel2::Config::Filter] that will be loaded by this server.
 	one_to_many :filters
 
 
+	#
+	# :section: Dataset Methods
+	#
+
 	##
 	# Return the dataset for looking up a server by its UUID.
 	# :singleton-method: by_uuid
@@ -37,6 +50,16 @@ class Mongrel2::Config::Server < Mongrel2::Config( :server )
 	def_dataset_method( :by_uuid ) {|uuid| filter(:uuid => uuid).limit(1) }
 
 
+	#
+	# :section: Socket/Pathname Convenience Methods
+	#
+
+	### Return a Pathname for the server's chroot directory.
+	def chroot_path
+		return Pathname( self.chroot )
+	end
+
+
 	### Return the URI for its control socket.
 	def control_socket_uri
 		# Find the control socket relative to the server's chroot
@@ -46,7 +69,7 @@ class Mongrel2::Config::Server < Mongrel2::Config( :server )
 		scheme, sock_path = csock_uri.split( '://', 2 )
 		self.log.debug "  chrooted socket path is: %p" % [ sock_path ]
 
-		csock_path = Pathname( self.chroot ) + sock_path
+		csock_path = self.chroot_path + sock_path
 		self.log.debug "  fully-qualified path is: %p" % [ csock_path ]
 		csock_uri = "%s://%s" % [ scheme, csock_path ]
 
@@ -63,11 +86,10 @@ class Mongrel2::Config::Server < Mongrel2::Config( :server )
 
 	### 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
+		return self.chroot_path + pidfile
 	end
 
 

data/lib/mongrel2/connection.rb

@@ -149,6 +149,7 @@ class Mongrel2::Connection
 	### Tell the server to close the connection associated with the given +sender_id+ and
 	### +conn_id+.
 	def send_close( sender_id, conn_id )
+		self.log.info "Sending kill message to connection %d" % [ conn_id ]
 		self.send( sender_id, conn_id, '' )
 	end
 

data/lib/mongrel2/handler.rb

@@ -202,6 +202,10 @@ class Mongrel2::Handler
 			self.handle_disconnect( request )
 			return nil
 
+		elsif request.upload_started?
+			self.log.debug "async upload start!"
+			return self.handle_async_upload_start( request )
+
 		else
 			case request
 			when Mongrel2::HTTPRequest
@@ -290,6 +294,28 @@ class Mongrel2::Handler
 	end
 
 
+	### Handle an asynchronous upload start notification. These are sent to notify the
+	### handler that a request that exceeds the server's <tt>limits.content_length</tt>
+	### has been received. The default implementation cancels any such uploads by
+	### replying with an empty string. If the request should be accepted, your handler
+	### should override this and do nothing if the request should continue. You'll receive
+	### a new request via the regular callback when the upload completes whose entity body
+	### is open to the spooled file.
+	def handle_async_upload_start( request )
+		explanation = "If you wish to handle requests like this, either set your server's "
+		explanation << "'limits.content_length' setting to a higher value than %d, or override " %
+			 [ request.content_length ]
+		explanation << "#handle_async_upload_start."
+
+		self.log.warn "Async upload from %s dropped." % [ request.remote_ip ]
+		self.log.info( explanation )
+
+		self.conn.reply_close( request )
+
+		return nil
+	end
+
+
 	#
 	# :section: Signal Handling
 	# These methods set up some behavior for starting, restarting, and stopping

data/lib/mongrel2/httprequest.rb

@@ -1,6 +1,5 @@
 #!/usr/bin/ruby
 
-require 'ipaddr'
 require 'loggability'
 
 require 'mongrel2/request' unless defined?( Mongrel2::Request )
@@ -89,13 +88,6 @@ class Mongrel2::HTTPRequest < Mongrel2::Request
 	end
 
 
-	### Fetch the original requestor IP address.
-	def remote_ip
-		ips = [ self.headers.x_forwarded_for ]
-		return IPAddr.new( ips.flatten.first )
-	end
-
-
 	#########
 	protected
 	#########
@@ -107,7 +99,7 @@ class Mongrel2::HTTPRequest < Mongrel2::Request
 			self.headers[:method],
 			self.headers.uri,
 			self.headers.version,
-			(self.body.length / 1024.0),
+			(self.body.size / 1024.0),
 		]
 	end
 

data/lib/mongrel2/request.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/ruby
 
+require 'ipaddr'
 require 'stringio'
 require 'tnetstring'
 require 'yajl'
@@ -171,6 +172,13 @@ class Mongrel2::Request
 	end
 
 
+	### Fetch the original requestor IP address.
+	def remote_ip
+		ips = [ self.headers.x_forwarded_for ]
+		return IPAddr.new( ips.flatten.first )
+	end
+
+
 	#
 	# :section: Async Upload Support
 	# See http://mongrel2.org/static/book-finalch6.html#x8-810005.5 for details.
@@ -181,12 +189,12 @@ class Mongrel2::Request
 		raise Mongrel2::UploadError, "invalid upload: upload headers don't match" unless
 			self.upload_headers_match?
 
-		server = Mongrel2::Config::Server.by_uuid( self.sender_id ).first or
-			raise Mongrel2::UploadError, "couldn't find the server %p in the config DB" %
-			[ self.sender_id ]
+		route = Mongrel2::Config::Route.for_request( self ) or
+			raise Mongrel2::UploadError, "couldn't find the route config for %s" % [ self ]
+		server = route.host.server
 
 		relpath = Pathname( self.headers.x_mongrel2_upload_done )
-		chrooted = Pathname( server.chroot ) + relpath
+		chrooted = server.chroot_path + relpath
 
 		if chrooted.exist?
 			return chrooted

data/spec/lib/helpers.rb

@@ -208,6 +208,8 @@ RSpec.configure do |c|
 	c.include( Mongrel2::TestConstants )
 	c.include( Mongrel2::SpecHelpers )
 	c.include( Mongrel2::Matchers )
+
+	c.include( Mongrel2::Config::DSL )
 end
 
 # vim: set nosta noet ts=4 sw=4:

data/spec/mongrel2/handler_spec.rb

@@ -254,6 +254,18 @@ describe Mongrel2::Handler do
 		response.should be_nil()
 	end
 
+	it "cancels async upload notices by default" do
+		req = make_request( 'METHOD' => 'POST', :headers => {'x-mongrel2-upload-start' => 'uploadfile.XXX'} )
+		@request_sock.should_receive( :recv ).and_return( req )
+		@response_sock.should_receive( :send ).with( "#{TEST_UUID} 1:8, " )
+
+		res = OneShotHandler.new( TEST_UUID, TEST_SEND_SPEC, TEST_RECV_SPEC ).run
+
+		res.transactions.should have( 1 ).member
+		request, response = res.transactions.first
+		response.should be_nil()
+	end
+
 	it "re-establishes its connection when told to restart" do
 		res = OneShotHandler.new( TEST_UUID, TEST_SEND_SPEC, TEST_RECV_SPEC )
 		original_conn = res.conn

data/spec/mongrel2/httprequest_spec.rb

@@ -123,20 +123,6 @@ describe Mongrel2::HTTPRequest do
 			}.to raise_error( ArgumentError, /invalid value for integer/i )
 		end
 
-		it "provides a convenience method for fetching the requestor's IP address" do
-			@req.headers.merge!(
-				'X-Forwarded-For' => '127.0.0.1'
-			)
-			@req.remote_ip.to_s.should == '127.0.0.1'
-		end
-
-		it "fetching the requestor's IP address even when travelling via proxies" do
-			@req.headers.merge!(
-				'X-Forwarded-For' => [ '127.0.0.1', '8.8.8.8', '4.4.4.4' ]
-			)
-			@req.remote_ip.to_s.should == '127.0.0.1'
-		end
-
 	end
 
 end

data/spec/mongrel2/request_spec.rb

@@ -120,6 +120,20 @@ describe Mongrel2::Request do
 			@req.body.should be( testobj )
 		end
 
+		it "provides a convenience method for fetching the requestor's IP address" do
+			@req.headers.merge!(
+				'X-Forwarded-For' => '127.0.0.1'
+			)
+			@req.remote_ip.to_s.should == '127.0.0.1'
+		end
+
+		it "fetching the requestor's IP address even when travelling via proxies" do
+			@req.headers.merge!(
+				'X-Forwarded-For' => [ '127.0.0.1', '8.8.8.8', '4.4.4.4' ]
+			)
+			@req.remote_ip.to_s.should == '127.0.0.1'
+		end
+
 	end
 
 
@@ -204,15 +218,20 @@ describe Mongrel2::Request do
 
 		before( :all ) do
 			setup_config_db()
-			Mongrel2::Config::Server.create(
-				 uuid:         Mongrel2::RequestFactory::DEFAULT_TEST_UUID,
-				 access_log:   'access.log',
-				 error_log:    'error.log',
-				 pid_file:     '/var/run/mongrel2.pid',
-				 default_host: 'localhost',
-				 port:         663,
-				 chroot:       Dir.tmpdir
-			  )
+
+			# Set up a test server config so the request can find the server's chroot
+			server 'specs' do
+				default_host 'localhost'
+				access_log   'access.log'
+				error_log    'error.log'
+				chroot       Dir.tmpdir
+				pid_file     '/var/run/mongrel2.pid'
+				port         8113
+
+				host 'localhost' do
+					route '/form', handler( TEST_SEND_SPEC, 'upload-handler', TEST_RECV_SPEC )
+				end
+			end
 		end
 
 		before( :each ) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongrel2
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 0.26.0
   prerelease: 
 platform: ruby
 authors:
@@ -36,7 +36,7 @@ cert_chain:
   YUhDS0xaZFNLai9SSHVUT3QrZ2JsUmV4OEZBaDhOZUEKY21saFhlNDZwWk5K
   Z1dLYnhaYWg4NWpJang5NWhSOHZPSStOQU01aUg5a09xSzEzRHJ4YWNUS1Bo
   cWo1UGp3RgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2012-06-22 00:00:00.000000000 Z
+date: 2012-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri