mongrel2 0.43.0 → 0.43.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12160066fe026f98304d28971ff0b2e226fd79e9
-  data.tar.gz: 0139d54e247c836355752a2e83f30d5242b963cc
+  metadata.gz: 7f7852405a9d60c17ae16546869be99a7e042457
+  data.tar.gz: 709c3eb15aeeca3cb090b2d75bb9f18510adbe58
 SHA512:
-  metadata.gz: 920463a4faef21f95e5c59acb5d0711dbca704c3a58ca1d58fe7c2e441fab2066acf9e9845d807d28fce13e8ad6aae7f952ae841f33a0629ad02e937b0ebf7c9
-  data.tar.gz: 1b8f9649334fafabeac082c4756e300983ea3edbb3138a1e7f46beae032269045bd3606d4df00175dea17a0564ebb7f3665da1ca037b9653472e072e25db870a
+  metadata.gz: d44d49fabcaa5dc7e967758f10db8934fe73c8c184356a94222ccfa524d26570e254427c7caf8dbe5c8188a287ba8cedda0c75c71d0eab246d3be8430a21c09e
+  data.tar.gz: 37f057770da4532f7fa95cef17cc26d7a853f31b0ee94e7b7df5175320b74d07674443a4f666b0a7a817d24ebe9eddb41ebbae11aaeb610b76d88c7d5e835fdf

data/ChangeLog

@@ -1,3 +1,122 @@
+2015-10-01  Michael Granger  <ged@FaerieMUD.org>
+
+	* .gems:
+	Update gemset to latest versions
+	[23b8eb49ae8f] [tip]
+
+2015-03-25  Michael Granger  <ged@FaerieMUD.org>
+
+	* Rakefile, cert/ged.pem, mongrel2.gemspec:
+	Add gem-signing cert, update gemspec.
+	[96ebb5bc8842]
+
+	* History.rdoc, lib/mongrel2.rb:
+	Bump the patch version, update history.
+	[d86faeea99f6] [github/master]
+
+	* lib/mongrel2/constants.rb:
+	Remove some duplicated constant
+	[85071d5a6e4c]
+
+	* .gems, .rvm.gems, .rvmrc, .travis.yml, mongrel2.gemspec:
+	Update build info/metadata
+	[1a7418ecaea7]
+
+2015-02-27  Michael Granger  <ged@FaerieMUD.org>
+
+	* README.rdoc:
+	Update README copyright date
+	[df7a087db39a]
+
+	* Rakefile, mongrel2.gemspec:
+	Update some more build stuff
+	[7b403211aaf3]
+
+	* .rvm.gems:
+	Update the gemset
+	[feb6b5965c9e]
+
+	* .hgignore, .rvmrc, .travis.yml, Gemfile, Rakefile, mongrel2.gemspec:
+	Prep for travis-ci builds
+	[466b050ae437]
+
+2014-12-17  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.43.0 for changeset 6ccc672a1e21
+	[654293091c6f]
+
+	* .hgsigs:
+	Added signature for changeset dfce5a80c5bf
+	[6ccc672a1e21] [v0.43.0]
+
+	* History.rdoc, lib/mongrel2.rb:
+	Bump the minor version, update history.
+	[dfce5a80c5bf]
+
+	* lib/mongrel2/config/route.rb, lib/mongrel2/request.rb,
+	spec/mongrel2/request_spec.rb:
+	Add a Mongrel2::Request#server_chroot
+
+	Used to qualify filesystem paths relative to Mongrel's chroot for
+	sendfile, async upload, etc.
+	[804d47dcfc31]
+
+2014-08-27  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.42.0 for changeset 4e4bb9e3f183
+	[62d0426be7ef]
+
+	* .hgsigs:
+	Added signature for changeset b8be09d1fd14
+	[4e4bb9e3f183] [v0.42.0]
+
+	* History.rdoc, Manifest.txt, lib/mongrel2.rb:
+	Bump minor version, update history.
+	[b8be09d1fd14]
+
+	* lib/mongrel2/connection.rb:
+	Fix trailing whitespace
+	[6ec2281fc759]
+
+2014-06-27  Michael Granger  <ged@FaerieMUD.org>
+
+	* examples/Procfile, examples/config.rb, examples/run,
+	examples/sendfile.rb, lib/mongrel2/connection.rb,
+	lib/mongrel2/httpresponse.rb, lib/mongrel2/response.rb,
+	spec/helpers.rb, spec/mongrel2/connection_spec.rb,
+	spec/mongrel2/handler_spec.rb, spec/mongrel2/response_spec.rb:
+	Add support for sending extended replies
+	[3f69a81fdff9]
+
+2014-02-03  Michael Granger  <ged@FaerieMUD.org>
+
+	* README.rdoc:
+	Fix a few things in the README
+	[dbdf2b174c6a]
+
+2014-02-02  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.41.0 for changeset 3bb618a3996c
+	[9bacd8a069f8]
+
+	* .hgsigs:
+	Added signature for changeset 2915d3c8a0e3
+	[3bb618a3996c] [v0.41.0]
+
+	* History.rdoc, lib/mongrel2.rb:
+	Bump the minor version, update history.
+	[2915d3c8a0e3]
+
+	* .rvm.gems, Gemfile, Rakefile, lib/mongrel2.rb,
+	lib/mongrel2/connection.rb, lib/mongrel2/control.rb,
+	spec/mongrel2/connection_spec.rb, spec/mongrel2/control_spec.rb,
+	spec/mongrel2/handler_spec.rb:
+	Convert back to rbczmq for modern mongrel2s
+	[6a193623272b]
+
 2014-01-15  Michael Granger  <ged@FaerieMUD.org>
 
 	* .rvm.gems, .simplecov, Manifest.txt, Rakefile,
