mongrel2 0.44.0 → 0.45.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26139efa603e33508d75a1ce39b158d5c3c9718a
-  data.tar.gz: e4cd15d5ff533a8139f6c3b0601c6a9ec7ae1b7a
+  metadata.gz: 1ef619e111641754b0668683b6ef6c81f28c3134
+  data.tar.gz: 28a063bc82ad32cd833f5ad892de69e468ddc032
 SHA512:
-  metadata.gz: a036ca5e4bac09a1a03d1c4c75b8451c543c081384a8407f3c27ae8acd00dc477909edb7d03470ada71613c92961f944be442ab4bcbd0a02a5144c026ef4364d
-  data.tar.gz: 1ce62fe189f10d61946a01e7d9857da78359668bc943ace456b46ca3a55b183084b403c9629d3b1cf326245cd79d6aaf21f167a4a819e47f9085aa965bac3af7
+  metadata.gz: deb67e014b158c381a4db03aba4cca3f6332b13765f54a6937be8f24b013250f86005ed51f6cc596b612daa464fc1e08a319286e6d938c1a87ae655662115bc9
+  data.tar.gz: 317de2b99b390406841bf76954413dc2053045f54cd1d0d9feb05221f75f7e1ef3b4cf4d1009255dd53baa597366de82744f899f2c54c0217da6eb9a513e057a

data/ChangeLog

