mongrel2 0.33.0 → 0.34.0

data/ChangeLog

@@ -1,8 +1,32 @@
+2012-10-02  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.33.0 for changeset fcfe03af49a6
+	[b79abaa5e19f] [tip]
+
+	* .hgsigs:
+	Added signature for changeset 4c64666f4255
+	[fcfe03af49a6] [v0.33.0]
+
+	* History.rdoc, data/mongrel2/bootstrap.html, examples/async-
+	upload.rb:
+	Update the examples.
+	[4c64666f4255]
+
+	* lib/mongrel2.rb, lib/mongrel2/handler.rb,
+	spec/mongrel2/handler_spec.rb:
+	Add deferred signal-handling to Mongrel2::Handler.
+	[8703559eacf1]
+
+	* lib/mongrel2/connection.rb:
+	Whitespace fix
+	[1dbd2c6523aa]
+
 2012-09-21  Michael Granger  <ged@FaerieMUD.org>
 
 	* spec/lib/helpers.rb:
 	Use Loggability's spec helpers
-	[36f9259ea9aa] [tip]
+	[36f9259ea9aa]
 
 	* lib/mongrel2/request.rb:
 	Don't log the whole damn request in debugging
@@ -81,7 +105,7 @@
 
 	* .hgtags:
 	Added tag v0.30.1 for changeset 01750f74082c
-	[8208fbbc6641]
+	[8208fbbc6641] [github/master]
 
 	* .hgsigs:
 	Added signature for changeset 4ebef57dc78c
@@ -375,7 +399,7 @@
 	examples/config.rb, lib/mongrel2/config.rb,
 	lib/mongrel2/httprequest.rb, spec/mongrel2/config_spec.rb:
 	Change Config.settings to a Table, small fixups for async upload.
-	[e2384875455d]
+	[e2384875455d] [github/master@default]
 
 	* .tm_properties, data/mongrel2/bootstrap.html, examples/.env,
 	examples/Procfile, examples/async-upload.rb, examples/config.rb,

data/History.rdoc

@@ -1,3 +1,14 @@
+== v0.34.0 [2012-10-17] Michael Granger <ged@FaerieMUD.org>
+
+- Fix the multiple-server case in 'm2sh.rb start'
+- Add support for the new (edge) 'url-scheme' header and add an #ssl?
+  predicate build on it.
+- Try to make examples more tolerant of being run from other
+  directories
+- Add (1.8.0ish) url-scheme header to the defaults in mongrel2/testing
+- Remove some more chatty debug logging.
+
+
 == v0.33.0 [2012-10-02] Michael Granger <ged@FaerieMUD.org>
 
 - Implement deferred signal-handling for Mongrel2::Handler

data/bin/m2sh.rb

@@ -678,7 +678,7 @@ class Mongrel2::M2SHCommand
 		# that it would have matched.
 		if servers.length == 1
 			server = servers.first if !serverspec ||
-				servers.first.values_at( :uuid, :default_host, :name ).include?( serverspec )
+				servers.first.values.values_at( :uuid, :default_host, :name ).include?( serverspec )
 
 		# Otherwise, require an argument and search for the desired server if there is one
 		else

data/examples/config.rb

@@ -13,7 +13,7 @@ basedir = examples_dir.parent
 upload_dir = Pathname( Dir.tmpdir )
 
 # samples server
-server 'examples' do
+s = server 'examples' do
 
 	name         'Examples'
 	default_host 'localhost'
@@ -55,4 +55,6 @@ mkdir_p 'var/mongrel2'
 mkdir_p 'logs'
 mkdir_p '/tmp/mongrel2-uploads'
 
+puts "Will chroot to: #{s.chroot}"
 puts "Upload dir is: #{upload_dir}"
+

data/examples/run

@@ -9,7 +9,7 @@ examplesdir=$(dirname $0)
 
 echo "Creating/updating the config database..."
 ruby -rubygems -I${examplesdir}/../lib $examplesdir/../bin/m2sh.rb \
-	-c examples.sqlite load $examplesdir/config.rb
+	-c ${examplesdir}/examples.sqlite load $examplesdir/config.rb
 
 if [ $? != 0 ]; then
 	echo "Oops, problems installing the config DB. Aborting."

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.33.0'
+	VERSION = '0.34.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 8703559eacf1 $
+	REVISION = %q$Revision: 0c87b34361e7 $
 
 
 	require 'mongrel2/constants'

