mongrel2 0.48.0 → 0.49.0

data/spec/mongrel2/control_spec.rb

@@ -2,6 +2,7 @@
 
 require_relative '../helpers'
 
+require 'ostruct'
 require 'mongrel2'
 require 'mongrel2/control'
 
@@ -17,46 +18,40 @@ describe Mongrel2::Control do
 
 	before( :each ) do
 		@ctx = double( "ZMQ::Context" )
-		@socket = double( "ZMQ REQ socket", :connect => nil, :linger= => nil )
-		allow( @ctx ).to receive( :socket ).with( :REQ ).and_return( @socket )
-
-		Mongrel2.instance_variable_set( :@zmq_ctx, @ctx )
+		@socket = double( "ZMQ REQ socket", :connect => nil, :options => OpenStruct.new )
+		allow( CZTop::Socket::REQ ).to receive( :new ).and_return( @socket )
 
 		allow( FileTest ).to receive( :socket? ).with( 'var/run/control' ). and_return( true )
 
 		@control = Mongrel2::Control.new( 'ipc://var/run/control' )
 	end
 
-	after( :all ) do
-		Mongrel2.instance_variable_set( :@zmq_ctx, nil )
-	end
-
 
 	it "sends a 'stop' command to the control port when #stop is called" do
-		expect( @socket ).to receive( :send ).with( "10:4:stop,0:}]" )
-		expect( @socket ).to receive( :recv ).
-			and_return( "59:7:headers,6:3:msg,]4:rows,29:25:21:signal sent to server,]]}" )
+		expect( @socket ).to receive( :<< ).with( "10:4:stop,0:}]" )
+		expect( @socket ).to receive( :receive ).
+			and_return( CZTop::Message.new("59:7:headers,6:3:msg,]4:rows,29:25:21:signal sent to server,]]}") )
 		expect( @control.stop ).to eq( [{ :msg => "signal sent to server" }] )
 	end
 
 	it "sends a 'reload' command to the control port when #reload is called" do
-		expect( @socket ).to receive( :send ).with( "12:6:reload,0:}]" )
-		expect( @socket ).to receive( :recv ).
-			and_return( "59:7:headers,6:3:msg,]4:rows,29:25:21:signal sent to server,]]}" )
+		expect( @socket ).to receive( :<< ).with( "12:6:reload,0:}]" )
+		expect( @socket ).to receive( :receive ).
+			and_return( CZTop::Message.new("59:7:headers,6:3:msg,]4:rows,29:25:21:signal sent to server,]]}") )
 		expect( @control.reload ).to eq( [{ :msg => "signal sent to server" }] )
 	end
 
 	it "sends a 'terminate' command to the control port when #terminate is called" do
-		expect( @socket ).to receive( :send ).with( "15:9:terminate,0:}]" )
-		expect( @socket ).to receive( :recv ).
-			and_return( "59:7:headers,6:3:msg,]4:rows,29:25:21:signal sent to server,]]}" )
+		expect( @socket ).to receive( :<< ).with( "15:9:terminate,0:}]" )
+		expect( @socket ).to receive( :receive ).
+			and_return( CZTop::Message.new("59:7:headers,6:3:msg,]4:rows,29:25:21:signal sent to server,]]}") )
 		expect( @control.terminate ).to eq( [{ :msg => "signal sent to server" }] )
 	end
 
 	it "sends a 'help' command to the control port when #help is called" do