@@ -1,10 +1,315 @@
+2016-11-03  Michael Granger  <ged@FaerieMUD.org>
+
+	* History.rdoc, lib/mongrel2.rb:
+	Bump minor version, update history
+	[0ef122fb3bb8] [github/master, tip]
+
+	* lib/mongrel2/httprequest.rb, mongrel2.gemspec,
+	spec/mongrel2/httprequest_spec.rb:
+	Guard against HTTP requests with a nil body.size.
+	[ac7a50bb284d]
+
+	* lib/mongrel2/connection.rb, spec/mongrel2/connection_spec.rb:
+	Handle recv errors that don't set a ZMQ.error
+	[7650088eeaa1]
+
+	* .gems, .ruby-gemset, .ruby-version, .rvmrc, Rakefile:
+	Bump minimum Ruby version, update deps and build files
+	[39e753039b65]
+
+	* spec/mongrel2/config/directory_spec.rb,
+	spec/mongrel2/config/dsl_spec.rb,
+	spec/mongrel2/config/handler_spec.rb,
+	spec/mongrel2/config/log_spec.rb,
+	spec/mongrel2/config/route_spec.rb,
+	spec/mongrel2/config/server_spec.rb, spec/mongrel2/config_spec.rb,
+	spec/mongrel2/control_spec.rb, spec/mongrel2/handler_spec.rb,
+	spec/mongrel2/httprequest_spec.rb,
+	spec/mongrel2/httpresponse_spec.rb, spec/mongrel2/table_spec.rb,
+	spec/mongrel2/websocket_spec.rb:
+	Update spec logging for newer Loggability versions
+	[cb9adc83077b]
+
+	* lib/mongrel2/config.rb:
+	Make Mongrel2::Config a proper abstract subclass of Sequel::Model.
+
+	 diff --git a/lib/mongrel2/connection.rb
+	b/lib/mongrel2/connection.rb
+	--- a/lib/mongrel2/connection.rb +++ b/lib/mongrel2/connection.rb @@
+	-104,7 +104,7 @@ class Mongrel2::Connection self.check_closed
+
+	 self.log.debug "Fetching next request (PULL)"
+	-		data = self.request_sock.recv or raise( ZMQ.error ) + data =
+	self.request_sock.recv or raise( ZMQ.error || 'unknown error' )
+	self.log.debug " got %d bytes of %s request data" % [ data.bytesize,
+	data.encoding.name ] return data end diff --git
+	a/lib/mongrel2/httprequest.rb b/lib/mongrel2/httprequest.rb
+	--- a/lib/mongrel2/httprequest.rb +++ b/lib/mongrel2/httprequest.rb
+	@@ -109,12 +109,14 @@ class Mongrel2::HTTPRequest < Mongrel2::
+
+	 ### Return the details to include in the contents of the #inspected
+	object. def inspect_details + body_size = self.body.size || 0 +
+	return %Q{[%s] "%s %s %s" -- %0.2fK body} % [
+	self.headers.x_forwarded_for, self.headers[:method],
+	self.headers.uri, self.headers.version,
+	-			(self.body.size / 1024.0), + (body_size / 1024.0), ] end
+
+	diff --git a/spec/mongrel2/config/directory_spec.rb
+	b/spec/mongrel2/config/directory_spec.rb
+	--- a/spec/mongrel2/config/directory_spec.rb +++
+	b/spec/mongrel2/config/directory_spec.rb @@ -14,7 +14,6 @@ require
+	'mongrel2/config' describe Mongrel2::Config::Directory do
+
+	 before( :all ) do
+	-		setup_logging() setup_config_db() end
+
+	@@ -26,10 +25,6 @@ describe Mongrel2::Config::Directory do ) end
+
+	- after( :all ) do
+	-		reset_logging()
+	-	end
+	-
+
+	 	it "is valid if its base, index_file, and default_ctype are all
+	valid" do expect( @dir ).to be_valid() diff --git
+	a/spec/mongrel2/config/dsl_spec.rb
+	b/spec/mongrel2/config/dsl_spec.rb
+	--- a/spec/mongrel2/config/dsl_spec.rb +++
+	b/spec/mongrel2/config/dsl_spec.rb @@ -16,7 +16,6 @@ describe
+	Mongrel2::Config::DSL do include described_class
+
+	 before( :all ) do
+	-		setup_logging() setup_config_db() end
+
+	@@ -24,10 +23,6 @@ describe Mongrel2::Config::DSL do
+	clean_config_db() end
+
+	- after( :all ) do
+	-		reset_logging()
+	-	end
+	-
+
+	 	describe 'servers' do it "can generate a default server config using
+	the 'server' declarative" do diff --git
+	a/spec/mongrel2/config/handler_spec.rb
+	b/spec/mongrel2/config/handler_spec.rb
+	--- a/spec/mongrel2/config/handler_spec.rb +++
+	b/spec/mongrel2/config/handler_spec.rb @@ -14,7 +14,6 @@ require
+	'mongrel2/config' describe Mongrel2::Config::Handler do
+
+	 before( :all ) do
+	-		setup_logging() setup_config_db() end
+
+	@@ -28,9 +27,7 @@ describe Mongrel2::Config::Handler do ) end
+
+	- after( :all ) do
+	-		reset_logging()
+	-	end +
+
+	 it "is valid if its specs and identities are all valid" do expect(
+	@handler ).to be_valid() diff --git
+	a/spec/mongrel2/config/log_spec.rb
+	b/spec/mongrel2/config/log_spec.rb
+	--- a/spec/mongrel2/config/log_spec.rb +++
+	b/spec/mongrel2/config/log_spec.rb @@ -16,14 +16,9 @@ require
+	'mongrel2/config' describe Mongrel2::Config::Log do
+
+	 before( :all ) do
+	-		setup_logging() setup_config_db() end
+
+	- after( :all ) do
+	-		reset_logging()
+	-	end
+	-
+
+	 	it "has a convenience method for writing to the commit log" do what
+	= 'load etc/mongrel2.conf' diff --git
+	a/spec/mongrel2/config/route_spec.rb
+	b/spec/mongrel2/config/route_spec.rb
+	--- a/spec/mongrel2/config/route_spec.rb +++
+	b/spec/mongrel2/config/route_spec.rb @@ -14,7 +14,6 @@ require
+	'mongrel2/config' describe Mongrel2::Config::Route do
+
+	 before( :all ) do
+	-		setup_logging() setup_config_db() end
+
+	@@ -22,10 +21,6 @@ describe Mongrel2::Config::Route do @route =
+	Mongrel2::Config::Route.new( :path => '' ) end
+
+	- after( :all ) do
+	-		reset_logging()
+	-	end
+	-
+
+	 	it "returns a Mongrel2::Config::Directory if its target_type is
+	'dir'" do dir = Mongrel2::Config::Directory.create( diff --git
+	a/spec/mongrel2/config/server_spec.rb
+	b/spec/mongrel2/config/server_spec.rb
+	--- a/spec/mongrel2/config/server_spec.rb +++
+	b/spec/mongrel2/config/server_spec.rb @@ -14,7 +14,6 @@ require
+	'mongrel2/config' describe Mongrel2::Config::Server do
+
+	 before( :all ) do
+	-		setup_logging() setup_config_db() end
+
+	@@ -30,10 +29,6 @@ describe Mongrel2::Config::Server do ) end
+
+	- after( :all ) do
+	-		reset_logging()
+	-	end
+	-
+
+	 	it "is valid if its access_log, error_log, pid_file, default_host,
+	and port are all valid" do expect( @server ).to be_valid() diff
+	--git a/spec/mongrel2/config_spec.rb b/spec/mongrel2/config_spec.rb
+	--- a/spec/mongrel2/config_spec.rb +++ b/spec/mongrel2/config_spec.rb
+	@@ -13,12 +13,10 @@ require 'mongrel2/config' describe
+	Mongrel2::Config do
+
+	 before( :all ) do
+	-		setup_logging() setup_config_db() end
+
+	 after( :all ) do
+	-		reset_logging() File.delete( 'config-spec.sqlite' ) if File.exist?(
+	'config.spec.sqlite' ) end
+
+	diff --git a/spec/mongrel2/control_spec.rb
+	b/spec/mongrel2/control_spec.rb
+	--- a/spec/mongrel2/control_spec.rb +++
+	b/spec/mongrel2/control_spec.rb @@ -13,7 +13,6 @@ require
+	'mongrel2/control' describe Mongrel2::Control do
+
+	 before( :all ) do
+	-		setup_logging() end
+
+	 before( :each ) do @@ -30,7 +29,6 @@ describe Mongrel2::Control do
+
+	 after( :all ) do Mongrel2.instance_variable_set( :@zmq_ctx, nil )
+	-		reset_logging() end
+
+	 diff --git a/spec/mongrel2/handler_spec.rb
+	b/spec/mongrel2/handler_spec.rb
+	--- a/spec/mongrel2/handler_spec.rb +++
+	b/spec/mongrel2/handler_spec.rb @@ -35,14 +35,9 @@ describe
+	Mongrel2::Handler do
+
+	 before( :all ) do
+	-		setup_logging() setup_config_db() end
+
+	- after( :all ) do
+	-		reset_logging()
+	-	end
+	-
+
+	 	# Ensure 0MQ never actually gets called before( :each ) do diff
+	--git a/spec/mongrel2/httprequest_spec.rb
+	b/spec/mongrel2/httprequest_spec.rb
+	--- a/spec/mongrel2/httprequest_spec.rb +++
+	b/spec/mongrel2/httprequest_spec.rb @@ -17,7 +17,6 @@ require
+	'mongrel2/httpresponse' describe Mongrel2::HTTPRequest do
+
+	 before( :all ) do
+	-		setup_logging() @factory = Mongrel2::RequestFactory.new( route:
+	'/glamour' ) end
+
+	@@ -25,10 +24,6 @@ describe Mongrel2::HTTPRequest do @req =
+	@factory.get( '/glamour/test' ) end
+
+	- after( :all ) do
+	-		reset_logging()
+	-	end
+	-
+
+	 	it "can create an HTTPResponse for itself" do result = @req.response
+	diff --git a/spec/mongrel2/httpresponse_spec.rb
+	b/spec/mongrel2/httpresponse_spec.rb
+	--- a/spec/mongrel2/httpresponse_spec.rb +++
+	b/spec/mongrel2/httpresponse_spec.rb @@ -14,18 +14,10 @@ require
+	'mongrel2/httpresponse'
+
+	 describe Mongrel2::HTTPResponse do
+
+	- before( :all ) do
+	-		setup_logging()
+	-	end
+	-
+	 	before( :each ) do @response = Mongrel2::HTTPResponse.new(
+	TEST_UUID, 299 ) end
+
+	- after( :all ) do
+	-		reset_logging()
+	-	end
+	-
+
+	 	it "has a headers table" do expect( @response.headers ).to be_a(
+	Mongrel2::Table ) diff --git a/spec/mongrel2/table_spec.rb
+	b/spec/mongrel2/table_spec.rb
+	--- a/spec/mongrel2/table_spec.rb +++ b/spec/mongrel2/table_spec.rb
+	@@ -12,19 +12,10 @@ require 'mongrel2/table'
+
+	 describe Mongrel2::Table do
+
+	-
+	-	before( :all ) do
+	-		setup_logging()
+	-	end
+	-
+	 	before( :each ) do @table = Mongrel2::Table.new end
+
+	- after( :all ) do
+	-		reset_logging()
+	-	end
+	-
+
+
+	 	it "allows setting/fetching case-insensitively" do diff --git
+	a/spec/mongrel2/websocket_spec.rb b/spec/mongrel2/websocket_spec.rb
+	--- a/spec/mongrel2/websocket_spec.rb +++
+	b/spec/mongrel2/websocket_spec.rb @@ -19,13 +19,9 @@ require
+	'mongrel2/websocket' describe Mongrel2::WebSocket do
+
+	 before( :all ) do
+	-		setup_logging() @factory = Mongrel2::WebSocketFrameFactory.new(
+	route: '/websock' ) end
+
+	- after( :all ) do
+	-		reset_logging()
+	-	end
+
+	 # Data for testing payload of binary frames BINARY_DATA =
+	[8f14a1070996]
+
+2016-01-25  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/mongrel2/connection.rb, spec/mongrel2/connection_spec.rb:
+	Raise ZMQ::Error on nil return from Connection#recv
+	[1a53994c72a0]
+
+2016-01-20  Michael Granger  <ged@FaerieMUD.org>
+
+	* README.rdoc:
+	Update the copyright years in the README
+	[2e78a59ae16d]
+
+	* .hgtags:
+	Added tag v0.44.0 for changeset 56fc8d5a0a66
+	[b4239188fb4d]
+
+	* .hgsigs:
+	Added signature for changeset 796ca99139a6
+	[56fc8d5a0a66] [v0.44.0]
+
+	* History.rdoc, lib/mongrel2.rb:
+	Bump the minor version, update history.
+	[796ca99139a6]
+
 2016-01-20  Mahlon E. Smith  <mahlon@martini.nu>
 
 	* lib/mongrel2/handler.rb, lib/mongrel2/request.rb, spec/helpers.rb,
 	spec/mongrel2/config/dsl_spec.rb, spec/mongrel2/handler_spec.rb:
 	Ensure that Mongrel2 spool files are removed after the lifetime of a
 	request.
