mongrel2 0.42.0 → 0.43.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67b350991e9a1fb755ab31a976e2ed25cf892834
-  data.tar.gz: 47b3e6e4899b4e0264f3e7e942403c1e76c0c088
+  metadata.gz: 12160066fe026f98304d28971ff0b2e226fd79e9
+  data.tar.gz: 0139d54e247c836355752a2e83f30d5242b963cc
 SHA512:
-  metadata.gz: 31834138627739c658fb0835498b32dafac43ff4eaa442f266193a875638accea82e0b97392aaa947d0bdd161e330ba44d8cc6ee3efb72444531e946266843a2
-  data.tar.gz: 3d526fb3b48882ca19667eef7bf9e4c8d27e904053b9e461cb847274616c0ccab0c3f46fb24e74cd0558f9719d656af43434a19f8a0fc0aa1e1ab5592440d022
+  metadata.gz: 920463a4faef21f95e5c59acb5d0711dbca704c3a58ca1d58fe7c2e441fab2066acf9e9845d807d28fce13e8ad6aae7f952ae841f33a0629ad02e937b0ebf7c9
+  data.tar.gz: 1b8f9649334fafabeac082c4756e300983ea3edbb3138a1e7f46beae032269045bd3606d4df00175dea17a0564ebb7f3665da1ca037b9653472e072e25db870a

checksums.yaml.gz.sig

@@ -1 +1,2 @@
-�'�Άԇ�sރ$�~E����
+'�����ѲH&ٔ���XUO$M<
+�jB�wR*�q��̓�$cS���KbSj%��$��Ii<tx��։�m����RhҬC.®p�5�Xą6���&�!��(�:�
����]��;~����!��E��K��2^ڊ�Q��>W��#��8������HA�O8�r���ח0 �+��=+��k+<��UȊHR=vS��y�^r�;#0��?I�8�O*��K�y�u�|zr�w$>��������:/�۸Z�3�_a��

data/History.rdoc

@@ -1,3 +1,10 @@
+== v0.43.0 [2014-12-17] Michael Granger <ged@FaerieMUD.org>
+
+- Add a Mongrel2::Request#server_chroot
+  Used to qualify filesystem paths relative to Mongrel's chroot for
+  sendfile, async upload, etc.
+
+
 == v0.42.0 [2014-08-27] Michael Granger <ged@FaerieMUD.org>
 
 Add support for sending extended replies.

data/lib/mongrel2.rb

@@ -25,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.42.0'
+	VERSION = '0.43.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: b8be09d1fd14 $
+	REVISION = %q$Revision: dfce5a80c5bf $
 
 
 	require 'mongrel2/constants'

data/lib/mongrel2/config/route.rb

@@ -5,6 +5,9 @@ require 'mongrel2/config' unless defined?( Mongrel2::Config )
 
 # Mongrel2 Route configuration class
 class Mongrel2::Config::Route < Mongrel2::Config( :route )
+	extend Loggability
+
+	log_to :mongrel2
 
 	### As of Mongrel2/1.8.0:
 	# CREATE TABLE route (id INTEGER PRIMARY KEY,
@@ -18,6 +21,8 @@ class Mongrel2::Config::Route < Mongrel2::Config( :route )
 	### Return the Route that corresponds to the given +request+.
 	def self::for_request( request )
 		pattern = request.headers.pattern
+		self.log.debug "Searching for the route for the path %p in %p" %
+			[ pattern, self.all ]
 		return self.filter( path: pattern ).first
 	end
 

data/lib/mongrel2/request.rb

@@ -190,12 +190,8 @@ class Mongrel2::Request
 		raise Mongrel2::UploadError, "invalid upload: upload headers don't match" unless
 			self.upload_headers_match?
 
-		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 = server.chroot_path + relpath
+		chrooted = self.server_chroot + relpath
 
 		if chrooted.exist?
 			return chrooted
@@ -203,13 +199,27 @@ class Mongrel2::Request
 			return relpath
 		else
 			self.log.error "uploaded body %s not found: tried relative to cwd and server chroot (%s)" %
-				[ relpath, server.chroot ]
+				[ relpath, chrooted ]
 			raise Mongrel2::UploadError,
 				"couldn't find the path to uploaded body."
 		end
 	end
 
 
