mongrel2 0.49.0 → 0.50.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 944abee18512b2a14ea074675313be9c301e3960
-  data.tar.gz: d46b4b9b56a054bb195f4a42bf14b08f69164768
+  metadata.gz: 7578443cf1e0162babc6ea4010691f6c3ab10984
+  data.tar.gz: 6e7268702b1f8c3e2838c122a4e744f2330ebf06
 SHA512:
-  metadata.gz: 5c4efad71c6dde2c3a8b15951c5651c6ac4bf2e37ff157b4b6f385f2ab0b0c0c9ee31714ef50f3926e987d079416c218b0aca38a3304624e787cdfaf7b201c26
-  data.tar.gz: eef053a14975b06e55e4ce1c459d56adbf5592a4668a4c2571f6cb2d47789211497ca283ddbe72369325abd761c175f6b755734c18394222467663fab2dae459
+  metadata.gz: f9be1e69de5c7d0cea4b2b623fdd1e9d4ad22b3325bf959f38ae394494e6b5413194fc98b915e3de613438d22b7c30514a0f5bd2a59366db391efa57bb85e4cf
+  data.tar.gz: 3cc4b31fe1627d3745f7255b7ecc7245c72c370c3175cf697d6958f2d00ebd98f8976247fe22fe8e92114d7483be9ca79248854fbb44013b6f7835711c499bb2

data/ChangeLog

@@ -1,8 +1,83 @@
+2017-05-03  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/mongrel2/handler.rb, spec/mongrel2/handler_spec.rb:
+	Defer instantation of the self-pipe to startup
+
+	This makes it easier to test instances of handlers, as it eliminates
+	the socket binding/connection.
+	[80a7c403b50b] [tip]
+
+2017-04-24  Michael Granger  <ged@FaerieMUD.org>
+
+	* History.rdoc, lib/mongrel2.rb, mongrel2.gemspec:
+	Bump the minor version, update history.
+	[53828961c096]
+
+	* Rakefile, lib/mongrel2/config.rb:
+	Fix issues with Sequel 4.45+
+	[61c5c2d2efab]
+
+2017-03-10  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hoerc:
+	Remove the stuff specific to my env from the local Hoe config
+	[b443b14fa775]
+
+	* .hgtags:
+	Added tag v0.49.0 for changeset 711330349e6f
+	[e3b072a13f19]
+
+	* .hgsigs:
+	Added signature for changeset e2508eadb52d
+	[711330349e6f] [v0.49.0]
+
+	* History.rdoc, Manifest.txt, lib/mongrel2.rb, mongrel2.gemspec:
+	Bump the minor version, update history and the manifest.
+	[e2508eadb52d]
+
+	* .gems, Rakefile, lib/mongrel2.rb:
+	Merged with d51c321fbd83
+	[4cc7ff9f8f34]
+
+2017-02-08  Michael Granger  <ged@FaerieMUD.org>
+
+	* .gems, .hoerc, Manifest.txt, README.rdoc, Rakefile,
+	data/mongrel2/bootstrap.html, data/mongrel2/config.rb.in,
+	data/mongrel2/css/master.css, data/mongrel2/index.html.in,
+	data/mongrel2/js/websock-test.js, data/mongrel2/websock-test.html,
+	examples/.env, examples/config.rb, examples/public/bootstrap.html,
+	examples/public/config.rb.in, examples/public/css/master.css,
+	examples/public/index.html.in, examples/public/js/websock-test.js,
+	examples/public/websock-test.html, examples/request-dumper.rb,
+	examples/request-dumper.tmpl, lib/mongrel2.rb,
+	lib/mongrel2/connection.rb, lib/mongrel2/control.rb,
+	lib/mongrel2/handler.rb, mongrel2.gemspec,
+	spec/mongrel2/connection_spec.rb, spec/mongrel2/control_spec.rb,
+	spec/mongrel2/handler_spec.rb:
+	Convert to CZTop for zmq
+	[87368e83086b]
+
+2017-01-16  Mahlon E. Smith  <mahlon@laika.com>
+
+	* .hgtags:
+	Added tag v0.48.0 for changeset cd462070f981
+	[d51c321fbd83]
+
+	* .hgsigs:
+	Added signature for changeset 50bb8c488bc4
+	[cd462070f981] [v0.48.0]
+
+2017-01-16  Mahlon E. Smith  <mahlon@martini.nu>
+
+	* .gems, History.rdoc, Rakefile, lib/mongrel2.rb:
+	Bump Configurability dependency.
+	[50bb8c488bc4]
+
 2016-11-23  Mahlon E. Smith  <mahlon@martini.nu>
 
 	* .hgtags:
 	Added tag v0.47.0 for changeset 3298fb41de78