-	[250431675079] [github/master, tip]
+	[250431675079]
 
 2015-12-30  Mahlon E. Smith  <mahlon@martini.nu>
 

data/History.rdoc

@@ -1,3 +1,12 @@
+== v0.45.0 [2016-11-03] Michael Granger <ged@FaerieMUD.org>
+
+Bugfixes:
+
+- Guard against HTTP requests with a nil body.size.
+- Make Mongrel2::Config a proper abstract subclass of Sequel::Model.
+- Raise ZMQ::Error on nil return from Connection#recv
+
+
 == v0.44.0 [2016-01-20] Mahlon E. Smith <mahlon@martini.nu>
 
 Enhancements:

data/README.rdoc

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

data/Rakefile

@@ -30,18 +30,18 @@ hoespec = Hoe.spec 'mongrel2' do
 	self.dependency 'yajl-ruby',   '~> 1.0'
 	self.dependency 'trollop',     '~> 2.0'
 	self.dependency 'sysexits',    '~> 1.1'
-	self.dependency 'rbczmq',     '~> 1.7'
-	self.dependency 'loggability','~> 0.5'
+	self.dependency 'rbczmq',      '~> 1.7'
+	self.dependency 'loggability', '~> 0.11'
 	self.dependency 'sqlite3',     '~> 1.3'
 	self.dependency 'libxml-ruby', '~> 2.7'
 
