mongrel2 0.0.2 → 0.1.0

data/History.rdoc

@@ -1,3 +1,14 @@
+== v0.1.0 [2011-11-14] Michael Granger <ged@FaerieMUD.org>
+
+Memoize Mongrel2::Request#response, and add Mongrel2::Request.response_class to
+allow for easy overriding of the response type.
+
+
+== v0.0.2 [2011-11-13] Michael Granger <ged@FaerieMUD.org>
+
+Added a shim to work around lack of ZMQ::Error in zmq-2.1.3.
+
+
 == v0.0.1 [2011-09-12] Michael Granger <ged@FaerieMUD.org>
 
 Initial release.

data/Rakefile

@@ -46,28 +46,10 @@ ENV['VERSION'] ||= hoespec.spec.version.to_s
 # Ensure the specs pass before checking in
 task 'hg:precheckin' => :spec
 
-### Make the ChangeLog update if the repo has changed since it was last built
-file '.hg/branch'
-file 'ChangeLog' => '.hg/branch' do |task|
-	$stderr.puts "Updating the changelog..."
-	abort "Can't create the ChangeLog without hoe-mercurial (gem install hoe-mercurial)" unless
-		defined?( MercurialHelpers )
-
-	content = MercurialHelpers.make_changelog()
-	File.open( task.name, 'w', 0644 ) do |fh|
-		fh.print( content )
-	end
-end
 
 # Rebuild the ChangeLog immediately before release
 task :prerelease => 'ChangeLog'
 
-if Rake::Task.task_defined?( '.gemtest' )
-	Rake::Task['.gemtest'].clear
-	task '.gemtest' do
-		$stderr.puts "Not including a .gemtest until I'm confident the test suite is idempotent."
-	end
-end
 
 desc "Build a coverage report"
 task :coverage do

data/lib/mongrel2.rb

@@ -22,10 +22,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.0.2'
+	VERSION = '0.1.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: c39289ec700e $
+	REVISION = %q$Revision: da03e18009f8 $
 
 
 	require 'mongrel2/logging'

data/lib/mongrel2/httprequest.rb

@@ -16,9 +16,9 @@ class Mongrel2::HTTPRequest < Mongrel2::Request
 	register_request_type( self, *HANDLED_HTTP_METHODS )
 
 
-	### Create a Mongrel2::HTTPResponse that corresponds to the receiver.
-	def response
-		return Mongrel2::HTTPResponse.from_request( self )
+	### Override the type of response returned by this request type.
+	def self::response_class
+		return Mongrel2::HTTPResponse
 	end
 
 

data/lib/mongrel2/request.rb

@@ -19,6 +19,35 @@ class Mongrel2::Request
 	class << self; attr_reader :request_types; end
 
 
+	### Parse the given +raw_request+ from a Mongrel2 server and return an appropriate
+	### request object.
+	def self::parse( raw_request )
+		sender, conn_id, path, rest = raw_request.split( ' ', 4 )
+		Mongrel2.log.debug "Parsing request for %p from %s:%s (rest: %p)" %
+			[ path, sender, conn_id, rest ]
+
+		# Extract the headers and the body, ignore the rest
+		headers, rest = TNetstring.parse( rest )
+		body, _       = TNetstring.parse( rest )
+
+		# Headers will be a JSON String when not using the TNetString protocol
+		if headers.is_a?( String )
+			Mongrel2.log.debug "  parsing old-style headers"
+			headers = Yajl::Parser.parse( headers )
+		end
+
+		# This isn't supposed to happen, but guard against it anyway
+		headers['METHOD'] =~ /^(\w+)$/ or
+			raise Mongrel2::UnhandledMethodError, headers['METHOD']
+		req_method = $1.untaint.to_sym
+		Mongrel2.log.debug "Request method is: %p" % [ req_method ]
+		concrete_class = self.subclass_for_method( req_method )
+
+		return concrete_class.new( sender, conn_id, path, headers, body, raw_request )
+	end
+
+
+
 	### Register the specified +subclass+ as the class to instantiate when the +METHOD+
 	### header is one of the specified +req_methods+. This method exists for frameworks
 	### which wish to provide their own Request types.
@@ -63,35 +92,17 @@ class Mongrel2::Request
 	end
 
 
-	### Parse the given +raw_request+ from a Mongrel2 server and return an appropriate
-	### request object.
-	def self::parse( raw_request )
-		sender, conn_id, path, rest = raw_request.split( ' ', 4 )
-		Mongrel2.log.debug "Parsing request for %p from %s:%s (rest: %p)" %
-			[ path, sender, conn_id, rest ]
-
-		# Extract the headers and the body, ignore the rest
-		headers, rest = TNetstring.parse( rest )
-		body, _       = TNetstring.parse( rest )
-
-		# Headers will be a JSON String when not using the TNetString protocol
-		if headers.is_a?( String )
-			Mongrel2.log.debug "  parsing old-style headers"
-			headers = Yajl::Parser.parse( headers )
-		end
-
-		# This isn't supposed to happen, but guard against it anyway
-		headers['METHOD'] =~ /^(\w+)$/ or
-			raise Mongrel2::UnhandledMethodError, headers['METHOD']
-		req_method = $1.untaint.to_sym
-		Mongrel2.log.debug "Request method is: %p" % [ req_method ]
-		concrete_class = self.subclass_for_method( req_method )
-
-		return concrete_class.new( sender, conn_id, path, headers, body, raw_request )
+	### Return the Mongrel2::Response class that corresponds with the receiver.
+	def self::response_class
+		return Mongrel2::Response
 	end
 
 
 
+	#################################################################
+	###	I N S T A N C E   M E T H O D S
+	#################################################################
+
 	### Create a new Request object with the given +sender_id+, +conn_id+, +path+, +headers+, 
 	### and +body+. The optional +nil+ is for the raw request content, which can be useful
 	### later for debugging.
@@ -101,8 +112,9 @@ class Mongrel2::Request
 		@path      = path
 		@headers   = Mongrel2::Table.new( headers )
 		@body      = body
-
 		@raw       = raw
+
+		@response  = nil
 	end
 
 
@@ -132,11 +144,13 @@ class Mongrel2::Request
 
 	### Create a Mongrel2::Response that will respond to the same server/connection as
 	### the receiver. If you wish your specialized Request class to have a corresponding
-	### response type, you can override this method to achieve that.
+	### response type, you can override the Mongrel2::Request.response_class method 
+	### to achieve that.
 	def response
-		return Mongrel2::Response.from_request( self )
+		return @response ||= self.class.response_class.from_request( self )
 	end
 
+
 	### Return +true+ if the request is a special 'disconnect' notification from Mongrel2.
 	def is_disconnect?
 		return false

data/spec/mongrel2/request_spec.rb

@@ -84,6 +84,10 @@ describe Mongrel2::Request do
 		}.to raise_error( Mongrel2::UnhandledMethodError, /!DIVULGE/ )
 	end
 
+	it "knows what kind of response it should return" do
+		Mongrel2::Request.response_class.should == Mongrel2::Response
+	end
+
 
 	describe "instances" do
 
@@ -99,6 +103,10 @@ describe Mongrel2::Request do
 			result.conn_id.should == @req.conn_id
 		end
 
+		it "remembers its response if it's already made one" do
+			@req.response.should equal( @req.response )
+		end
+
 	end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongrel2
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -48,11 +48,11 @@ cert_chain:
   -----END CERTIFICATE-----
 
 '
-date: 2011-09-13 00:00:00.000000000Z
+date: 2011-09-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70185768624780 !ruby/object:Gem::Requirement
+  requirement: &2164717460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -60,10 +60,10 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70185768624780
+  version_requirements: *2164717460
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &70185768624200 !ruby/object:Gem::Requirement
+  requirement: &2164715720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -71,10 +71,10 @@ dependencies:
         version: '3.26'
   type: :runtime
   prerelease: false
-  version_requirements: *70185768624200
+  version_requirements: *2164715720
 - !ruby/object:Gem::Dependency
   name: amalgalite
-  requirement: &70185768623640 !ruby/object:Gem::Requirement
+  requirement: &2164713820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -82,10 +82,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70185768623640
+  version_requirements: *2164713820
 - !ruby/object:Gem::Dependency
   name: tnetstring
-  requirement: &70185768623060 !ruby/object:Gem::Requirement
+  requirement: &2164710820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -93,10 +93,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70185768623060
+  version_requirements: *2164710820
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70185768622520 !ruby/object:Gem::Requirement
+  requirement: &2164709340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -104,10 +104,10 @@ dependencies:
         version: '0.8'
   type: :runtime
   prerelease: false
-  version_requirements: *70185768622520
+  version_requirements: *2164709340
 - !ruby/object:Gem::Dependency
   name: zmq
-  requirement: &70185768621940 !ruby/object:Gem::Requirement
+  requirement: &2164707660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -115,21 +115,21 @@ dependencies:
         version: 2.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70185768621940
+  version_requirements: *2164707660
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
-  requirement: &70185768621380 !ruby/object:Gem::Requirement
+  requirement: &2164704600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.2.1
   type: :development
   prerelease: false
-  version_requirements: *70185768621380
+  version_requirements: *2164704600
 - !ruby/object:Gem::Dependency
   name: hoe-highline
-  requirement: &70185768620760 !ruby/object:Gem::Requirement
+  requirement: &2164701340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -137,10 +137,10 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *70185768620760
+  version_requirements: *2164701340
 - !ruby/object:Gem::Dependency
   name: configurability
-  requirement: &70185768620240 !ruby/object:Gem::Requirement
+  requirement: &2164697700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -148,10 +148,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70185768620240
+  version_requirements: *2164697700
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70185768619780 !ruby/object:Gem::Requirement
+  requirement: &2164694360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -159,18 +159,18 @@ dependencies:
         version: '2.4'
   type: :development
   prerelease: false
-  version_requirements: *70185768619780
+  version_requirements: *2164694360
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70185768619220 !ruby/object:Gem::Requirement
+  requirement: &2164685760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '2.11'
   type: :development
   prerelease: false
-  version_requirements: *70185768619220
+  version_requirements: *2164685760
 description: ! "A complete Ruby connector for Mongrel2[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,