-	[b01f4b4e8c2f] [tip]
+	[b01f4b4e8c2f]
 
 	* .hgsigs:
 	Added signature for changeset c4ae80fe8067
@@ -21,7 +96,7 @@
 
 	* .hgtags:
 	Added tag v0.46.0 for changeset e7c165fb6bb2
-	[7f3c8162e5ef] [github/master]
+	[7f3c8162e5ef]
 
 	* .hgsigs:
 	Added signature for changeset a28294965462

data/History.rdoc

@@ -1,3 +1,10 @@
+==  v0.50.0 [2017-04-24] Michael Granger <ged@FaerieMUD.org>
+
+Bugfixes:
+
+- Fix issues with (and require) Sequel 4.45+
+
+
 ==  v0.49.0 [2017-03-10] Michael Granger <ged@FaerieMUD.org>
 
 Enhancements:

data/Rakefile

@@ -28,7 +28,7 @@ hoespec = Hoe.spec 'mongrel2' do
 	self.dependency 'cztop',       '~> 0.11'
 	self.dependency 'libxml-ruby', '~> 2.7'
 	self.dependency 'loggability', '~> 0.12'
-	self.dependency 'sequel',      '~> 4.2'
+	self.dependency 'sequel',      '~> 4.45'
 	self.dependency 'sqlite3',     '~> 1.3'
 	self.dependency 'sysexits',    '~> 1.1'
 	self.dependency 'tnetstring',  '~> 0.3'

data/lib/mongrel2.rb

@@ -22,10 +22,10 @@ module Mongrel2
 	abort "\n\n>>> Mongrel2 requires Ruby 2.2 or later. <<<\n\n" if RUBY_VERSION < '2.2.0'
 
 	# Library version constant
-	VERSION = '0.49.0'
+	VERSION = '0.50.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: e2508eadb52d $
+	REVISION = %q$Revision: 53828961c096 $
 
 
 	require 'mongrel2/constants'

data/lib/mongrel2/config.rb

@@ -259,19 +259,7 @@ module Mongrel2
 
 	### Factory method that creates subclasses of Mongrel2::Config.
 	def self::Config( source )
-		unless Sequel::Model::ANONYMOUS_MODEL_CLASSES.key?( source )
-			anonclass = nil
-			if source.is_a?( Sequel::Database )
-				anonclass = Class.new( Mongrel2::Config )
-				anonclass.db = source
-			else
-				anonclass = Class.new( Mongrel2::Config ).set_dataset( source )
-			end
-
-			Sequel::Model::ANONYMOUS_MODEL_CLASSES[ source ] = anonclass
-		end
-
-		return Sequel::Model::ANONYMOUS_MODEL_CLASSES[ source ]
+		return Mongrel2::Config.Model( source )
 	end
 
 	require 'mongrel2/config/directory'

data/lib/mongrel2/handler.rb

@@ -136,15 +136,11 @@ class Mongrel2::Handler
 	### and +recv_spec+.
 	def initialize( app_id, send_spec, recv_spec ) # :notnew:
 		@app_id    = app_id
-		@conn      = Mongrel2::Connection.new( app_id, send_spec, recv_spec )
-#		@self_pipe = CZTop::Socket::PAIR.new( 'inproc://signal-handler' )
 
-		@self_pipe = {
-			reader: CZTop::Socket::PAIR.new( '@inproc://signal-handler' ),
-			writer: CZTop::Socket::PAIR.new( '>inproc://signal-handler' )
-		}
+		@conn      = Mongrel2::Connection.new( app_id, send_spec, recv_spec )
 