-	self.dependency 'amalgalite',      '~> 1.3', :developer
-	self.dependency 'configurability', '~> 2.0', :developer
-	self.dependency 'simplecov',       '~> 0.7', :developer
-	self.dependency 'hoe-deveiate',    '~> 0.3', :developer
+	self.dependency 'amalgalite',      '~> 1.5', :developer
+	self.dependency 'configurability', '~> 2.2', :developer
+	self.dependency 'simplecov',       '~> 0.12', :developer
+	self.dependency 'hoe-deveiate',    '~> 0.8', :developer
 	self.dependency 'rdoc-generator-fivefish', '~> 0', :development
 
-	self.require_ruby_version( '>=2.0.0' )
+	self.require_ruby_version( '>=2.2.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}"

data/lib/mongrel2.rb

@@ -22,13 +22,13 @@ module Mongrel2
 	log_as :mongrel2
 
 
-	abort "\n\n>>> Mongrel2 requires Ruby 1.9.2 or later. <<<\n\n" if RUBY_VERSION < '1.9.2'
+	abort "\n\n>>> Mongrel2 requires Ruby 2.2 or later. <<<\n\n" if RUBY_VERSION < '2.2.0'
 
 	# Library version constant
-	VERSION = '0.44.0'
+	VERSION = '0.45.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 796ca99139a6 $
+	REVISION = %q$Revision: 0ef122fb3bb8 $
 
 
 	require 'mongrel2/constants'

data/lib/mongrel2/config.rb

@@ -32,6 +32,12 @@ require 'mongrel2/constants'
 
 module Mongrel2
 
+	# Initialize the Cozy::Postgres::Model class as an abstract model class (i.e.,
+	# without a default dataset). This prevents it from looking for a table called
+	# `models`, and makes inheriting it more straightforward.
+	# Thanks to Jeremy Evans for the suggestion.
+	Config = Class.new( Sequel::Model )
+
 	# The base Mongrel2 database-backed configuration class. It's a subclass of Sequel::Model, so
 	# you'll first need to be familiar with Sequel (http://sequel.rubyforge.org/) and
 	# especially its Sequel::Model ORM.
@@ -45,7 +51,7 @@ module Mongrel2
 	# == References
 	# * http://mongrel2.org/static/book-finalch4.html#x6-260003.4
 	#
-	class Config < Sequel::Model
+	class Config
 		extend Loggability
 		include Mongrel2::Constants
 
@@ -129,12 +135,14 @@ module Mongrel2
 			end
 
 			if self == Mongrel2::Config
-				self.log.debug "Resetting database connection for %d config classes to: %p" %
-					[ self.descendents.length, newdb ]
 				newdb.logger = Loggability[ Mongrel2 ].proxy_for( newdb )
 				newdb.sql_log_level = :debug
 
-				self.descendents.each {|subclass| subclass.db = newdb }
+				self.descendents.each do |subclass|
+					self.log.debug "Resetting database connection for %p to: %p" %
+						[ subclass, newdb ]
+					subclass.db = newdb
+				end
 			end
 		end
 

data/lib/mongrel2/connection.rb

@@ -104,7 +104,7 @@ class Mongrel2::Connection
 		self.check_closed
 
 		self.log.debug "Fetching next request (PULL)"
-		data = self.request_sock.recv
+		data = self.request_sock.recv or raise( ZMQ.error || 'unknown error' )
 		self.log.debug "  got %d bytes of %s request data" % [ data.bytesize, data.encoding.name ]
 		return data
 	end

data/lib/mongrel2/httprequest.rb

@@ -109,12 +109,14 @@ class Mongrel2::HTTPRequest < Mongrel2::Request
 
 	### Return the details to include in the contents of the #inspected object.
 	def inspect_details
+		body_size = self.body.size || 0
+
 		return %Q{[%s] "%s %s %s" -- %0.2fK body} % [
 			self.headers.x_forwarded_for,
 			self.headers[:method],
 			self.headers.uri,
 			self.headers.version,
-			(self.body.size / 1024.0),
+			(body_size / 1024.0),
 		]
 	end
 

data/spec/mongrel2/config/directory_spec.rb

@@ -14,7 +14,6 @@ require 'mongrel2/config'
 describe Mongrel2::Config::Directory do
 
 	before( :all ) do
-		setup_logging()
 		setup_config_db()
 	end
 
@@ -26,10 +25,6 @@ describe Mongrel2::Config::Directory do
 		)
 	end
 