@@ -12,7 +131,7 @@
 	table.
 	- Add more config introspection to the Mongrel2::Handler class.
 	- Fix spec syntax deprecated in RSpec 3.
-	[d0e689f9de52] [tip]
+	[d0e689f9de52]
 
 	* lib/mongrel2/xmlrequest.rb, spec/mongrel2/xmlrequest_spec.rb:
 	Use LibXML instead of Nokogiri for XML request type
@@ -117,7 +236,7 @@
 	spec/mongrel2/config/dsl_spec.rb,
 	spec/mongrel2/config/xrequest_spec.rb:
 	Add support for 1.8.1's "X-Requests"
-	[ce2c1f560e76] [github/master]
+	[ce2c1f560e76]
 
 	* .hgtags:
 	Added tag v0.38.0 for changeset 94a931fa3c89
@@ -746,7 +865,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] [github/master@default]
+	[e2384875455d]
 
 	* .tm_properties, data/mongrel2/bootstrap.html, examples/.env,
 	examples/Procfile, examples/async-upload.rb, examples/config.rb,

data/History.rdoc

@@ -1,3 +1,13 @@
+== v0.43.2 [2015-03-25] Michael Granger <ged@FaerieMUD.org>
+
+Bugfixes:
+
+- Remove some duplicated status codes that warn under Ruby 2.2.
+- Remove some debug logging that errors under Ruby 2.2.
+
+== v0.43.1 (yanked: no signed tag)
+
+
 == v0.43.0 [2014-12-17] Michael Granger <ged@FaerieMUD.org>
 
 - Add a Mongrel2::Request#server_chroot

data/README.rdoc

@@ -173,7 +173,7 @@ This implementation differs from them in several ways:
 
 == License
 
-Copyright (c) 2011-2014, Michael Granger
+Copyright (c) 2011-2015, Michael Granger
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/Rakefile

@@ -1,21 +1,19 @@
 #!/usr/bin/env rake
 
+require 'rake/clean'
+require 'rdoc/task'
+
 begin
 	require 'hoe'
 rescue LoadError
 	abort "This Rakefile requires 'hoe' (gem install hoe)"
 end
 
-# Work around borked RSpec support in this version
-if Hoe::VERSION == '2.12.0'
-	warn "Ignore warnings about not having rspec; it's a bug in Hoe 2.12.0"
-	require 'rspec'
-end
+GEMSPEC = 'mongrel2.gemspec'
 
 Hoe.plugin :mercurial
 Hoe.plugin :signing
 Hoe.plugin :deveiate
-Hoe.plugin :bundler
 
 Hoe.plugins.delete :rubyforge
 
@@ -41,26 +39,18 @@ hoespec = Hoe.spec 'mongrel2' do
 	self.dependency 'configurability', '~> 2.0', :developer
 	self.dependency 'simplecov',       '~> 0.7', :developer
 	self.dependency 'hoe-deveiate',    '~> 0.3', :developer
-	self.dependency 'hoe-bundler',     '~> 1.2', :developer
-
-	self.spec_extras[:rdoc_options] = ['-f', 'fivefish', '-t', 'Mongrel2 Ruby Connector']
-	self.require_ruby_version( '>= 1.9.2' )
+	self.dependency 'rdoc-generator-fivefish', '~> 0', :development
 