-		expect( @socket ).to receive( :send ).with( "10:4:help,0:}]" )
-		expect( @socket ).to receive( :recv ).
-			and_return( "416:7:headers,14:4:name,4:help,]4:rows,376:35:4:stop" +
+		expect( @socket ).to receive( :<< ).with( "10:4:help,0:}]" )
+		expect( @socket ).to receive( :receive ).and_return(
+			CZTop::Message.new("416:7:headers,14:4:name,4:help,]4:rows,376:35:4:stop" +
 			            ",24:stop the server (SIGINT),]30:6:reload,17:reload " +
 			            "the server,]23:4:help,12:this command,]37:12:control" +
 			            "_stop,17:stop control port,]28:4:kill,17:kill a conn" +
@@ -64,7 +59,8 @@ describe Mongrel2::Control do
 			            "]46:9:terminate,30:terminate the server (SIGTERM),]2" +
 			            "8:4:time,17:the server's time,]28:4:uuid,17:the serv" +
 			            "er's uuid,]40:4:info,29:information about this serve" +
-			            "r,]]}" )
+			                   "r,]]}")
+		)
 		expect( @control.help ).to eq([
 			{:name => "stop",         :help => "stop the server (SIGINT)"},
 			{:name => "reload",       :help => "reload the server"},
@@ -80,22 +76,24 @@ describe Mongrel2::Control do
 	end
 
 	it "sends a 'uuid' command to the control port when #uuid is called" do
-		expect( @socket ).to receive( :send ).with( "10:4:uuid,0:}]" )
-		expect( @socket ).to receive( :recv ).
-			and_return( "75:7:headers,7:4:uuid,]4:rows,44:40:36:34D8E57C-3E91" +
-			            "-4F24-9BBE-0B53C1827CB4,]]}" )
+		expect( @socket ).to receive( :<< ).with( "10:4:uuid,0:}]" )
+		expect( @socket ).to receive( :receive ).and_return(
+			CZTop::Message.new("75:7:headers,7:4:uuid,]4:rows,44:40:36:34D8E57C-3E91" +
+			                   "-4F24-9BBE-0B53C1827CB4,]]}")
+		)
 		expect( @control.uuid ).to eq( [{ :uuid => '34D8E57C-3E91-4F24-9BBE-0B53C1827CB4' }] )
 	end
 
 	it "sends an 'info' command to the control port when #info is called" do
-		expect( @socket ).to receive( :send ).with( "10:4:info,0:}]" )
-		expect( @socket ).to receive( :recv ).
-			and_return( "260:7:headers,92:4:port,9:bind_addr,4:uuid,6:chroot," +
+		expect( @socket ).to receive( :<< ).with( "10:4:info,0:}]" )
+		expect( @socket ).to receive( :receive ).and_return(
+			CZTop::Message.new("260:7:headers,92:4:port,9:bind_addr,4:uuid,6:chroot," +
 			            "10:access_log,9:error_log,8:pid_file,16:default_host" +
 			            "name,]4:rows,142:137:4:8113#7:0.0.0.0,36:34D8E57C-3E" +
 			            "91-4F24-9BBE-0B53C1827CB4,2:./,18:.//logs/access.log" +
 			            ",15:/logs/error.log,18:./run/mongrel2.pid,9:localhos" +
-			            "t,]]}" )
+			                   "t,]]}")
+		)
 		expect( @control.info ).to eq([{
 			:port             => 8113,
 			:bind_addr        => "0.0.0.0",
@@ -111,15 +109,16 @@ describe Mongrel2::Control do
 	it "sends a 'status' command with a 'what' option set to 'tasks' to the control port " +
 	   "when #tasklist is called" do
 
-		expect( @socket ).to receive( :send ).with( "28:6:status,15:4:what,5:tasks,}]" )
-		expect( @socket ).to receive( :recv ).
-			and_return( "343:7:headers,38:2:id,6:system,4:name,5:state,6:status," +
+		expect( @socket ).to receive( :<< ).with( "28:6:status,15:4:what,5:tasks,}]" )
+		expect( @socket ).to receive( :receive ).and_return(
+			CZTop::Message.new("343:7:headers,38:2:id,6:system,4:name,5:state,6:status," +
 			            "]4:rows,279:38:1:1#5:false!6:SERVER,7:read fd,4:idle,]5" +
 			            "1:1:2#5:false!12:Handler_task,12:read handler,4:idle,]5" +
 			            "1:1:3#5:false!12:Handler_task,12:read handler,4:idle,]4" +
 			            "8:1:4#5:false!7:control,12:read handler,7:running,]31:1" +
 			            ":5#5:false!6:ticker,0:,4:idle,]36:1:6#4:true!6:fdtask,5" +
-			            ":yield,5:ready,]]}" )
+			                   ":yield,5:ready,]]}")
+		)
 		expect( @control.tasklist ).to eq([
 			{:id=>1, :system=>false, :name=>"SERVER",       :state=>"read fd",      :status=>"idle"},
 			{:id=>2, :system=>false, :name=>"Handler_task", :state=>"read handler", :status=>"idle"},
@@ -133,11 +132,12 @@ describe Mongrel2::Control do
 	it "sends an 'status' command with a 'what' option set to 'net' to the control port " +
 	   "when #conn_status is called" do
 
-		expect( @socket ).to receive( :send ).with( "26:6:status,13:4:what,3:net,}]" )
-		expect( @socket ).to receive( :recv ).
-			and_return( "150:7:headers,86:2:id,2:fd,4:type,9:last_ping,9:last_read," +
+		expect( @socket ).to receive( :<< ).with( "26:6:status,13:4:what,3:net,}]" )
+		expect( @socket ).to receive( :receive ).and_return(
+			CZTop::Message.new("150:7:headers,86:2:id,2:fd,4:type,9:last_ping,9:last_read," +
 			            "10:last_write,10:bytes_read,13:bytes_written,]4:rows,39:35" +
-			            ":1:2#2:38#1:1#1:0#1:0#1:0#3:405#1:0#]]}" )
+			            ":1:2#2:38#1:1#1:0#1:0#1:0#3:405#1:0#]]}")
+		)
 		expect( @control.conn_status ).to eq([
 			{:id=>2, :fd=>38, :type=>1, :last_ping=>0, :last_read=>0, :last_write=>0,
 				:bytes_read=>405, :bytes_written=>0}
@@ -145,31 +145,32 @@ describe Mongrel2::Control do
 	end
 
 	it "sends a 'time' command to the control port when #time is called" do
-		expect( @socket ).to receive( :send ).with( "10:4:time,0:}]" )
-		expect( @socket ).to receive( :recv ).
-			and_return( "49:7:headers,7:4:time,]4:rows,18:14:10:1315532674,]]}" )
+		expect( @socket ).to receive( :<< ).with( "10:4:time,0:}]" )
+		expect( @socket ).to receive( :receive ).
+			and_return( CZTop::Message.new("49:7:headers,7:4:time,]4:rows,18:14:10:1315532674,]]}") )
 		expect( @control.time ).to eq( Time.at( 1315532674 ) )
 	end
 
 	it "sends a 'kill' command with an ID equal to the argument to the control port when #kill " +
 	   "is called" do
-		expect( @socket ).to receive( :send ).with( "19:4:kill,9:2:id,1:0#}]" )
-		expect( @socket ).to receive( :recv ).and_return( "40:7:headers,9:6:status,]4:rows,8:5:2:OK,]]}" )
+		expect( @socket ).to receive( :<< ).with( "19:4:kill,9:2:id,1:0#}]" )
+		expect( @socket ).to receive( :receive ).
+			and_return( CZTop::Message.new( "40:7:headers,9:6:status,]4:rows,8:5:2:OK,]]}" ) )
 		expect( @control.kill( 0 ) ).to eq( [{ :status => "OK" }] )
 	end
 
 	it "sends a 'control_stop' command to the control port when #info is called" do
-		expect( @socket ).to receive( :send ).with( "19:12:control_stop,0:}]" )
-		expect( @socket ).to receive( :recv ).
-			and_return( "63:7:headers,6:3:msg,]4:rows,33:29:25:stopping the control port,]]}" )
+		expect( @socket ).to receive( :<< ).with( "19:12:control_stop,0:}]" )
+		expect( @socket ).to receive( :receive ).
+			and_return( CZTop::Message.new("63:7:headers,6:3:msg,]4:rows,33:29:25:stopping the control port,]]}") )
 		expect( @control.control_stop ).to eq( [{:msg => "stopping the control port"}] )
 	end
 
 
 	it "raises an exception if the server responds with an error" do
-		expect( @socket ).to receive( :send ).with( "19:4:kill,9:2:id,1:0#}]" )
-		expect( @socket ).to receive( :recv ).
-			and_return( "61:4:code,16:INVALID_ARGUMENT,5:error,22:Invalid argument type.,}" )
+		expect( @socket ).to receive( :<< ).with( "19:4:kill,9:2:id,1:0#}]" )
+		expect( @socket ).to receive( :receive ).
+			and_return( CZTop::Message.new("61:4:code,16:INVALID_ARGUMENT,5:error,22:Invalid argument type.,}") )
 
 		expect {
 			@control.kill( 0 )

data/spec/mongrel2/handler_spec.rb

@@ -2,6 +2,9 @@
 
 require_relative '../helpers'
 
+require 'ostruct'
+require 'cztop'
+
 require 'mongrel2'
 require 'mongrel2/config'
 require 'mongrel2/handler'
@@ -36,20 +39,23 @@ describe Mongrel2::Handler, :db do
 
 	# Ensure 0MQ never actually gets called
 	before( :each ) do
-		@ctx = double( '0mq context', close: nil )
-		@request_sock = double( "request socket", :linger= => nil, :connect => nil, :close => nil )
-		@response_sock = double( "response socket", :linger= => nil, :connect => nil, :close => nil )
-
-		allow( @ctx ).to receive( :socket ).with( :PULL ).and_return( @request_sock )
-		allow( @ctx ).to receive( :socket ).with( :PUB ).and_return( @response_sock )
-
-		allow( ZMQ ).to receive( :select ).and_return([ [@request_sock], [], [] ])
-
-		Mongrel2.instance_variable_set( :@zmq_ctx, @ctx )
-	end
-
-	after( :each ) do
-		Mongrel2.instance_variable_set( :@zmq_ctx, nil )
+		@request_sock    = instance_double( CZTop::Socket::PULL, :options => OpenStruct.new, :connect => nil, :close => nil )
+		@response_sock   = instance_double( CZTop::Socket::PUB, :options => OpenStruct.new, :connect => nil, :close => nil )
+		@selfpipe_reader = instance_double( CZTop::Socket::PAIR )
+		@selfpipe_writer = instance_double( CZTop::Socket::PAIR )
+		@poller          = instance_double( CZTop::Poller )
+		@poller_event    = instance_double( CZTop::Poller::Event )
+
+		allow( CZTop::Socket::PULL ).to receive( :new ).and_return( @request_sock )
+		allow( CZTop::Socket::PUB ).to receive( :new ).and_return( @response_sock )
+		allow( CZTop::Socket::PAIR ).to receive( :new ).with( '@inproc://signal-handler' ).
+			and_return( @selfpipe_reader )
+		allow( CZTop::Socket::PAIR ).to receive( :new ).with( '>inproc://signal-handler' ).
+			and_return( @selfpipe_writer )
+		allow( CZTop::Poller ).to receive( :new ).and_return( @poller )
+
+		allow( @poller ).to receive( :wait ).and_return( @poller_event )
+		allow( @poller_event ).to receive( :socket ).and_return( @request_sock )
 	end
 
 
@@ -78,11 +84,12 @@ describe Mongrel2::Handler, :db do
 			).to eq([ TEST_SEND_SPEC, TEST_RECV_SPEC ])
 		end
 
+
 		it "has a convenience method for instantiating and running a Handler given an " +
 		   "application ID" do
 
 			req = make_request()
-			expect( @request_sock ).to receive( :recv ).and_return( req )
+			expect( @request_sock ).to receive( :receive ).and_return( CZTop::Message.new( req ) )
 
 			res = OneShotHandler.run( TEST_UUID )
 
@@ -92,9 +99,10 @@ describe Mongrel2::Handler, :db do
 			expect( res.conn.pub_addr ).to eq( TEST_RECV_SPEC )
 		end
 
+
 		it "knows what handler config corresponds to its" do
 			req = make_request()
-			expect( @request_sock ).to receive( :recv ).and_return( req )
+			expect( @request_sock ).to receive( :receive ).and_return( CZTop::Message.new( req ) )
 
 			res = OneShotHandler.run( TEST_UUID )
 
@@ -124,7 +132,7 @@ describe Mongrel2::Handler, :db do
 
 	it "dispatches HTTP requests to the #handle method" do
 		req = make_request()
-		expect( @request_sock ).to receive( :recv ).and_return( req )
+		expect( @request_sock ).to receive( :receive ).and_return( CZTop::Message.new( req ) )
 
 		res = OneShotHandler.new( TEST_UUID, TEST_SEND_SPEC, TEST_RECV_SPEC ).run
 
@@ -135,9 +143,10 @@ describe Mongrel2::Handler, :db do
 		expect( response.status ).to eq( 204 )
 	end
 
+
 	it "ignores JSON messages by default" do
 		req = make_json_request()
-		expect( @request_sock ).to receive( :recv ).and_return( req )
+		expect( @request_sock ).to receive( :receive ).and_return( CZTop::Message.new( req ) )
 
 		res = OneShotHandler.new( TEST_UUID, TEST_SEND_SPEC, TEST_RECV_SPEC ).run
 
@@ -147,6 +156,7 @@ describe Mongrel2::Handler, :db do
 		expect( response ).to be_nil()
 	end
 
+
 	it "dispatches JSON message to the #handle_json method" do
 		json_handler = Class.new( OneShotHandler ) do
 			def handle_json( request )
@@ -155,7 +165,7 @@ describe Mongrel2::Handler, :db do
 		end
 
 		req = make_json_request()
-		expect( @request_sock ).to receive( :recv ).and_return( req )
+		expect( @request_sock ).to receive( :receive ).and_return( CZTop::Message.new( req ) )
 
 		res = json_handler.new( TEST_UUID, TEST_SEND_SPEC, TEST_RECV_SPEC ).run
 
@@ -165,9 +175,10 @@ describe Mongrel2::Handler, :db do
 		expect( response ).to be_a( Mongrel2::Response )
 	end
 
+
 	it "ignores XML messages by default" do
 		req = make_xml_request()
-		expect( @request_sock ).to receive( :recv ).and_return( req )
+		expect( @request_sock ).to receive( :receive ).and_return( CZTop::Message.new( req ) )
 
 		res = OneShotHandler.new( TEST_UUID, TEST_SEND_SPEC, TEST_RECV_SPEC ).run
 
@@ -177,6 +188,7 @@ describe Mongrel2::Handler, :db do
 		expect( response ).to be_nil()
 	end
 
+
 	it "dispatches XML message to the #handle_xml method" do
 		xml_handler = Class.new( OneShotHandler ) do
 			def handle_xml( request )
@@ -185,7 +197,7 @@ describe Mongrel2::Handler, :db do
 		end
 
 		req = make_xml_request()
-		expect( @request_sock ).to receive( :recv ).and_return( req )
+		expect( @request_sock ).to receive( :receive ).and_return( CZTop::Message.new( req ) )
 
 		res = xml_handler.new( TEST_UUID, TEST_SEND_SPEC, TEST_RECV_SPEC ).run
 
@@ -195,6 +207,7 @@ describe Mongrel2::Handler, :db do
 		expect( response ).to be_a( Mongrel2::Response )
 	end
 
+
 	it "dispatches WebSocket opening handshakes to the #handle_websocket_handshake method" do
 		ws_handler = Class.new( OneShotHandler ) do
 			def handle_websocket_handshake( handshake )
@@ -203,7 +216,7 @@ describe Mongrel2::Handler, :db do
 		end
 
 		req = make_websocket_handshake()
-		expect( @request_sock ).to receive( :recv ).and_return( req )
+		expect( @request_sock ).to receive( :receive ).and_return( CZTop::Message.new( req ) )
 
 		res = ws_handler.new( TEST_UUID, TEST_SEND_SPEC, TEST_RECV_SPEC ).run
 
@@ -213,6 +226,7 @@ describe Mongrel2::Handler, :db do
 		expect( response ).to be_a( Mongrel2::WebSocket::ServerHandshake )
 	end
 
+
 	it "dispatches WebSocket protocol frames to the #handle_websocket method" do
 		ws_handler = Class.new( OneShotHandler ) do
 			def handle_websocket( frame )
@@ -221,7 +235,7 @@ describe Mongrel2::Handler, :db do
 		end
 
 		req = make_websocket_frame()
-		expect( @request_sock ).to receive( :recv ).and_return( req )
+		expect( @request_sock ).to receive( :receive ).and_return( CZTop::Message.new( req ) )
 
 		res = ws_handler.new( TEST_UUID, TEST_SEND_SPEC, TEST_RECV_SPEC ).run
 
@@ -231,11 +245,13 @@ describe Mongrel2::Handler, :db do
 		expect( response ).to be_a( Mongrel2::WebSocket::Frame )
 	end
 
-	it "continues when a ZMQ::Error is received but the connection remains open" do
+
+	it "continues when a SocketError is received but the connection remains open" do
+		pending "Does this still apply?"
 		req = make_request()
 
-		expect( @request_sock ).to receive( :recv ).and_raise( ZMQ::Error.new("Interrupted system call.") )
-		expect( @request_sock ).to receive( :recv ).and_return( req )
+		expect( @request_sock ).to receive( :receive ).and_raise( SocketError.new("Interrupted system call.") )
+		expect( @request_sock ).to receive( :receive ).and_return( CZTop::Message.new( req ) )
 
 		res = OneShotHandler.new( TEST_UUID, TEST_SEND_SPEC, TEST_RECV_SPEC ).run
 
@@ -246,9 +262,10 @@ describe Mongrel2::Handler, :db do
 		expect( response.status ).to eq( 204 )
 	end
 
+
 	it "ignores disconnect notices by default" do
 		req = make_json_request( :path => '@*', :body => {'type' => 'disconnect'} )
-		expect( @request_sock ).to receive( :recv ).and_return( req )
+		expect( @request_sock ).to receive( :receive ).and_return( CZTop::Message.new( req ) )
 
 		res = OneShotHandler.new( TEST_UUID, TEST_SEND_SPEC, TEST_RECV_SPEC ).run
 
@@ -258,6 +275,7 @@ describe Mongrel2::Handler, :db do
 		expect( response ).to be_nil()
 	end
 
+
 	it "dispatches disconnect notices to the #handle_disconnect method" do
 		disconnect_handler = Class.new( OneShotHandler ) do
 			def handle_disconnect( request )
@@ -266,7 +284,7 @@ describe Mongrel2::Handler, :db do
 		end
 
 		req = make_json_request( :path => '@*', :body => {'type' => 'disconnect'} )
-		expect( @request_sock ).to receive( :recv ).and_return( req )
+		expect( @request_sock ).to receive( :receive ).and_return( CZTop::Message.new( req ) )
 
 		res = disconnect_handler.new( TEST_UUID, TEST_SEND_SPEC, TEST_RECV_SPEC ).run
 
@@ -276,10 +294,11 @@ describe Mongrel2::Handler, :db do
 		expect( response ).to be_nil()
 	end
 
+
 	it "cancels async upload notices by default" do
 		req = make_request( 'METHOD' => 'POST', :headers => {'x-mongrel2-upload-start' => 'uploadfile.XXX'} )
-		expect( @request_sock ).to receive( :recv ).and_return( req )
-		expect( @response_sock ).to receive( :send ).with( "#{TEST_UUID} 1:8, " )
+		expect( @request_sock ).to receive( :receive ).and_return( CZTop::Message.new( req ) )
+		expect( @response_sock ).to receive( :<< ).with( "#{TEST_UUID} 1:8, " )
 
 		res = OneShotHandler.new( TEST_UUID, TEST_SEND_SPEC, TEST_RECV_SPEC ).run
 
@@ -288,6 +307,7 @@ describe Mongrel2::Handler, :db do
 		expect( response ).to be_nil()
 	end
 
+
 	it "re-establishes its connection when told to restart" do
 		res = OneShotHandler.new( TEST_UUID, TEST_SEND_SPEC, TEST_RECV_SPEC )
 		original_conn = res.conn
@@ -295,6 +315,7 @@ describe Mongrel2::Handler, :db do
 		expect( res.conn ).to_not equal( original_conn )
 	end
 
+
 	it "cleans any mongrel2 request spool files after sending a response" do
 		spoolfile = Pathname.new( Dir.tmpdir + '/mongrel2.uskd8l1' )
 		spoolfile.write( "Hi!" )
@@ -303,7 +324,7 @@ describe Mongrel2::Handler, :db do
 			'x-mongrel2-upload-start' => spoolfile.basename,
 			'x-mongrel2-upload-done'  => spoolfile.basename
 		})
-		expect( @request_sock ).to receive( :recv ).and_return( req )
+		expect( @request_sock ).to receive( :receive ).and_return( CZTop::Message.new( req ) )
 
 		res = OneShotHandler.new( TEST_UUID, TEST_SEND_SPEC, TEST_RECV_SPEC ).run
 		request, response = res.transactions.first

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongrel2
 version: !ruby/object:Gem::Version
-  version: 0.48.0
+  version: 0.49.0
 platform: ruby
 authors:
 - Michael Granger
@@ -10,154 +10,159 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDbDCCAlSgAwIBAgIBATANBgkqhkiG9w0BAQUFADA+MQ8wDQYDVQQDDAZtYWhs
-  b24xFzAVBgoJkiaJk/IsZAEZFgdtYXJ0aW5pMRIwEAYKCZImiZPyLGQBGRYCbnUw
-  HhcNMTYxMTE2MTkxMTMwWhcNMTcxMTE2MTkxMTMwWjA+MQ8wDQYDVQQDDAZtYWhs
-  b24xFzAVBgoJkiaJk/IsZAEZFgdtYXJ0aW5pMRIwEAYKCZImiZPyLGQBGRYCbnUw
-  ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDpXGN0YbMVpYv4EoiCxpQw
-  sxKdyhlkvpvENUkpEhbpnEuMKXgUfRHO4T/vBZf0h8eYgwnrHCRhAeIqesFKfoj9
-  mpEJk5JUuADOAz18aT+v24UqAtJdiwBJLuqhslSNB6CFXZv3OOMny9bjoJegz0hI
-  Fht9ppCuNmxJNd+L3zAX8lD01RUWNRC+8L5QLCjViJtjFDDCFfh9NCirs+XnTCzo
-  AJgFbsZIzFJtSiXUtFgscKr4Ik8ruhRbPbYbmx9rf6W74aTMPxggq/d3gj0Eh32y
-  WsXsQ5giVnmkbsRkBNu3QyZ8Xr5+7mvy5AWyqXKOrcW7lnYaob6Z9x/MGXGNeD6j
-  AgMBAAGjdTBzMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBRY8ea6
-  +6kAaW7ukKph2/4MTAD8/TAcBgNVHREEFTATgRFtYWhsb25AbWFydGluaS5udTAc
-  BgNVHRIEFTATgRFtYWhsb25AbWFydGluaS5udTANBgkqhkiG9w0BAQUFAAOCAQEA
-  MxBPdbmfh3dJN51visg0QilqtyPbqxyd8YVm9wbkcmi1D2Sv9deppFvZ+pXyR+eq
-  qy/efw4F+3DAPw+9QNlPJG8DHQ8HrYPrf7wv5DPBpyKLD1atMGnoDb5gijIx5IMR
-  MxiffPYQsT7Noimqaz8KWqP1keDY9aqVKe3iDXUXKBV27sl9GhOt5jJ3rVW9ihok
-  KiEoBnrgQcZIEAOwfXbWT4IaIcOCgD+JloEesuHL72/3zP/vOcqZf4SOcne4+qti
-  DHE5pl144V24tqxZb65WTup/ov22SCXmpU8/wTeZVL3rePGRfwTJNpm+6iYszl7A
-  SixmX0X3SOeYg4FRkblUIA==
+  MIIEbDCCAtSgAwIBAgIBATANBgkqhkiG9w0BAQsFADA+MQwwCgYDVQQDDANnZWQx
+  GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
+  HhcNMTYwODIwMTgxNzQyWhcNMTcwODIwMTgxNzQyWjA+MQwwCgYDVQQDDANnZWQx
+  GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
+  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: 2017-01-16 00:00:00.000000000 Z
+date: 2017-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sequel
+  name: cztop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
-  name: tnetstring
+  name: libxml-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
-  name: yajl-ruby
+  name: loggability
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
-  name: trollop
+  name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: sysexits
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: rbczmq
+  name: sysexits
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: loggability
+  name: tnetstring
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: trollop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: libxml-ruby
+  name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
   requirement: !ruby/object:Gem::Requirement
@@ -301,7 +306,6 @@ extra_rdoc_files:
 - History.rdoc
 - Manifest.txt
 - README.rdoc
-- examples/README.txt
 files:
 - ".autotest"
 - ".gemtest"
@@ -313,24 +317,8 @@ files:
 - README.rdoc
 - Rakefile
 - bin/m2sh.rb
-- data/mongrel2/bootstrap.html
-- data/mongrel2/config.rb.in
 - data/mongrel2/config.sql
-- data/mongrel2/css/master.css
-- data/mongrel2/index.html.in
-- data/mongrel2/js/websock-test.js
 - data/mongrel2/mimetypes.sql
-- data/mongrel2/websock-test.html
-- examples/Procfile
-- examples/README.txt
-- examples/async-upload.rb
-- examples/config.rb
-- examples/helloworld-handler.rb
-- examples/request-dumper.rb
-- examples/request-dumper.tmpl
-- examples/run
-- examples/sendfile.rb
-- examples/ws-echo.rb
 - lib/mongrel2.rb
 - lib/mongrel2/config.rb
 - lib/mongrel2/config/directory.rb
@@ -410,7 +398,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Ruby-Mongrel2 is a complete Ruby connector for Mongrel2[http://mongrel2.org/]