-	after( :all ) do
-		reset_logging()
-	end
-
 
 	it "is valid if its base, index_file, and default_ctype are all valid" do
 		expect( @dir ).to be_valid()

data/spec/mongrel2/config/dsl_spec.rb

@@ -16,7 +16,6 @@ describe Mongrel2::Config::DSL do
 	include described_class
 
 	before( :all ) do
-		setup_logging()
 		setup_config_db()
 	end
 
@@ -24,10 +23,6 @@ describe Mongrel2::Config::DSL do
 		clean_config_db()
 	end
 
-	after( :all ) do
-		reset_logging()
-	end
-
 
 	describe 'servers' do
 		it "can generate a default server config using the 'server' declarative" do

data/spec/mongrel2/config/handler_spec.rb

@@ -14,7 +14,6 @@ require 'mongrel2/config'
 describe Mongrel2::Config::Handler do
 
 	before( :all ) do
-		setup_logging()
 		setup_config_db()
 	end
 
@@ -28,9 +27,7 @@ describe Mongrel2::Config::Handler do
 		)
 	end
 
-	after( :all ) do
-		reset_logging()
-	end
+
 
 	it "is valid if its specs and identities are all valid" do
 		expect( @handler ).to be_valid()

data/spec/mongrel2/config/log_spec.rb

@@ -16,14 +16,9 @@ require 'mongrel2/config'
 describe Mongrel2::Config::Log do
 
 	before( :all ) do
-		setup_logging()
 		setup_config_db()
 	end
 
-	after( :all ) do
-		reset_logging()
-	end
-
 
 	it "has a convenience method for writing to the commit log" do
 		what  = 'load etc/mongrel2.conf'