+	### Return the chroot directory of the mongrel2 daemon that received this request as
+	### a Pathname.
+	def server_chroot
+		route = Mongrel2::Config::Route.for_request( self ) or
+			raise Mongrel2::UploadError, "couldn't find the route config for %s" % [ self ]
+		server = route.host.server
+
+		path = server.chroot
+		path = '/' if path.empty?
+
+		return Pathname( path )
+	end
+
+
 	### Returns +true+ if this request is an 'asynchronous upload started' notification.
 	def upload_started?
 		return self.headers.member?( :x_mongrel2_upload_start ) &&

data/spec/mongrel2/request_spec.rb

@@ -19,12 +19,28 @@ require 'mongrel2/request'
 describe Mongrel2::Request do
 
 	before( :all ) do
-		setup_logging()
+		setup_config_db()
+
+		# 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( 'tcp://127.0.0.1:9900', 'upload-handler' )
+				route TEST_JSON_PATH, handler( 'tcp://127.0.0.1:9902', 'json-handler' )
+			end
+		end
+
 		@factory = Mongrel2::RequestFactory.new( route: '/form' )
 	end
 
-	after( :all ) do
-		reset_logging()
+	before( :each ) do
+		Mongrel2::Config::Server.first.update( chroot: Dir.tmpdir )
 	end
 
 
@@ -125,6 +141,19 @@ describe Mongrel2::Request do
 			expect( @req.remote_ip.to_s ).to eq( '127.0.0.1' )
 		end
 
+		it "can look up the chroot directory of the server the request is from" do
+			Mongrel2::Config::Server.first.update( chroot: '/usr/local/www' )
+			expect( @req.server_chroot ).to be_a( Pathname )
+			expect( @req.server_chroot.to_s ).to eq( '/usr/local/www' )
+		end
+
+
+		it "returns '/' as the chroot directory if the server isn't chrooted" do
+			Mongrel2::Config::Server.first.update( chroot: '' )
+			expect( @req.server_chroot ).to be_a( Pathname )
+			expect( @req.server_chroot.to_s ).to eq( '/' )
+		end
+
 	end
 
 
@@ -153,6 +182,7 @@ describe Mongrel2::Request do
 
 	end
 
+
 	describe "framework support" do
 
 		before( :all ) do
@@ -207,24 +237,6 @@ describe Mongrel2::Request do
 
 	describe "async upload support" do
 
-		before( :all ) do
-			setup_config_db()
-
-			# 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
 			@spoolfile = Tempfile.new( 'mongrel2.upload', Dir.tmpdir )
 			@spoolfile.print( File.read(__FILE__) )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongrel2
 version: !ruby/object:Gem::Version
-  version: 0.42.0
+  version: 0.43.0
 platform: ruby
 authors:
 - Michael Granger
@@ -30,7 +30,7 @@ cert_chain:
   c7ZKPJcWBv0sm81+FCZXNACn2f9jfF8OQinxVs0O052KbGuEQaaiGIYeuuwQE2q6
   ggcrPfcYeTwWlfZPu2LrBg==
   -----END CERTIFICATE-----
-date: 2014-08-27 00:00:00.000000000 Z
+date: 2014-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -276,14 +276,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.13'
 description: |-
   Ruby-Mongrel2 is a complete Ruby connector for Mongrel2[http://mongrel2.org/].
 
@@ -412,7 +412,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ruby-Mongrel2 is a complete Ruby connector for Mongrel2[http://mongrel2.org/]

metadata.gz.sig

@@ -1,2 +1,2 @@
-��~v���<+�`f��	�	0�*Ɏ��� ���7�z�#K�(��<Ca&
�9��'E�B$��U�Z�Yb$�
?�•��Z͍�Y:o�A�
-V6K�>CrT�:q��	�?���~���j�֎�u��&������8&EB��Y�<�)?[��;�R*5���b��� �ə��z�G�77^��X3�o�)Կe���C��!z��8ٝ�7�	B頢��?�o�����Ĕ�@�u��Y���t{3�V������L��C
+*��/E������b�yu�8=�J�>���`O���]��k�
+	eY�I&p#�wo�s�ոfx��`�nR߼���-��>wy"9`��9������ky&�>�BI�m��baVo�X���m��5[-����S