mongrel2 0.6.0 → 0.7.0

data/ChangeLog

@@ -1,8 +1,38 @@
+2011-10-09  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.7.0 for changeset c20d38b9cd67
+	[db86ba6a709e] [tip]
+
+	* .hgsigs:
+	Added signature for changeset 297e73f3ad7a
+	[c20d38b9cd67] [v0.7.0]
+
+	* History.rdoc, lib/mongrel2.rb:
+	Bumped minor version, updated History.
+	[297e73f3ad7a]
+
+	* lib/mongrel2/response.rb, spec/mongrel2/response_spec.rb:
+	Add an optional #request parameter to Mongrel2::Response and make
+	Response.from_request set it. This is to make things like content-
+	negotiation less of a pain in the ass.
+	[4fb3017de357]
+
+2011-10-05  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/mongrel2/handler.rb:
+	Log request and response both at INFO.
+	[56361e8db7bd]
+
 2011-10-03  Michael Granger  <ged@FaerieMUD.org>
 
+	* History.rdoc:
+	Fixing the header in History
+	[0583c789593c]
+
 	* .hgtags:
 	Added tag v0.6.0 for changeset 4d0e21e8b7f8
-	[bc11f65d120d] [tip]
+	[bc11f65d120d]
 
 	* .hgsigs:
 	Added signature for changeset 8234d3fa985b
@@ -23,7 +53,7 @@
 	encoding headers: #content_type, #content_encoding
 	- Switched the specs to use Mongrel2::RequestFactory for making
 	request objects
-	[d0d1a93982fc]
+	[d0d1a93982fc] [github/master]
 
 2011-09-30  Michael Granger  <ged@FaerieMUD.org>
 
@@ -48,7 +78,7 @@
 
 	* .hgtags:
 	Added tag v0.4.0 for changeset 25f2272fc9f8
-	[0b4e011b72b4] [github/master]
+	[0b4e011b72b4]
 
 	* .hgsigs:
 	Added signature for changeset 3fb74e2ce308
@@ -296,18 +326,14 @@
 	* Automated merge with ssh://deveiate.org/Ruby-Mongrel2
 	[2da76acfb8db]
 
-	* Rakefile:
-	Automated merge with ssh://deveiate.org/Ruby-Mongrel2
-	[e3908fd8e744]
-
-	* Rakefile:
-	Remove ChangeLog task, since hoe-deveiate already does it
-	[5f4982a32949]
-
 	* History.rdoc:
 	Updating History
 	[3b013d4918c6]
 
+	* Rakefile:
+	Automated merge with ssh://deveiate.org/Ruby-Mongrel2
+	[e3908fd8e744]
+
 	* .hgtags:
 	Added tag v0.1.1 for changeset 42da048fe158
 	[2489be2693d5]
@@ -324,6 +350,10 @@
 	Updated rbzmq dependency
 	[758fe465780e]
 
+	* Rakefile:
+	Remove ChangeLog task, since hoe-deveiate already does it
+	[5f4982a32949]
+
 	* .hgtags:
 	Added tag v0.1.0 for changeset 55c8f01c01c6
 	[39b509c68142]
@@ -365,10 +395,6 @@
 	Merged with 3659a56af8fb
 	[f2201728e874]
 
-	* .hgignore:
-	Ignoring packaging directory
-	[0613976b6735]
-
 2011-09-12  Michael Granger  <ged@FaerieMUD.org>
 
 	* README.rdoc:
@@ -437,6 +463,12 @@
 	procedures.
 	[19e0a72320dd]
 
+2011-09-13  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgignore:
+	Ignoring packaging directory
+	[0613976b6735]
+
 2011-09-10  Michael Granger  <ged@FaerieMUD.org>
 
 	* bin/m2sh.rb:
@@ -477,18 +509,6 @@
 	* Merged with 6ea60b67e106
 	[6d5341f30cc4]
 
-	* Manifest.txt:
-	Updating the manifest for the first release
-	[916a79570cdc]
-
-	* examples/helloworld-handler.rb, lib/mongrel2/handler.rb:
-	More Handler API docs.
-	[47427db9b4fb]
-
-	* lib/mongrel2/handler.rb:
-	Adding some Mongrel2::Handler API docs.
-	[da95bfdf83da]
-
 	* lib/mongrel2/config/host.rb:
 	Adding a many_to_one association for the server belonging to a
 	Mongrel2::Config::Host
@@ -508,6 +528,18 @@
 	Adding a proftools dump of the requestdumper app
 	[00cbc1b89a61]
 
+	* Manifest.txt:
+	Updating the manifest for the first release
+	[916a79570cdc]
+
+	* examples/helloworld-handler.rb, lib/mongrel2/handler.rb:
+	More Handler API docs.
+	[47427db9b4fb]
+
+	* lib/mongrel2/handler.rb:
+	Adding some Mongrel2::Handler API docs.
+	[da95bfdf83da]
+
 2011-09-08  Michael Granger  <ged@FaerieMUD.org>
 
 	* README.rdoc, lib/mongrel2.rb, lib/mongrel2/config.rb,

data/History.rdoc