data/spec/mongrel2/config/route_spec.rb

@@ -14,7 +14,6 @@ require 'mongrel2/config'
 describe Mongrel2::Config::Route do
 
 	before( :all ) do
-		setup_logging()
 		setup_config_db()
 	end
 
@@ -22,10 +21,6 @@ describe Mongrel2::Config::Route do
 		@route = Mongrel2::Config::Route.new( :path => '' )
 	end
 
-	after( :all ) do
-		reset_logging()
-	end
-
 
 	it "returns a Mongrel2::Config::Directory if its target_type is 'dir'" do
 		dir = Mongrel2::Config::Directory.create(

data/spec/mongrel2/config/server_spec.rb

@@ -14,7 +14,6 @@ require 'mongrel2/config'
 describe Mongrel2::Config::Server do
 
 	before( :all ) do
-		setup_logging()
 		setup_config_db()
 	end
 
@@ -30,10 +29,6 @@ describe Mongrel2::Config::Server do
 		)
 	end
 
-	after( :all ) do
-		reset_logging()
-	end
-
 
 	it "is valid if its access_log, error_log, pid_file, default_host, and port are all valid" do
 		expect( @server ).to be_valid()

data/spec/mongrel2/config_spec.rb

@@ -13,12 +13,10 @@ require 'mongrel2/config'
 describe Mongrel2::Config do
 
 	before( :all ) do
-		setup_logging()
 		setup_config_db()
 	end
 
 	after( :all ) do
-		reset_logging()
 		File.delete( 'config-spec.sqlite' ) if File.exist?( 'config.spec.sqlite' )
 	end
 

data/spec/mongrel2/connection_spec.rb

@@ -14,7 +14,6 @@ describe Mongrel2::Connection do
 	include Mongrel2::Config::DSL
 
 	before( :all ) do
-		setup_logging()
 	end
 
 	# Ensure 0MQ never actually gets called
@@ -29,10 +28,6 @@ describe Mongrel2::Connection do
 		Mongrel2.instance_variable_set( :@zmq_ctx, nil )
 	end
 
-	after( :all ) do
-		reset_logging()
-	end
-
 
 	it "doesn't connect to the endpoints when it's created" do
 		expect( @conn.instance_variable_get( :@request_sock ) ).to be_nil()
@@ -124,6 +119,22 @@ describe Mongrel2::Connection do
 			expect( @conn.receive ).to be_a( Mongrel2::Request )
 		end
 
+		it "handles a socket error while receiving" do
+			expect( @request_sock ).to receive( :recv ).and_return( nil )
+			expect( ZMQ ).to receive( :error ).and_return( ZMQ::Error.new("something bad happened") )
+			expect {
+				@conn.receive
+			}.to raise_error( ZMQ::Error, 'something bad happened' )
+		end
+
+		it "handles a socket error that doesn't set an error message while receiving" do
+			expect( @request_sock ).to receive( :recv ).and_return( nil )
+			expect( ZMQ ).to receive( :error ).and_return( nil )
+			expect {
+				@conn.receive
+			}.to raise_error( RuntimeError, 'unknown error' )
+		end
+
 		it "can write raw response messages with a TNetString header onto the response_sock" do
 			expect( @response_sock ).to receive( :send ).with( "#{TEST_UUID} 1:8, the data" )
 			@conn.send( TEST_UUID, 8, "the data" )

data/spec/mongrel2/control_spec.rb

@@ -13,7 +13,6 @@ require 'mongrel2/control'
 describe Mongrel2::Control do
 
 	before( :all ) do
-		setup_logging()
 	end
 
 	before( :each ) do
@@ -30,7 +29,6 @@ describe Mongrel2::Control do
 
 	after( :all ) do
 		Mongrel2.instance_variable_set( :@zmq_ctx, nil )
-		reset_logging()
 	end
 
 

data/spec/mongrel2/handler_spec.rb

@@ -35,14 +35,9 @@ describe Mongrel2::Handler do
 
 
 	before( :all ) do
-		setup_logging()
 		setup_config_db()
 	end
 
-	after( :all ) do
-		reset_logging()
-	end
-
 
 	# Ensure 0MQ never actually gets called
 	before( :each ) do

data/spec/mongrel2/httprequest_spec.rb

@@ -17,7 +17,6 @@ require 'mongrel2/httpresponse'
 describe Mongrel2::HTTPRequest do
 
 	before( :all ) do
-		setup_logging()
 		@factory = Mongrel2::RequestFactory.new( route: '/glamour' )
 	end
 