-		@poller = CZTop::Poller.new( @conn.request_sock, @self_pipe[:reader] )
+		@self_pipe = nil
+		@poller    = nil
 
 		Thread.main[:signal_queue] = []
 	end
@@ -165,6 +161,13 @@ class Mongrel2::Handler
 	def run
 		self.log.info "Starting up %p" % [ self ]
 
+		@self_pipe = {
+			reader: CZTop::Socket::PAIR.new( '@inproc://signal-handler' ),
+			writer: CZTop::Socket::PAIR.new( '>inproc://signal-handler' )
+		}
+
+		@poller = CZTop::Poller.new( @conn.request_sock, @self_pipe[:reader] )
+
 		self.set_signal_handlers
 		self.start_accepting_requests
 
@@ -172,7 +175,7 @@ class Mongrel2::Handler
 	ensure
 		self.restore_signal_handlers
 		self.log.info "Done: %p" % [ self ]
-		@conn.close
+		@conn.close if @conn
 	end
 
 
@@ -228,13 +231,14 @@ class Mongrel2::Handler
 	### database connections, flush caches, or other restart-ey stuff.
 	def restart
 		self.log.info "Restarting"
-		old_conn = @conn
-		@conn = @conn.dup
+		if (( old_conn = @conn ))
+			@conn = @conn.dup
 
-		@poller = CZTop::Poller.new( @conn.request_sock, @self_pipe[:reader] )
+			@poller = CZTop::Poller.new( @conn.request_sock, @self_pipe[:reader] )
 
-		self.log.debug "  conn %p -> %p" % [ old_conn, @conn ]
-		old_conn.close
+			self.log.debug "  conn %p -> %p" % [ old_conn, @conn ]
+			old_conn.close
+		end
 	end
 
 

data/spec/mongrel2/handler_spec.rb

@@ -310,8 +310,13 @@ describe Mongrel2::Handler, :db do
 
 	it "re-establishes its connection when told to restart" do
 		res = OneShotHandler.new( TEST_UUID, TEST_SEND_SPEC, TEST_RECV_SPEC )
+		pipe_reader = instance_double( CZTop::Socket::PAIR )
+		pipe_writer = instance_double( CZTop::Socket::PAIR )
+		res.instance_variable_set( :@self_pipe, {reader: pipe_reader, writer: pipe_writer} )
+
 		original_conn = res.conn
 		res.restart
+
 		expect( res.conn ).to_not equal( original_conn )
 	end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongrel2
 version: !ruby/object:Gem::Version
-  version: 0.49.0
+  version: 0.50.0
 platform: ruby
 authors:
 - Michael Granger
@@ -10,32 +10,27 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  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
+  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
+  SixmX0X3SOeYg4FRkblUIA==
   -----END CERTIFICATE-----
-date: 2017-03-10 00:00:00.000000000 Z
+date: 2017-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cztop
@@ -85,14 +80,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.45'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.45'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -183,14 +178,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: hoe-highline
   requirement: !ruby/object:Gem::Requirement
@@ -281,14 +276,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '3.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '3.16'
 description: |-
   Ruby-Mongrel2 is a complete Ruby connector for Mongrel2[http://mongrel2.org/].
 
@@ -398,7 +393,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Ruby-Mongrel2 is a complete Ruby connector for Mongrel2[http://mongrel2.org/]

metadata.gz.sig

@@ -1,4 +1 @@
-
-C��
-}���S�۠1���T!�YV�^����[������||�hi��Fߺ�B��䲯9k݆���]�ķ����Y�=���
-O������ָ��ZD��Z�f��1�F��I^�yPq�U�ѐ�������׼�F��~?2�i�¡�9
+>������ .��^uK�L�VIT��l��Г����]~�C�&b%�Q�5���1�'e�5�����|{�g\H��.�D"赉8��?|�����	�>|n�ߑJ^�й����\�u+�.p��Ϋ��-d����F'���
�G7C��P��#FZO��޶��{�����X4�um$L��l_<I��>=��l��A1"�̓����⍤0ȥ>��SQ�2
�v�]�-��N�!�M��,