+	self.require_ruby_version( '>=2.0.0' )
 	self.hg_sign_tags = true if self.respond_to?( :hg_sign_tags= )
 	self.check_history_on_release = true if self.respond_to?( :check_history_on_release= )
-
 	self.rdoc_locations << "deveiate:/usr/local/www/public/code/#{remote_rdoc_dir}"
 end
 
 ENV['VERSION'] ||= hoespec.spec.version.to_s
 
 # Ensure the specs pass before checking in
-task 'hg:precheckin' => [:check_manifest, :check_history, :spec]
-
-# Rebuild the ChangeLog immediately before release
-task :prerelease => [:check_manifest, :check_history, 'ChangeLog']
-
-task :check_manifest => 'ChangeLog'
+task 'hg:precheckin' => [ :check_history, :check_manifest, :gemspec, :spec ]
 
 
 desc "Build a coverage report"
@@ -68,4 +58,35 @@ task :coverage do
 	ENV["COVERAGE"] = 'yes'
 	Rake::Task[:spec].invoke
 end
+CLOBBER.include( 'coverage' )
+
+
+# Use the fivefish formatter for docs generated from development checkout
+if File.directory?( '.hg' )
+	require 'rdoc/task'
+
+	Rake::Task[ 'docs' ].clear
+	RDoc::Task.new( 'docs' ) do |rdoc|
+	    rdoc.main = "README.rdoc"
+	    rdoc.rdoc_files.include( "*.rdoc", "ChangeLog", "lib/**/*.rb" )
+	    rdoc.generator = :fivefish
+		rdoc.title = 'Ruby-Mongrel2'
+	    rdoc.rdoc_dir = 'doc'
+	end
+end
+
+task :gemspec => GEMSPEC
+file GEMSPEC => __FILE__
+task GEMSPEC do |task|
+	spec = $hoespec.spec
+	spec.files.delete( '.gemtest' )
+	spec.signing_key = nil
+	spec.cert_chain = ['certs/ged.pem']
+	spec.version = "#{spec.version.bump}.0.pre#{Time.now.strftime("%Y%m%d%H%M%S")}"
+	File.open( task.name, 'w' ) do |fh|
+		fh.write( spec.to_ruby )
+	end
+end
+
+CLOBBER.include( GEMSPEC.to_s )
 

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.43.0'
+	VERSION = '0.43.2'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: dfce5a80c5bf $
+	REVISION = %q$Revision: 17359ad421b0 $
 
 
 	require 'mongrel2/constants'

data/lib/mongrel2/connection.rb

@@ -105,7 +105,7 @@ class Mongrel2::Connection
 
 		self.log.debug "Fetching next request (PULL)"
 		data = self.request_sock.recv
-		self.log.debug "  got %s request data: %p" % [ data.encoding.name, data ]
+		self.log.debug "  got %d bytes of %s request data" % [ data.bytesize, data.encoding.name ]
 		return data
 	end
 
@@ -123,7 +123,7 @@ class Mongrel2::Connection
 		self.check_closed
 		header = "%s %d:%s," % [ sender_id, conn_id.to_s.length, conn_id ]
 		buf = header + ' ' + data
-		self.log.debug "Sending response (PUB): %p" % [ buf ]
+		self.log.debug "Sending response (PUB)"
 		self.response_sock.send( buf )
 		self.log.debug "  done with send (%d bytes)" % [ buf.bytesize ]
 	end
@@ -133,7 +133,7 @@ class Mongrel2::Connection
 	### +sender_id+ as an extended response of type +response_type+.
 	def send_extended( sender_id, conn_id, response_type, *data )
 		self.check_closed
-		self.log.debug "Sending response with %s extended reply (PUB): %p" % [ response_type, data ]
+		self.log.debug "Sending response with %s extended reply (PUB)"
 		header = "%s %d:X %s," % [ sender_id, conn_id.to_s.length + 2, conn_id ]
 		buf = header + ' ' + TNetstring.dump( [response_type] + data )
 		self.response_sock.send( buf )

data/lib/mongrel2/constants.rb

@@ -135,22 +135,6 @@ module Mongrel2::Constants
 		    419 => "Undefined HTTP Status",
 		    420 => "Undefined HTTP Status",
 		    421 => "Undefined HTTP Status",