data/lib/mongrel2/httprequest.rb

@@ -88,6 +88,21 @@ class Mongrel2::HTTPRequest < Mongrel2::Request
 	end
 
 
+	### Convenience method for getting the request's 'url-scheme' header.
+	def scheme
+		return self.headers.url_scheme || 'http'
+	end
+
+
+	### Returns +true+ if the request's URL scheme indicates that it used an HTTPS connection. This
+	### only works on versions of Mongrel2 *after* 1.8.0.
+	def ssl?
+		return self.scheme == 'https'
+	end
+	alias_method :used_ssl?, :ssl?
+	alias_method :secure?, :ssl?
+
+
 	#########
 	protected
 	#########

data/lib/mongrel2/httpresponse.rb

@@ -73,10 +73,7 @@ class Mongrel2::HTTPResponse < Mongrel2::Response
 
 	### Send the response status to the client
 	def status_line
-		self.log.debug "Building status line for status: %p" % [ self.status ]
-
 		st = self.status || (self.body.size.zero? ? HTTP::NO_CONTENT : HTTP::OK)
-
 		return STATUS_LINE_FORMAT % [ st, HTTP::STATUS_NAME[st] ]
 	end
 

data/lib/mongrel2/testing.rb

@@ -69,16 +69,17 @@ module Mongrel2
 
 		# The default set of headers used for HTTP requests
 		DEFAULT_TESTING_HEADERS  = {
-			"x-forwarded-for" => "127.0.0.1",
-			"accept-language" => "en-US,en;q=0.8",
-			"accept-encoding" => "gzip,deflate,sdch",
-			"connection"      => "keep-alive",
-			"accept-charset"  => "UTF-8,*;q=0.5",
-			"accept"          => "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
-			"user-agent"      => "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_1) " +
-			                     "AppleWebKit/535.1 (KHTML, like Gecko) Chrome/13.0.782.112 " +
-			                     "Safari/535.1",
-			"VERSION"         => "HTTP/1.1",
+			'x-forwarded-for' => '127.0.0.1',
+			'accept-language' => 'en-US,en;q=0.8',
+			'accept-encoding' => 'gzip,deflate,sdch',
+			'connection'      => 'keep-alive',
+			'accept-charset'  => 'UTF-8,*;q=0.5',
+			'accept'          => 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
+			'user-agent'      => 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_1) ' +
+			                     'AppleWebKit/535.1 (KHTML, like Gecko) Chrome/13.0.782.112 ' +
+			                     'Safari/535.1',
+			'url-scheme'      => 'http',
+			'VERSION'         => 'HTTP/1.1',
 		}
 
 		# The defaults used by the HTTP request factory

data/spec/mongrel2/httprequest_spec.rb

@@ -79,6 +79,21 @@ describe Mongrel2::HTTPRequest do
 		@req.should be_keepalive()
 	end
 
+	it "knows what its URL scheme was" do
+		@req.scheme.should == 'http'
+	end
+
+	it "falls back to 'http' if the url_scheme isn't provided (mongrel2 <= 1.8.0)" do
+		@req.headers.url_scheme = nil
+		@req.scheme.should == 'http'
+	end
+
+	it "knows that it was an SSL-encrypted request if its scheme was 'https'" do
+		@req.headers.url_scheme = 'https'
+		@req.should be_secure()
+	end
+
+
 	describe "header convenience methods" do
 
 		before( :each ) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongrel2
 version: !ruby/object:Gem::Version
-  version: 0.33.0
+  version: 0.34.0
   prerelease: 
 platform: ruby
 authors:
@@ -36,7 +36,7 @@ cert_chain:
   YUhDS0xaZFNLai9SSHVUT3QrZ2JsUmV4OEZBaDhOZUEKY21saFhlNDZwWk5K
   Z1dLYnhaYWg4NWpJang5NWhSOHZPSStOQU01aUg5a09xSzEzRHJ4YWNUS1Bo
   cWo1UGp3RgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2012-10-03 00:00:00.000000000 Z
+date: 2012-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri