mongrel2 0.11.0 → 0.12.0

data/ChangeLog

@@ -1,8 +1,53 @@
+2012-02-17  Michael Granger  <ged@FaerieMUD.org>
+
+	* .rvmrc:
+	Remove patchlevel from gemset spec
+	[fc0c896f4bb1] [github/master, tip]
+
+2012-02-15  Michael Granger  <ged@FaerieMUD.org>
+
+	* README.rdoc, lib/mongrel2/config/filter.rb:
+	Flesh out docs for the Filter config class.
+	[67e37e22865a]
+
+	* examples/config.rb:
+	Merge with github/master
+	[d37994025a31]
+
+2012-02-06  Michael Granger  <ged@FaerieMUD.org>
+
+	* bin/m2sh.rb, examples/admin.rb, examples/config.rb,
+	lib/mongrel2/config/dsl.rb, lib/mongrel2/config/server.rb:
+	Make the DSL declarations destructive.
+	[f2edffaa7e40]
+
+2012-02-15  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.11.0 for changeset a0e0b4af6b13
+	[b00b1f48853a]
+
+	* .hgsigs:
+	Added signature for changeset 5d438ea6037a
+	[a0e0b4af6b13] [v0.11.0]
+
+	* History.rdoc, lib/mongrel2.rb:
+	Bump the minor version and update History.
+	[5d438ea6037a]
+
+	* lib/mongrel2/httprequest.rb, spec/mongrel2/httprequest_spec.rb:
+	Add some more convenience methods to the HTTPRequest class
+	[3cd4a2a9ac08]
+
+	* DSL.rdoc, Manifest.txt, Rakefile, lib/mongrel2/config/dsl.rb:
+	Finish up the DSL documentation.
+	[a3e959af5272]
+
 2012-02-10  Michael Granger  <ged@FaerieMUD.org>
 
 	* examples/config.rb, lib/mongrel2/config/dsl.rb:
 	Start work on detailed docs for the config DSL
-	[fd35a1c88881] [tip]
+	[fd35a1c88881]
 
 2012-02-06  Michael Granger  <ged@FaerieMUD.org>
 

data/History.rdoc

@@ -1,3 +1,10 @@
+== v0.12.0 [2012-02-17] Michael Granger <ged@FaerieMUD.org>
+
+- Add bodiless response predicate to Mongrel2::HTTPResponse.
+- Add #put and #delete factory methods to the Mongrel2::RequestFactory.
+- Flesh out docs for the Filter config class.
+
+
 == v0.11.0 [2012-02-15] Michael Granger <ged@FaerieMUD.org>
 
 - Make the DSL declarations replace existing records.

data/README.rdoc

@@ -78,6 +78,7 @@ schema, etc.
   * Mongrel2::Config::Setting
   * Mongrel2::Config::Mimetype
   * Mongrel2::Config::Statistic
+  * Mongrel2::Config::Filter
   * Mongrel2::Config::Log
 
 

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.11.0'
+	VERSION = '0.12.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 5d438ea6037a $
+	REVISION = %q$Revision: 7cd687a35c4c $
 
 
 	require 'mongrel2/logging'

data/lib/mongrel2/config/filter.rb

@@ -5,7 +5,29 @@ require 'tnetstring'
 require 'mongrel2' unless defined?( Mongrel2 )
 require 'mongrel2/config' unless defined?( Mongrel2::Config )
 
-# Mongrel2 Host configuration class
+# Mongrel2 Filter configuration class
+#
+#   # Using the config DSL:
+#   filter '/usr/local/lib/mongrel2/filters/null.so',
+#       extensions: ["*.html", "*.txt"],
+#       min_size: 1000
+#
+#   # Which is the same as:
+#   Mongrel2::Config::Filter.create(
+#       mame: '/usr/local/lib/mongrel2/filters/null.so',
+#       settings: {
+#         extensions: ["*.html", "*.txt"],
+#         min_size: 1000
+#       }
+#
+#   # Or:
+#   server.add_filter(
+#       mame: '/usr/local/lib/mongrel2/filters/null.so',
+#       settings: {
+#         extensions: ["*.html", "*.txt"],
+#         min_size: 1000
+#       })
+#
 class Mongrel2::Config::Filter < Mongrel2::Config( :filter )
 
 	### As of Mongrel2/1.7.5:

data/lib/mongrel2/constants.rb

@@ -153,6 +153,18 @@ module Mongrel2::Constants
 		    510 => "Not Extended"
 		}
 
+		# A registry of HTTP status codes that don't allow an entity body
+		# in the response.
+		BODILESS_HTTP_RESPONSE_CODES = [
+			CONTINUE,
+			SWITCHING_PROTOCOLS,
+			PROCESSING,
+			NO_CONTENT,
+			RESET_CONTENT,
+			NOT_MODIFIED,
+			USE_PROXY,
+		]
+
 	end
 
 

data/lib/mongrel2/httpresponse.rb

@@ -80,6 +80,13 @@ class Mongrel2::HTTPResponse < Mongrel2::Response
 	alias_method :is_handled?, :handled?
 
 
+	### Returns true if the response status means the response
+	### shouldn't have a body.
+	def bodiless?
+		return HTTP::BODILESS_HTTP_RESPONSE_CODES.include?( self.status )
+	end
+
+
 	### Return the numeric category of the response's status code (1-5)
 	def status_category
 		return 0 if self.status.nil?

data/lib/mongrel2/testing.rb

@@ -133,6 +133,35 @@ module Mongrel2
 		end
 
 
+		### Create a new PUT Mongrel2::Request for the specified +uri+ with
+		### the given +body+ and +headers+.
+		def put( uri, body='', headers={} )
+			raise "Request doesn't route through %p" % [ self.route ] unless
+				uri.start_with?( self.route )
+
+			headers = self.make_merged_headers( :PUT, uri, headers )
+			rclass = Mongrel2::Request.subclass_for_method( :PUT )
+
+			req = rclass.new( self.sender_id, self.conn_id.to_s, uri.to_s, headers )
+			req.body = body
+
+			return req
+		end
+
+
+		### Create a new DELETE Mongrel2::Request for the specified +uri+ with
+		### the given +headers+.
+		def delete( uri, headers={} )
+			raise "Request doesn't route through %p" % [ self.route ] unless
+				uri.start_with?( self.route )
+
+			headers = self.make_merged_headers( :DELETE, uri, headers )
+			rclass = Mongrel2::Request.subclass_for_method( :DELETE )
+
+			return rclass.new( self.sender_id, self.conn_id.to_s, uri.to_s, headers )
+		end
+
+
 		#########
 		protected
 		#########

data/spec/mongrel2/httpresponse_spec.rb

@@ -183,6 +183,18 @@ describe Mongrel2::HTTPResponse do
 	end
 
 
+	it "knows that a 100 response shouldn't have a body" do
+		@response.status = HTTP::CONTINUE
+		@response.should be_bodiless()
+	end
+
+
+	it "knows that a 204 response shouldn't have a body" do
+		@response.status = HTTP::NO_CONTENT
+		@response.should be_bodiless()
+	end
+
+
 	it "knows what the response content type is" do
 		@response.headers['Content-Type'] = 'text/erotica'
 		@response.content_type.should == 'text/erotica'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongrel2
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,50 +9,38 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain:
-- ! '-----BEGIN CERTIFICATE-----
-
-  MIIDLDCCAhSgAwIBAgIBADANBgkqhkiG9w0BAQUFADA8MQwwCgYDVQQDDANnZWQx
-
-  FzAVBgoJkiaJk/IsZAEZFgdfYWVyaWVfMRMwEQYKCZImiZPyLGQBGRYDb3JnMB4X
-
-  DTEwMDkxNjE0NDg1MVoXDTExMDkxNjE0NDg1MVowPDEMMAoGA1UEAwwDZ2VkMRcw
-
-  FQYKCZImiZPyLGQBGRYHX2FlcmllXzETMBEGCgmSJomT8ixkARkWA29yZzCCASIw
-
-  DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALy//BFxC1f/cPSnwtJBWoFiFrir
-
-  h7RicI+joq/ocVXQqI4TDWPyF/8tqkvt+rD99X9qs2YeR8CU/YiIpLWrQOYST70J
-
-  vDn7Uvhb2muFVqq6+vobeTkILBEO6pionWDG8jSbo3qKm1RjKJDwg9p4wNKhPuu8
-
-  KGue/BFb67KflqyApPmPeb3Vdd9clspzqeFqp7cUBMEpFS6LWxy4Gk+qvFFJBJLB
-
-  BUHE/LZVJMVzfpC5Uq+QmY7B+FH/QqNndn3tOHgsPadLTNimuB1sCuL1a4z3Pepd
-
-  TeLBEFmEao5Dk3K/Q8o8vlbIB/jBDTUx6Djbgxw77909x6gI9doU4LD5XMcCAwEA
-
-  AaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFJeoGkOr9l4B
-
-  +saMkW/ZXT4UeSvVMA0GCSqGSIb3DQEBBQUAA4IBAQBG2KObvYI2eHyyBUJSJ3jN
-
-  vEnU3d60znAXbrSd2qb3r1lY1EPDD3bcy0MggCfGdg3Xu54z21oqyIdk8uGtWBPL
-
-  HIa9EgfFGSUEgvcIvaYqiN4jTUtidfEFw+Ltjs8AP9gWgSIYS6Gr38V0WGFFNzIH
-
-  aOD2wmu9oo/RffW4hS/8GuvfMzcw7CQ355wFR4KB/nyze+EsZ1Y5DerCAagMVuDQ
-
-  U0BLmWDFzPGGWlPeQCrYHCr+AcJz+NRnaHCKLZdSKj/RHuTOt+gblRex8FAh8NeA
-
-  cmlhXe46pZNJgWKbxZah85jIjx95hR8vOI+NAM5iH9kOqK13DrxacTKPhqj5PjwF
-
-  -----END CERTIFICATE-----
-
-'
-date: 2012-02-16 00:00:00.000000000 Z
+- !binary |-
+  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURMRENDQWhTZ0F3SUJB
+  Z0lCQURBTkJna3Foa2lHOXcwQkFRVUZBREE4TVF3d0NnWURWUVFEREFOblpX
+  UXgKRnpBVkJnb0praWFKay9Jc1pBRVpGZ2RmWVdWeWFXVmZNUk13RVFZS0Na
+  SW1pWlB5TEdRQkdSWURiM0puTUI0WApEVEV3TURreE5qRTBORGcxTVZvWERU
+  RXhNRGt4TmpFME5EZzFNVm93UERFTU1Bb0dBMVVFQXd3RFoyVmtNUmN3CkZR
+  WUtDWkltaVpQeUxHUUJHUllIWDJGbGNtbGxYekVUTUJFR0NnbVNKb21UOGl4
+  a0FSa1dBMjl5WnpDQ0FTSXcKRFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURD
+  Q0FRb0NnZ0VCQUx5Ly9CRnhDMWYvY1BTbnd0SkJXb0ZpRnJpcgpoN1JpY0kr
+  am9xL29jVlhRcUk0VERXUHlGLzh0cWt2dCtyRDk5WDlxczJZZVI4Q1UvWWlJ
+  cExXclFPWVNUNzBKCnZEbjdVdmhiMm11RlZxcTYrdm9iZVRrSUxCRU82cGlv
+  bldERzhqU2JvM3FLbTFSaktKRHdnOXA0d05LaFB1dTgKS0d1ZS9CRmI2N0tm
+  bHF5QXBQbVBlYjNWZGQ5Y2xzcHpxZUZxcDdjVUJNRXBGUzZMV3h5NEdrK3F2
+  RkZKQkpMQgpCVUhFL0xaVkpNVnpmcEM1VXErUW1ZN0IrRkgvUXFObmRuM3RP
+  SGdzUGFkTFROaW11QjFzQ3VMMWE0ejNQZXBkClRlTEJFRm1FYW81RGszSy9R
+  OG84dmxiSUIvakJEVFV4NkRqYmd4dzc3OTA5eDZnSTlkb1U0TEQ1WE1jQ0F3
+  RUEKQWFNNU1EY3dDUVlEVlIwVEJBSXdBREFMQmdOVkhROEVCQU1DQkxBd0hR
+  WURWUjBPQkJZRUZKZW9Ha09yOWw0Qgorc2FNa1cvWlhUNFVlU3ZWTUEwR0NT
+  cUdTSWIzRFFFQkJRVUFBNElCQVFCRzJLT2J2WUkyZUh5eUJVSlNKM2pOCnZF
+  blUzZDYwem5BWGJyU2QycWIzcjFsWTFFUEREM2JjeTBNZ2dDZkdkZzNYdTU0
+  ejIxb3F5SWRrOHVHdFdCUEwKSElhOUVnZkZHU1VFZ3ZjSXZhWXFpTjRqVFV0
+  aWRmRUZ3K0x0anM4QVA5Z1dnU0lZUzZHcjM4VjBXR0ZGTnpJSAphT0Qyd211
+  OW9vL1JmZlc0aFMvOEd1dmZNemN3N0NRMzU1d0ZSNEtCL255emUrRXNaMVk1
+  RGVyQ0FhZ01WdURRClUwQkxtV0RGelBHR1dsUGVRQ3JZSENyK0FjSnorTlJu
+  YUhDS0xaZFNLai9SSHVUT3QrZ2JsUmV4OEZBaDhOZUEKY21saFhlNDZwWk5K
+  Z1dLYnhaYWg4NWpJang5NWhSOHZPSStOQU01aUg5a09xSzEzRHJ4YWNUS1Bo
+  cWo1UGp3RgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
+date: 2012-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70337700771620 !ruby/object:Gem::Requirement
+  requirement: &70186557497160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -60,10 +48,10 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70337700771620
+  version_requirements: *70186557497160
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &70337700771160 !ruby/object:Gem::Requirement
+  requirement: &70186557496640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -71,10 +59,10 @@ dependencies:
         version: '3.31'
   type: :runtime
   prerelease: false
-  version_requirements: *70337700771160
+  version_requirements: *70186557496640
 - !ruby/object:Gem::Dependency
   name: amalgalite
-  requirement: &70337700770600 !ruby/object:Gem::Requirement
+  requirement: &70186557496120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -82,10 +70,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70337700770600
+  version_requirements: *70186557496120
 - !ruby/object:Gem::Dependency
   name: tnetstring
-  requirement: &70337700770060 !ruby/object:Gem::Requirement
+  requirement: &70186557495600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -93,10 +81,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70337700770060
+  version_requirements: *70186557495600
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70337700769520 !ruby/object:Gem::Requirement
+  requirement: &70186557495180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -104,10 +92,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70337700769520
+  version_requirements: *70186557495180
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70337700769020 !ruby/object:Gem::Requirement
+  requirement: &70186557494640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -115,10 +103,10 @@ dependencies:
         version: '1.16'
   type: :runtime
   prerelease: false
-  version_requirements: *70337700769020
+  version_requirements: *70186557494640
 - !ruby/object:Gem::Dependency
   name: sysexits
-  requirement: &70337700768500 !ruby/object:Gem::Requirement
+  requirement: &70186557494140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -126,10 +114,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70337700768500
+  version_requirements: *70186557494140
 - !ruby/object:Gem::Dependency
   name: zmq
-  requirement: &70337700767980 !ruby/object:Gem::Requirement
+  requirement: &70186557493620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -137,10 +125,10 @@ dependencies:
         version: 2.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70337700767980
+  version_requirements: *70186557493620
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
-  requirement: &70337700767500 !ruby/object:Gem::Requirement
+  requirement: &70186557493100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -148,10 +136,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *70337700767500
+  version_requirements: *70186557493100
 - !ruby/object:Gem::Dependency
   name: hoe-highline
-  requirement: &70337700766940 !ruby/object:Gem::Requirement
+  requirement: &70186557492580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -159,10 +147,10 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *70337700766940
+  version_requirements: *70186557492580
 - !ruby/object:Gem::Dependency
   name: configurability
-  requirement: &70337700766400 !ruby/object:Gem::Requirement
+  requirement: &70186557491940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -170,10 +158,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70337700766400
+  version_requirements: *70186557491940
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70337700765860 !ruby/object:Gem::Requirement
+  requirement: &70186557490880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -181,10 +169,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70337700765860
+  version_requirements: *70186557490880
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70337700765360 !ruby/object:Gem::Requirement
+  requirement: &70186557506660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -192,10 +180,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *70337700765360
+  version_requirements: *70186557506660
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70337700764820 !ruby/object:Gem::Requirement
+  requirement: &70186557506040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -203,7 +191,7 @@ dependencies:
         version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: *70337700764820
+  version_requirements: *70186557506040
 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,
@@ -329,7 +317,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mongrel2
-rubygems_version: 1.8.10
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Ruby-Mongrel2 is a complete Ruby (1.9-only) connector for  Mongrel2[http://mongrel2.org/]