mongrel2 0.52.1 → 0.52.2

data/spec/mongrel2/connection_spec.rb

@@ -31,12 +31,9 @@ describe Mongrel2::Connection do
 		response_sock = double( "response socket", options: OpenStruct.new )
 
 		expect( CZTop::Socket::PULL ).to receive( :new ).and_return( request_sock )
-		expect( request_sock.options ).to receive( :linger= ).with( 0 )
 		expect( request_sock ).to receive( :connect ).with( TEST_SEND_SPEC )
 
 		expect( CZTop::Socket::PUB ).to receive( :new ).and_return( response_sock )
-		expect( response_sock.options ).to receive( :linger= ).with( 0 )
-		expect( response_sock.options ).to_not receive( :identity= )
 		expect( response_sock ).to receive( :connect ).with( TEST_RECV_SPEC )
 
 		expect( @conn.request_sock ).to eq( request_sock )

data/spec/mongrel2/control_spec.rb

@@ -13,9 +13,6 @@ require 'mongrel2/control'
 
 describe Mongrel2::Control do
 
-	before( :all ) do
-	end
-
 	before( :each ) do
 		@ctx = double( "ZMQ::Context" )
 		@socket = double( "ZMQ REQ socket", :connect => nil, :options => OpenStruct.new )
@@ -34,6 +31,7 @@ describe Mongrel2::Control do
 		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( :<< ).with( "12:6:reload,0:}]" )
 		expect( @socket ).to receive( :receive ).
@@ -41,6 +39,7 @@ describe Mongrel2::Control do
 		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( :<< ).with( "15:9:terminate,0:}]" )
 		expect( @socket ).to receive( :receive ).
@@ -48,6 +47,7 @@ describe Mongrel2::Control do
 		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( :<< ).with( "10:4:help,0:}]" )
 		expect( @socket ).to receive( :receive ).and_return(
@@ -75,6 +75,7 @@ describe Mongrel2::Control do
 		])
 	end
 
+
 	it "sends a 'uuid' command to the control port when #uuid is called" do
 		expect( @socket ).to receive( :<< ).with( "10:4:uuid,0:}]" )
 		expect( @socket ).to receive( :receive ).and_return(
@@ -84,6 +85,7 @@ describe Mongrel2::Control do
 		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( :<< ).with( "10:4:info,0:}]" )
 		expect( @socket ).to receive( :receive ).and_return(
@@ -106,6 +108,7 @@ describe Mongrel2::Control do
 		}])
 	end
 
+
 	it "sends a 'status' command with a 'what' option set to 'tasks' to the control port " +
 	   "when #tasklist is called" do
 
@@ -129,6 +132,7 @@ describe Mongrel2::Control do
 		])
 	end
 
+
 	it "sends an 'status' command with a 'what' option set to 'net' to the control port " +
 	   "when #conn_status is called" do
 
@@ -144,6 +148,7 @@ describe Mongrel2::Control do
 		])
 	end
 
+
 	it "sends a 'time' command to the control port when #time is called" do
 		expect( @socket ).to receive( :<< ).with( "10:4:time,0:}]" )
 		expect( @socket ).to receive( :receive ).
@@ -151,6 +156,7 @@ describe Mongrel2::Control do
 		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( :<< ).with( "19:4:kill,9:2:id,1:0#}]" )
@@ -159,6 +165,7 @@ describe Mongrel2::Control do
 		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( :<< ).with( "19:12:control_stop,0:}]" )
 		expect( @socket ).to receive( :receive ).

data/spec/mongrel2/handler_spec.rb

@@ -85,6 +85,7 @@ describe Mongrel2::Handler, :db do
 			Mongrel2::Config::Handler.dataset.truncate
 		end
 