@@ -25,10 +24,6 @@ describe Mongrel2::HTTPRequest do
 		@req = @factory.get( '/glamour/test' )
 	end
 
-	after( :all ) do
-		reset_logging()
-	end
-
 
 	it "can create an HTTPResponse for itself" do
 		result = @req.response
@@ -83,6 +78,13 @@ describe Mongrel2::HTTPRequest do
 		expect( @req ).to be_secure()
 	end
 
+	it "doesn't error when inspecting a bodiless instance" do
+		# I don't remember what circumstances this is guarding against, so this is a bit
+		# artificial
+		@req.body = double( "sizeless body", size: nil )
+		expect( @req.inspect ).to match( /0.00K body/ )
+	end
+
 
 	describe "header convenience methods" do
 

data/spec/mongrel2/httpresponse_spec.rb

@@ -14,18 +14,10 @@ require 'mongrel2/httpresponse'
 
 describe Mongrel2::HTTPResponse do
 
-	before( :all ) do
-		setup_logging()
-	end
-
 	before( :each ) do
 		@response = Mongrel2::HTTPResponse.new( TEST_UUID, 299 )
 	end
 
-	after( :all ) do
-		reset_logging()
-	end
-
 
 	it "has a headers table" do
 		expect( @response.headers ).to be_a( Mongrel2::Table )

data/spec/mongrel2/table_spec.rb

@@ -12,19 +12,10 @@ require 'mongrel2/table'
 
 describe Mongrel2::Table do
 
-
-	before( :all ) do
-		setup_logging()
-	end
-
 	before( :each ) do
 		@table = Mongrel2::Table.new
 	end
 
-	after( :all ) do
-		reset_logging()
-	end
-
 
 
 	it "allows setting/fetching case-insensitively" do

data/spec/mongrel2/websocket_spec.rb

@@ -19,13 +19,9 @@ require 'mongrel2/websocket'
 describe Mongrel2::WebSocket do
 
 	before( :all ) do
-		setup_logging()
 		@factory = Mongrel2::WebSocketFrameFactory.new( route: '/websock' )
 	end
 
-	after( :all ) do
-		reset_logging()
-	end
 
 	# Data for testing payload of binary frames
 	BINARY_DATA =

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongrel2
 version: !ruby/object:Gem::Version
-  version: 0.44.0
+  version: 0.45.0
 platform: ruby
 authors:
 - Michael Granger
@@ -10,27 +10,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDbDCCAlSgAwIBAgIBATANBgkqhkiG9w0BAQUFADA+MQwwCgYDVQQDDANnZWQx
+  MIIEbDCCAtSgAwIBAgIBATANBgkqhkiG9w0BAQsFADA+MQwwCgYDVQQDDANnZWQx
   GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
-  HhcNMTUwNDAxMjEyNDEzWhcNMTYwMzMxMjEyNDEzWjA+MQwwCgYDVQQDDANnZWQx
+  HhcNMTYwODIwMTgxNzQyWhcNMTcwODIwMTgxNzQyWjA+MQwwCgYDVQQDDANnZWQx
   GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
-  ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDb92mkyYwuGBg1oRxt2tkH
-  +Uo3LAsaL/APBfSLzy8o3+B3AUHKCjMUaVeBoZdWtMHB75X3VQlvXfZMyBxj59Vo
-  cDthr3zdao4HnyrzAIQf7BO5Y8KBwVD+yyXCD/N65TTwqsQnO3ie7U5/9ut1rnNr
-  OkOzAscMwkfQxBkXDzjvAWa6UF4c5c9kR/T79iA21kDx9+bUMentU59aCJtUcbxa
-  7kcKJhPEYsk4OdxR9q2dphNMFDQsIdRO8rywX5FRHvcb+qnXC17RvxLHtOjysPtp
-  EWsYoZMxyCDJpUqbwoeiM+tAHoz2ABMv3Ahie3Qeb6+MZNAtMmaWfBx3dg2u+/WN
-  AgMBAAGjdTBzMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBSZ0hCV
-  qoHr122fGKelqffzEQBhszAcBgNVHREEFTATgRFnZWRARmFlcmllTVVELm9yZzAc
-  BgNVHRIEFTATgRFnZWRARmFlcmllTVVELm9yZzANBgkqhkiG9w0BAQUFAAOCAQEA
-  lUKo3NXePpuvN3QGsOLJ6QhNd4+Q9Rz75GipuMrCl296V8QFkd2gg9EG44Pqtk+9
-  Zac8TkKc9bCSR0snakp+cCPplVvZF0/gMzkSTUJkDBHlNV16z73CyWpbQQa+iLJ4
-  uisI6gF2ZXK919MYLn2bFJfb7OsCvVfyTPqq8afPY+rq9vlf9ZPwU49AlD8bPRic
-  0LX0gO5ykvETIOv+WgGcqp96ceNi9XVuJMh20uWuw6pmv/Ub2RqAf82jQSbpz09G
-  G8LHR7EjtPPmqCCunfyecJ6MmCNaiJCBxq2NYzyNmluPyHT8+0fuB5kccUVZm6CD
-  xn3DzOkDE6NYbk8gC9rTsA==
+  ggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC/JWGRHO+USzR97vXjkFgt
+  83qeNf2KHkcvrRTSnR64i6um/ziin0I0oX23H7VYrDJC9A/uoUa5nGRJS5Zw/+wW
+  ENcvWVZS4iUzi4dsYJGY6yEOsXh2CcF46+QevV8iE+UmbkU75V7Dy1JCaUOyizEt
+  TH5UHsOtUU7k9TYARt/TgYZKuaoAMZZd5qyVqhF1vV+7/Qzmp89NGflXf2xYP26a
+  4MAX2qqKX/FKXqmFO+AGsbwYTEds1mksBF3fGsFgsQWxftG8GfZQ9+Cyu2+l1eOw
+  cZ+lPcg834G9DrqW2zhqUoLr1MTly4pqxYGb7XoDhoR7dd1kFE2a067+DzWC/ADt
+  +QkcqWUm5oh1fN0eqr7NsZlVJDulFgdiiYPQiIN7UNsii4Wc9aZqBoGcYfBeQNPZ
+  soo/6za/bWajOKUmDhpqvaiRv9EDpVLzuj53uDoukMMwxCMfgb04+ckQ0t2G7wqc
+  /D+K9JW9DDs3Yjgv9k4h7YMhW5gftosd+NkNC/+Y2CkCAwEAAaN1MHMwCQYDVR0T
+  BAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFHKN/nkRusdqCJEuq3lgB3fJvyTg
+  MBwGA1UdEQQVMBOBEWdlZEBGYWVyaWVNVUQub3JnMBwGA1UdEgQVMBOBEWdlZEBG
+  YWVyaWVNVUQub3JnMA0GCSqGSIb3DQEBCwUAA4IBgQAPJzKiT0zBU7kpqe0aS2qb
+  FI0PJ4y5I8buU4IZGUD5NEt/N7pZNfOyBxkrZkXhS44Fp+xwBH5ebLbq/WY78Bqd
+  db0z6ZgW4LMYMpWFfbXsRbd9TU2f52L8oMAhxOvF7Of5qJMVWuFQ8FPagk2iHrdH
+  inYLQagqAF6goWTXgAJCdPd6SNeeSNqA6vlY7CV1Jh5kfNJJ6xu/CVij1GzCLu/5
+  DMOr26DBv+qLJRRC/2h34uX71q5QgeOyxvMg+7V3u/Q06DXyQ2VgeeqiwDFFpEH0
+  PFkdPO6ZqbTRcLfNH7mFgCBJjsfSjJrn0sPBlYyOXgCoByfZnZyrIMH/UY+lgQqS
+  6Von1VDsfQm0eJh5zYZD64ZF86phSR7mUX3mXItwH04HrZwkWpvgd871DZVR3i1n
+  w8aNA5re5+Rt/Vvjxj5AcEnZnZiz5x959NaddQocX32Z1unHw44pzRNUur1GInfW
+  p4vpx2kUSFSAGjtCbDGTNV2AH8w9OU4xEmNz8c5lyoA=
   -----END CERTIFICATE-----
-date: 2016-01-20 00:00:00.000000000 Z
+date: 2016-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -122,14 +127,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -178,14 +183,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: hoe-highline
   requirement: !ruby/object:Gem::Requirement
@@ -201,89 +206,89 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: amalgalite
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: amalgalite
+  name: configurability
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: configurability
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rdoc-generator-fivefish
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdoc-generator-fivefish
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.14'
+        version: '3.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.14'
+        version: '3.15'
 description: |-
   Ruby-Mongrel2 is a complete Ruby connector for Mongrel2[http://mongrel2.org/].
 
@@ -402,7 +407,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -410,7 +415,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby-Mongrel2 is a complete Ruby connector for Mongrel2[http://mongrel2.org/]