@@ -1,4 +1,12 @@
-## v0.6.0 [2011-10-03] Michael Granger <ged@FaerieMUD.org>
+== v0.7.0 [2011-10-09] Michael Granger <ged@FaerieMUD.org>
+
+- Add an optional #request attribute to Mongrel2::Response and make
+  Response.from_request set it. This is to make things like content-
+  negotiation less of a pain in the ass.
+- Log request and response both at INFO.
+
+
+== v0.6.0 [2011-10-03] Michael Granger <ged@FaerieMUD.org>
 
 Mongrel2::HTTPRequest enhancements.
 - Added #body= for rewriting the entity body

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.6.0'
+	VERSION = '0.7.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: c2ffa52b95e8 $
+	REVISION = %q$Revision: 297e73f3ad7a $
 
 
 	require 'mongrel2/logging'

data/lib/mongrel2/handler.rb

@@ -159,15 +159,15 @@ class Mongrel2::Handler
 	def start_accepting_requests
 		until @conn.closed?
 			req = @conn.receive
-			self.log.info "%p via %s:%d" % [ req.class, req.sender_id, req.conn_id ]
+			self.log.info( req.inspect )
 
 			res = self.dispatch_request( req )
 
 			if res
-				self.log.debug "  responding with a %p" % [ res.class ]
+				self.log.info( res.inspect )
 				@conn.reply( res ) unless @conn.closed?
 			else
-				self.log.debug "  no response; ignoring."
+				self.log.info "  no response; ignoring."
 			end
 		end
 	rescue ZMQ::Error => err

data/lib/mongrel2/response.rb

@@ -19,7 +19,10 @@ class Mongrel2::Response
 	### Create a response to the specified +request+ and return it.
 	def self::from_request( request )
 		Mongrel2.log.debug "Creating a %p to request %p" % [ self, request ]
-		return new( request.sender_id, request.conn_id )
+		response = new( request.sender_id, request.conn_id )
+		response.request = request
+
+		return response
 	end
 
 
@@ -28,6 +31,7 @@ class Mongrel2::Response
 		@sender_id = sender_id
 		@conn_id   = conn_id
 		@body      = body
+		@request   = nil
 	end
 
 
@@ -46,6 +50,9 @@ class Mongrel2::Response
 	# The body of the response
 	attr_accessor :body
 
+	# The request that this response is for, if there is one
+	attr_accessor :request
+
 
 	### Append the given +object+ to the response body. Returns the response for
 	### chaining.

data/spec/mongrel2/response_spec.rb

@@ -42,6 +42,7 @@ describe Mongrel2::Response do
 		response.should be_a( Mongrel2::Response )
 		response.sender_id.should == req.sender_id
 		response.conn_id.should == req.conn_id
+		response.request.should equal( req )
 	end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongrel2
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -48,11 +48,11 @@ cert_chain:
   -----END CERTIFICATE-----
 
 '
-date: 2011-10-03 00:00:00.000000000Z
+date: 2011-10-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70332659324060 !ruby/object:Gem::Requirement
+  requirement: &2169400600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -60,10 +60,10 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70332659324060
+  version_requirements: *2169400600
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &70332659323600 !ruby/object:Gem::Requirement
+  requirement: &2169399460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -71,10 +71,10 @@ dependencies:
         version: '3.26'
   type: :runtime
   prerelease: false
-  version_requirements: *70332659323600
+  version_requirements: *2169399460
 - !ruby/object:Gem::Dependency
   name: amalgalite
-  requirement: &70332659323100 !ruby/object:Gem::Requirement
+  requirement: &2169398740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -82,10 +82,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70332659323100
+  version_requirements: *2169398740
 - !ruby/object:Gem::Dependency
   name: tnetstring
-  requirement: &70332659322480 !ruby/object:Gem::Requirement
+  requirement: &2169397920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -93,10 +93,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70332659322480
+  version_requirements: *2169397920
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70332659322040 !ruby/object:Gem::Requirement
+  requirement: &2169397080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -104,10 +104,10 @@ dependencies:
         version: '0.8'
   type: :runtime
   prerelease: false
-  version_requirements: *70332659322040
+  version_requirements: *2169397080
 - !ruby/object:Gem::Dependency
   name: zmq
-  requirement: &70332659321520 !ruby/object:Gem::Requirement
+  requirement: &2169396360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -115,10 +115,10 @@ dependencies:
         version: 2.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70332659321520
+  version_requirements: *2169396360
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
-  requirement: &70332659321000 !ruby/object:Gem::Requirement
+  requirement: &2169395800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -126,10 +126,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *70332659321000
+  version_requirements: *2169395800
 - !ruby/object:Gem::Dependency
   name: hoe-highline
-  requirement: &70332659320420 !ruby/object:Gem::Requirement
+  requirement: &2169394780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -137,10 +137,10 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *70332659320420
+  version_requirements: *2169394780
 - !ruby/object:Gem::Dependency
   name: configurability
-  requirement: &70332659319940 !ruby/object:Gem::Requirement
+  requirement: &2169393980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -148,10 +148,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70332659319940
+  version_requirements: *2169393980
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70332659319500 !ruby/object:Gem::Requirement
+  requirement: &2169392940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -159,10 +159,10 @@ dependencies:
         version: '2.4'
   type: :development
   prerelease: false
-  version_requirements: *70332659319500
+  version_requirements: *2169392940
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70332659318960 !ruby/object:Gem::Requirement
+  requirement: &2169392060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -170,7 +170,7 @@ dependencies:
         version: '2.12'
   type: :development
   prerelease: false
-  version_requirements: *70332659318960
+  version_requirements: *2169392060
 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,