-		    406 => "Not Acceptable",
-		    407 => "Proxy Authentication Required",
-		    408 => "Request Time-out",
-		    409 => "Conflict",
-		    410 => "Gone",
-		    411 => "Length Required",
-		    412 => "Precondition Failed",
-		    413 => "Request Entity Too Large",
-		    414 => "Request-URI Too Large",
-		    415 => "Unsupported Media Type",
-		    416 => "Requested Range Not Satisfiable",
-		    417 => "Expectation Failed",
-		    418 => "Undefined HTTP Status",
-		    419 => "Undefined HTTP Status",
-		    420 => "Undefined HTTP Status",
-		    421 => "Undefined HTTP Status",
 		    422 => "Unprocessable Entity",
 		    423 => "Locked",
 		    424 => "Failed Dependency",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongrel2
 version: !ruby/object:Gem::Version
-  version: 0.43.0
+  version: 0.43.2
 platform: ruby
 authors:
 - Michael Granger
@@ -12,7 +12,7 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDbDCCAlSgAwIBAgIBATANBgkqhkiG9w0BAQUFADA+MQwwCgYDVQQDDANnZWQx
   GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
-  HhcNMTQwMzE5MDQzNTI2WhcNMTUwMzE5MDQzNTI2WjA+MQwwCgYDVQQDDANnZWQx
+  HhcNMTUwNDAxMjEyNDEzWhcNMTYwMzMxMjEyNDEzWjA+MQwwCgYDVQQDDANnZWQx
   GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
   ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDb92mkyYwuGBg1oRxt2tkH
   +Uo3LAsaL/APBfSLzy8o3+B3AUHKCjMUaVeBoZdWtMHB75X3VQlvXfZMyBxj59Vo
@@ -23,14 +23,14 @@ cert_chain:
   AgMBAAGjdTBzMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBSZ0hCV
   qoHr122fGKelqffzEQBhszAcBgNVHREEFTATgRFnZWRARmFlcmllTVVELm9yZzAc
   BgNVHRIEFTATgRFnZWRARmFlcmllTVVELm9yZzANBgkqhkiG9w0BAQUFAAOCAQEA
-  TuL1Bzl6TBs1YEzEubFHb9XAPgehWzzUudjDKzTRd+uyZmxnomBqTCQjT5ucNRph
-  3jZ6bhLNooLQxTjIuHodeGcEMHZdt4Yi7SyPmw5Nry12z6wrDp+5aGps3HsE5WsQ
-  Zq2EuyEOc96g31uoIvjNdieKs+1kE+K+dJDjtw+wTH2i63P7r6N/NfPPXpxsFquo
-  wcYRRrHdR7GhdJeT+V8Q8Bi5bglCUGdx+8scMgkkePc98k9osQHypbACmzO+Bqkv
-  c7ZKPJcWBv0sm81+FCZXNACn2f9jfF8OQinxVs0O052KbGuEQaaiGIYeuuwQE2q6
-  ggcrPfcYeTwWlfZPu2LrBg==
+  lUKo3NXePpuvN3QGsOLJ6QhNd4+Q9Rz75GipuMrCl296V8QFkd2gg9EG44Pqtk+9
+  Zac8TkKc9bCSR0snakp+cCPplVvZF0/gMzkSTUJkDBHlNV16z73CyWpbQQa+iLJ4
+  uisI6gF2ZXK919MYLn2bFJfb7OsCvVfyTPqq8afPY+rq9vlf9ZPwU49AlD8bPRic
+  0LX0gO5ykvETIOv+WgGcqp96ceNi9XVuJMh20uWuw6pmv/Ub2RqAf82jQSbpz09G
+  G8LHR7EjtPPmqCCunfyecJ6MmCNaiJCBxq2NYzyNmluPyHT8+0fuB5kccUVZm6CD
+  xn3DzOkDE6NYbk8gC9rTsA==
   -----END CERTIFICATE-----
-date: 2014-12-17 00:00:00.000000000 Z
+date: 2015-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -178,14 +178,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: hoe-highline
   requirement: !ruby/object:Gem::Requirement
@@ -257,33 +257,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: hoe-bundler
+  name: rdoc-generator-fivefish
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.14'
 description: |-
   Ruby-Mongrel2 is a complete Ruby connector for Mongrel2[http://mongrel2.org/].
 
@@ -394,17 +394,15 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- "-f"
-- fivefish
-- "-t"
-- Mongrel2 Ruby Connector
+- "--main"
+- README.rdoc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -412,7 +410,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Ruby-Mongrel2 is a complete Ruby connector for Mongrel2[http://mongrel2.org/]