+
 		it "raises an exception if no handler with its appid exists in the config DB" do
 			Mongrel2::Config::Handler.dataset.truncate
 			expect {
@@ -95,6 +96,7 @@ describe Mongrel2::Handler, :db do
 	end
 
 
+
 	it "responds to HTTP requests with a 204 No Content response by default" do
 		request = make_request_object()
 		handler = TestingHandler.new( TEST_UUID, TEST_SEND_SPEC, TEST_RECV_SPEC )
@@ -268,6 +270,7 @@ describe Mongrel2::Handler, :db do
 		handler = TestingHandler.new( TEST_UUID, TEST_SEND_SPEC, TEST_RECV_SPEC )
 		original_conn = handler.conn
 
+		handler.reactor = instance_double( CZTop::Reactor )
 		expect( handler.reactor ).to receive( :unregister ).with( original_conn.request_sock )
 		expect( handler.reactor ).to receive( :register ) do |request_sock, mode, &callback|
 			expect( request_sock ).to be_a( CZTop::Socket )
@@ -300,5 +303,6 @@ describe Mongrel2::Handler, :db do
 		expect( request.body ).to be_closed
 		expect( spoolfile ).to_not exist
 	end
+
 end
 

data/spec/mongrel2/httprequest_spec.rb

@@ -32,6 +32,7 @@ describe Mongrel2::HTTPRequest do
 		expect( result.conn_id ).to eq( @req.conn_id )
 	end
 
+
 	it "remembers its corresponding HTTPResponse if it's created it already" do
 		result = @req.response
 		expect( result ).to be_a( Mongrel2::HTTPResponse )
@@ -39,17 +40,20 @@ describe Mongrel2::HTTPRequest do
 		expect( result.conn_id ).to eq( @req.conn_id )
 	end
 
+
 	it "knows that its connection isn't persistent if it's an HTTP/1.0 request" do
 		@req.headers.version = 'HTTP/1.0'
 		expect( @req ).to_not be_keepalive()
 	end
 
+
 	it "knows that its connection isn't persistent if has a 'close' token in its Connection header" do
 		@req.headers.version = 'HTTP/1.1'
 		@req.headers[ :connection ] = 'violent, close'
 		expect( @req ).to_not be_keepalive()
 	end
 
+
 	it "knows that its connection could be persistent if doesn't have a Connection header, " +
 	   "and it's an HTTP/1.1 request" do
 		@req.headers.version = 'HTTP/1.1'
@@ -57,6 +61,7 @@ describe Mongrel2::HTTPRequest do
 		expect( @req ).to be_keepalive()
 	end
 
+
 	it "knows that its connection is persistent if has a Connection header without a 'close' " +
 	   "token and it's an HTTP/1.1 request" do
 		@req.headers.version = 'HTTP/1.1'
@@ -64,20 +69,24 @@ describe Mongrel2::HTTPRequest do
 		expect( @req ).to be_keepalive()
 	end
 
+
 	it "knows what its URL scheme was" do
 		expect( @req.scheme ).to eq( 'http' )
 	end
 
+
 	it "falls back to 'http' if the url_scheme isn't provided (mongrel2 <= 1.8.0)" do
 		@req.headers.url_scheme = nil
 		expect( @req.scheme ).to eq( 'http' )
 	end
 
+
 	it "knows that it was an SSL-encrypted request if its scheme was 'https'" do
 		@req.headers.url_scheme = 'https'
 		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
@@ -96,33 +105,40 @@ describe Mongrel2::HTTPRequest do
 			)
 		end
 
+
 		it "provides a convenience method for fetching the 'Content-type' header" do
 			expect( @req.content_type ).to eq( 'application/x-pdf' )
 		end
 
+
 		it "provides a convenience method for resetting the 'Content-type' header" do
 			@req.content_type = 'application/json'
 			expect( @req.content_type ).to eq( 'application/json' )
 		end
 
+
 		it "provides a convenience method for fetching the 'Content-encoding' header" do
 			expect( @req.content_encoding ).to eq( 'gzip' )
 		end
 
+
 		it "provides a convenience method for resetting the 'Content-encoding' header" do
 			@req.content_encoding = 'identity'
 			expect( @req.content_encoding ).to eq( 'identity' )
 		end
 
+
 		it "provides a convenience method for fetching the request's Content-length header" do
 			expect( @req.content_length ).to eq( 28113 )
 		end
 
+
 		it "returns 0 as the content_length if the request doesn't have a Content-length header" do
 			@req.headers.delete( :content_length )
 			expect( @req.content_length ).to eq( 0 )
 		end
 
+
 		it "raises an exception if the Content-length header contains something other than an integer" do
 			@req.headers.content_length = 'Lots'
 			expect {

data/spec/mongrel2/httpresponse_spec.rb

@@ -23,15 +23,18 @@ describe Mongrel2::HTTPResponse do
 		expect( @response.headers ).to be_a( Mongrel2::Table )
 	end
 
+
 	it "allows headers to be set when the response is created" do
 		response = Mongrel2::HTTPResponse.new( TEST_UUID, 299, :content_type => 'image/jpeg' )
 		expect( response.headers.content_type ).to eq( 'image/jpeg' )
 	end
 
+
 	it "is a No Content response if not set otherwise" do
 		expect( @response.status_line ).to eq( 'HTTP/1.1 204 No Content' )
 	end
 
+
 	it "returns an empty response if its status is set to NO_CONTENT" do
 		@response.puts "The response body"
 		@response.status = HTTP::NO_CONTENT
@@ -40,6 +43,7 @@ describe Mongrel2::HTTPResponse do
 		expect( @response.to_s ).to_not match( /The response body/i )
 	end
 
+
 	it "sets Date, Content-type, and Content-length headers automatically if they haven't been set" do
 		@response << "Some stuff."
 
@@ -48,6 +52,7 @@ describe Mongrel2::HTTPResponse do
 		expect( @response.header_data ).to match( /Date: #{HTTP_DATE}/i )
 	end
 
+
 	it "re-calculates the automatically-added headers when re-rendered" do
 		expect( @response.header_data ).to match( /Content-length: 0\b/i )
 		@response.status = HTTP::OK
@@ -55,18 +60,22 @@ describe Mongrel2::HTTPResponse do
 		expect( @response.header_data ).to match( /Content-length: 10\b/i )
 	end
 
+
 	it "doesn't have a body" do
 		expect( @response.body.size ).to eq( 0 )
 	end
 
+
 	it "stringifies to a valid RFC2616 response string" do
 		expect( @response.to_s ).to match( HTTP_RESPONSE )
 	end
 
+
 	it "has some default headers" do
 		expect( @response.headers['Server'] ).to eq( Mongrel2.version_string( true ) )
 	end
 
+
 	it "can be reset to a pristine state" do
 		@response.body << "Some stuff we want to get rid of later"
 		@response.headers['x-lunch-packed-by'] = 'Your Mom'
@@ -80,15 +89,18 @@ describe Mongrel2::HTTPResponse do
 		expect( @response.headers.size ).to eq( 1 )
 	end
 
+
 	it "sets its status line to 200 OK if the body is set and the status hasn't yet been set" do
 		@response << "Some stuff"
 		expect( @response.status_line ).to eq( 'HTTP/1.1 200 OK' )
 	end
 
+
 	it "sets its status line to 204 No Content if the body is set and the status hasn't yet been set" do
 		expect( @response.status_line ).to eq( 'HTTP/1.1 204 No Content' )
 	end
 
+
 	it "can find the length of its body if it's a String" do
 		test_body = 'A string full of stuff'
 		@response.body = test_body
@@ -96,6 +108,7 @@ describe Mongrel2::HTTPResponse do
 		expect( @response.get_content_length ).to eq( test_body.length )
 	end
 
+
 	it "can find the length of its body if it's a String with multi-byte characters in it" do
 		test_body = 'Хорошая собака, Стрелке! Очень хорошо.'
 		@response << test_body
@@ -103,6 +116,7 @@ describe Mongrel2::HTTPResponse do
 		expect( @response.get_content_length ).to eq( test_body.bytesize )
 	end
 
+
 	it "can find the length of its body if it's a seekable IO" do
 		test_body = File.open( __FILE__, 'r' )
 		test_body.seek( 0, IO::SEEK_END )
@@ -114,6 +128,7 @@ describe Mongrel2::HTTPResponse do
 		expect( @response.get_content_length ).to eq( length )
 	end
 
+
 	it "can find the length of its body even if it's an IO that's been set to do a partial read" do
 		test_body = File.open( __FILE__, 'r' )
 		test_body.seek( 0, IO::SEEK_END )
@@ -125,12 +140,14 @@ describe Mongrel2::HTTPResponse do
 		expect( @response.get_content_length ).to eq( length - 100 )
 	end
 
+
 	it "knows whether or not it has been handled" do
 		expect( @response ).to_not be_handled()
 		@response.status = HTTP::OK
 		expect( @response ).to be_handled()
 	end
 
+
 	it "knows that it has been handled even if the status is set to NOT_FOUND" do
 		@response.reset
 		@response.status = HTTP::NOT_FOUND
@@ -271,6 +288,7 @@ describe Mongrel2::HTTPResponse do
 		expect( @response ).to be_keepalive()
 	end
 
+
 	it "has a puts method for appending objects to the body" do
 		@response.puts( :something_to_sable )
 		@response.body.rewind

data/spec/mongrel2/request_spec.rb

@@ -56,6 +56,7 @@ describe Mongrel2::Request, :db do
 		expect( req.headers['Host'] ).to eq( TEST_HEADERS['host'] )
 	end
 
+
 	it "can parse a request message with TNetstring headers" do
 
 		message = make_tn_request()
@@ -69,6 +70,7 @@ describe Mongrel2::Request, :db do
 		expect( req.headers.host ).to eq( TEST_HEADERS['host'] )
 	end
 
+
 	it "can parse a request message with a JSON body" do
 
 		message = make_json_request()
@@ -84,6 +86,7 @@ describe Mongrel2::Request, :db do
 		expect( req.data ).to eq( TEST_JSON_BODY )
 	end
 
+
 	it "raises an UnhandledMethodError with the name of the method for METHOD verbs that " +
 	   "don't look like HTTP ones" do
 
@@ -91,6 +94,7 @@ describe Mongrel2::Request, :db do
 		expect { Mongrel2::Request.parse(message) }.to raise_error( Mongrel2::UnhandledMethodError, /!DIVULGE/ )
 	end
 
+
 	it "knows what kind of response it should return" do
 		expect( Mongrel2::Request.response_class ).to eq( Mongrel2::Response )
 	end
@@ -103,6 +107,7 @@ describe Mongrel2::Request, :db do
 			@req = Mongrel2::Request.parse( message )
 		end
 
+
 		it "can return an appropriate response instance for themselves" do
 			result = @req.response
 			expect( result ).to be_a( Mongrel2::Response )
@@ -110,22 +115,26 @@ describe Mongrel2::Request, :db do
 			expect( result.conn_id ).to eq( @req.conn_id )
 		end
 
+
 		it "remembers its response if it's already made one" do
 			expect( @req.response ).to equal( @req.response )
 		end
 
+
 		it "allows the entity body to be replaced by assigning a String" do
 			@req.body = 'something else'
 			expect( @req.body ).to be_a( StringIO )
 			expect( @req.body.string ).to eq( 'something else' )
 		end
 
+
 		it "doesn't try to wrap non-stringish entity body replacements in a StringIO" do
 			testobj = Object.new
 			@req.body = testobj
 			expect( @req.body ).to be( testobj )
 		end
 
+
 		it "provides a convenience method for fetching the requestor's IP address" do
 			@req.headers.merge!(
 				'X-Forwarded-For' => '127.0.0.1'
@@ -133,6 +142,7 @@ describe Mongrel2::Request, :db do
 			expect( @req.remote_ip.to_s ).to eq( '127.0.0.1' )
 		end
 
+
 		it "fetching the requestor's IP address even when travelling via proxies" do
 			@req.headers.merge!(
 				'X-Forwarded-For' => [ '127.0.0.1', '8.8.8.8', '4.4.4.4' ]
@@ -140,6 +150,7 @@ describe Mongrel2::Request, :db do
 			expect( @req.remote_ip.to_s ).to eq( '127.0.0.1' )
 		end
 
+
 		it "can look up the chroot directory of the server the request is from" do
 			Mongrel2::Config::Server.first.update( chroot: '/usr/local/www' )
 			expect( @req.server_chroot ).to be_a( Pathname )
@@ -165,6 +176,7 @@ describe Mongrel2::Request, :db do
 			expect( req.body.string.encoding ).to be( Encoding::ISO_8859_1 )
 		end
 
+
 		it "keeps the data as ascii-8bit if no charset is in the content-type header" do
 			body = "some data".encode( 'binary' )
 			req = @factory.post( '/form', body, content_type: 'application/octet-stream' )
@@ -172,6 +184,7 @@ describe Mongrel2::Request, :db do
 			expect( req.body.string.encoding ).to be( Encoding::ASCII_8BIT )
 		end
 
+
 		it "keeps the data as ascii-8bit if there is no content-type header" do
 			body = "some data".encode( 'binary' )
 			req = @factory.post( '/form', body )
@@ -210,6 +223,7 @@ describe Mongrel2::Request, :db do
 			expect( Mongrel2::Request.subclass_for_method( 'JSON' ) ).to eq( subclass )
 		end
 
+
 		it "includes a mechanism for overriding the Request subclass for a particular request " +
 		   "method" do
 			subclass = Class.new( Mongrel2::Request ) do
@@ -221,6 +235,7 @@ describe Mongrel2::Request, :db do
 			expect( Mongrel2::Request.subclass_for_method( 'JSON' ) ).to_not eq( subclass )
 		end
 
+
 		it "clears any cached method -> subclass lookups when the default subclass changes" do
 			Mongrel2::Request.subclass_for_method( 'OPTIONS' ) # cache OPTIONS -> Mongrel2::Request
 
@@ -242,6 +257,7 @@ describe Mongrel2::Request, :db do
 			@spoolpath = @spoolfile.path.slice( Dir.tmpdir.length + 1..-1 )
 		end
 
+
 		it "knows if it's an 'async upload started' notification" do
 			req = @factory.post( '/form', '', x_mongrel2_upload_start: @spoolpath )
 
@@ -249,6 +265,7 @@ describe Mongrel2::Request, :db do
 			expect( req ).to_not be_upload_done()
 		end
 
+
 		it "knows if it's an 'async upload done' notification" do
 			req = @factory.post( '/form', '',
 				x_mongrel2_upload_start: @spoolpath,
@@ -259,6 +276,7 @@ describe Mongrel2::Request, :db do
 			expect( req ).to be_valid_upload()
 		end
 
+
 		it "knows if it's not a valid 'async upload done' notification" do
 			req = @factory.post( '/form', '',
 				x_mongrel2_upload_start: @spoolpath,
@@ -269,6 +287,7 @@ describe Mongrel2::Request, :db do
 			expect( req ).to_not be_valid_upload()
 		end
 
+
 		it "raises an exception if the uploaded file fetched with mismatched headers" do
 			req = @factory.post( '/form', '',
 				x_mongrel2_upload_start: @spoolpath,
@@ -279,6 +298,7 @@ describe Mongrel2::Request, :db do
 			}.to raise_error( Mongrel2::UploadError, /upload headers/i )
 		end
 
+
 		it "can return a Pathname object for the uploaded file if it's valid" do
 			req = @factory.post( '/form', '',
 				x_mongrel2_upload_start: @spoolpath,
@@ -290,6 +310,7 @@ describe Mongrel2::Request, :db do
 			expect( req.uploaded_file.to_s ).to eq( @spoolfile.path )
 		end
 
+
 		it "sets the body of the request to the uploaded File if it's valid" do
 			req = @factory.post( '/form', '',
 				x_mongrel2_upload_start: @spoolpath,