mongrel2 0.24.0 → 0.25.0.pre.285

data/spec/mongrel2/request_spec.rb

@@ -12,6 +12,8 @@ BEGIN {
 
 require 'rspec'
 require 'tnetstring'
+require 'tmpdir'
+require 'tempfile'
 
 require 'spec/lib/helpers'
 
@@ -27,6 +29,7 @@ describe Mongrel2::Request do
 
 	before( :all ) do
 		setup_logging( :fatal )
+		@factory = Mongrel2::RequestFactory.new( route: '/form' )
 	end
 
 	after( :all ) do
@@ -79,9 +82,7 @@ describe Mongrel2::Request do
 	   "don't look like HTTP ones" do
 
 		message = make_request( :headers => {'METHOD' => '!DIVULGE'} )
-		expect {
-			Mongrel2::Request.parse( message )
-		}.to raise_error( Mongrel2::UnhandledMethodError, /!DIVULGE/ )
+		expect { Mongrel2::Request.parse(message) }.to raise_error( Mongrel2::UnhandledMethodError, /!DIVULGE/ )
 	end
 
 	it "knows what kind of response it should return" do
@@ -110,6 +111,31 @@ describe Mongrel2::Request do
 	end
 
 
+	describe "content-type charset support" do
+
+		it "uses the charset in the content-type header, if present" do
+			body = "some data".encode( 'binary' )
+			req = @factory.post( '/form', body, content_type: 'text/plain; charset=iso-8859-1' )
+
+			req.body.string.encoding.should 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' )
+
+			req.body.string.encoding.should 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 )
+
+			req.body.string.encoding.should be( Encoding::ASCII_8BIT )
+		end
+
+	end
+
 	describe "framework support" do
 
 		before( :all ) do
@@ -161,5 +187,88 @@ describe Mongrel2::Request do
 
 	end
 
+
+	describe "async upload support" do
+
+		before( :all ) do
+			setup_config_db()
+			Mongrel2::Config::Server.create(
+				 uuid:         Mongrel2::RequestFactory::DEFAULT_TEST_UUID,
+				 access_log:   'access.log',
+				 error_log:    'error.log',
+				 pid_file:     '/var/run/mongrel2.pid',
+				 default_host: 'localhost',
+				 port:         663,
+				 chroot:       Dir.tmpdir
+			  )
+		end
+
+		before( :each ) do
+			@spoolfile = Tempfile.new( 'mongrel2.upload', Dir.tmpdir )
+			@spoolfile.print( File.read(__FILE__) )
+			@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 )
+
+			req.should be_upload_started()
+			req.should_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,
+				x_mongrel2_upload_done: @spoolpath )
+
+			req.should_not be_upload_started()
+			req.should be_upload_done()
+			req.should 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,
+				x_mongrel2_upload_done: '/etc/passwd' )
+
+			req.should_not be_upload_started()
+			req.should be_upload_done()
+			req.should_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,
+				x_mongrel2_upload_done: '/etc/passwd' )
+
+			expect {
+				req.uploaded_file
+			}.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,
+				x_mongrel2_upload_done:  @spoolpath )
+
+			req.should be_valid_upload()
+
+			req.uploaded_file.should be_a( Pathname )
+			req.uploaded_file.to_s.should == @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,
+				x_mongrel2_upload_done:  @spoolpath )
+
+			req.should be_valid_upload()
+
+			req.body.should be_a( File )
+			req.body.path.should == @spoolfile.path
+		end
+
+	end
+
 end
 

data/spec/mongrel2/response_spec.rb

@@ -48,7 +48,7 @@ describe Mongrel2::Response do
 
 	it "can be created with a body" do
 		response = Mongrel2::Response.new( TEST_UUID, 8, 'the body' )
-		response.body.should == 'the body'
+		response.body.read.should == 'the body'
 	end
 
 	it "stringifies to its body contents" do
@@ -56,24 +56,39 @@ describe Mongrel2::Response do
 		response.to_s.should == 'the body'
 	end
 
+	it "can be streamed in chunks" do
+		response = Mongrel2::Response.new( TEST_UUID, 8, 'the body' )
+		expect {|b| response.each_chunk(&b) }.to yield_with_args( 'the body' )
+	end
+
+	it "wraps non-IO bodies set via the #body= accessor in a StringIO" do
+		response = Mongrel2::Response.new( TEST_UUID, 8 )
+		response.body = 'a stringioed body'
+		response.body.should be_a( StringIO )
+		response.body.string.should == 'a stringioed body'
+	end
+
 	context	"an instance with default values" do
 
 		before( :each ) do
 			@response = Mongrel2::Response.new( TEST_UUID, 8 )
 		end
 
-		it "has an empty-string body" do
-			@response.body.should == ''
+		it "has an empty-IO body" do
+			@response.body.rewind
+			@response.body.read.should == ''
 		end
 
-		it "supports the append operator to append objects to the body" do
+		it "supports the append operator to append objects to the body IO" do
 			@response << 'some body stuff' << ' and some more body stuff'
-			@response.body.should == 'some body stuff and some more body stuff'
+			@response.body.rewind
+			@response.body.read.should == 'some body stuff and some more body stuff'
 		end
 
-		it "supports #puts for appending objects separated by EOL" do
+		it "supports #puts for appending objects to the body IO separated by EOL" do
 			@response.puts( "some body stuff\n", " and some more body stuff\n\n", :and_a_symbol )
-			@response.body.should == "some body stuff\n and some more body stuff\n\nand_a_symbol\n"
+			@response.body.rewind
+			@response.body.read.should == "some body stuff\n and some more body stuff\n\nand_a_symbol\n"
 		end
 
 	end

data/spec/mongrel2/websocket_spec.rb

@@ -144,7 +144,8 @@ describe Mongrel2::WebSocket do
 			result.conn_id.should == frame.conn_id
 			result.opcode.should == :text
 
-			result.payload.should == ''
+			result.payload.rewind
+			result.payload.read.should == ''
 		end
 
 		it "creates PONG responses with the same payload for PING frames" do
@@ -157,7 +158,8 @@ describe Mongrel2::WebSocket do
 			result.conn_id.should == frame.conn_id
 			result.opcode.should == :pong
 
-			result.payload.should == 'WOO'
+			result.payload.rewind
+			result.payload.read.should == 'WOO'
 		end
 
 		it "allows header flags and/or opcode to be specified when creating a response" do
@@ -171,7 +173,19 @@ describe Mongrel2::WebSocket do
 			result.opcode.should == :close
 			result.should be_fin()
 
-			result.payload.should == ''
+			result.payload.rewind
+			result.payload.read.should == ''
+		end
+
+		it "can be streamed in chunks instead of read all at once" do
+			data = BINARY_DATA * 256
+			binary = @factory.binary( '/websock', data, :fin )
+
+			binary.chunksize = 16
+			binary.each_chunk.to_a[0,2].should == [
+				"\x82\x7F\x00\x00\x00\x00\x00\x01\x00\x00\a\xBD\xB3\xFE\x87\xEB".force_encoding('binary'),
+				"\xA9\x0En2q\xCE\x85\xAF)\x88w_d\xD6M\x9E".force_encoding('binary'),
+			]
 		end
 
 	end
@@ -180,14 +194,15 @@ describe Mongrel2::WebSocket do
 	describe "a WebSocket text frame" do
 
 		before( :each ) do
-			@frame = @factory.text( '/websock', 'Damn the torpedoes!', :fin )
+			@frame = @factory.text( '/websock', '', :fin )
 		end
 
 		it "automatically transcodes its payload to UTF8" do
 			text = "Стрелке!".encode( Encoding::KOI8_U )
-			@frame.payload.replace( text )
+			@frame << text
 
-			@frame.to_s[ 2..-1 ].bytes.to_a.should ==
+			# 2-byte header
+			@frame.bytes.to_a[ 2..-1 ].should ==
 				[0xD0, 0xA1, 0xD1, 0x82, 0xD1, 0x80, 0xD0, 0xB5, 0xD0, 0xBB, 0xD0,
 				 0xBA, 0xD0, 0xB5, 0x21]
 		end
@@ -201,7 +216,10 @@ describe Mongrel2::WebSocket do
 		end
 
 		it "doesn't try to transcode non-UTF8 data" do
-			@frame.to_s.encoding.should == Encoding::ASCII_8BIT
+			# 4-byte header
+			@frame.bytes.to_a[ 4, 16 ].should ==
+				[ 0x07, 0xbd, 0xb3, 0xfe, 0x87, 0xeb, 0xa9, 0x0e, 0x6e, 0x32, 0x71,
+				  0xce, 0x85, 0xaf, 0x29, 0x88 ]
 		end
 	end
 
@@ -213,7 +231,8 @@ describe Mongrel2::WebSocket do
 
 		it "has convenience methods for setting its payload via integer status code" do
 			@frame.set_status( CLOSE_BAD_DATA )
-			@frame.to_s[ 2..-1 ].should == "%d %s" %
+			@frame.payload.rewind
+			@frame.payload.read.should == "%d %s\n" %
 				[ CLOSE_BAD_DATA, CLOSING_STATUS_DESC[CLOSE_BAD_DATA] ]
 		end
 
@@ -227,16 +246,16 @@ describe Mongrel2::WebSocket do
 
 
 		it "raises an exception if its payload is bigger than 125 bytes" do
-			@frame.body = "x" * 126
+			@frame.body << "x" * 126
 			expect {
-				@frame.to_s
+				@frame.validate
 			}.to raise_error( Mongrel2::WebSocket::FrameError, /cannot exceed 125 bytes/i )
 		end
 
 		it "raises an exception if it's fragmented" do
 			@frame.fin = false
 			expect {
-				@frame.to_s
+				@frame.validate
 			}.to raise_error( Mongrel2::WebSocket::FrameError, /fragmented/i )
 		end
 
@@ -274,7 +293,7 @@ describe Mongrel2::WebSocket do
 			binary = @factory.binary( '/websock', BINARY_DATA, :fin )
 
 			# 1 + 1 + 2
-			binary.to_s[0,4].bytes.to_a.should == [ 0x82, 0x7E, 0x01, 0x00 ]
+			binary.bytes.to_a[0,4].should == [ 0x82, 0x7E, 0x01, 0x00 ]
 			binary.to_s[4..-1].should == BINARY_DATA
 		end
 
@@ -284,7 +303,7 @@ describe Mongrel2::WebSocket do
 			binary = @factory.binary( '/websock', data, :fin )
 
 			# 1 + 1 + 8
-			binary.to_s[0,10].bytes.to_a.should ==
+			binary.bytes.to_a[0,10].should ==
 				[ 0x82, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00 ]
 			binary.to_s[10..-1].should == data
 		end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongrel2
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.25.0.pre.285
   prerelease: 
 platform: ruby
 authors:
@@ -36,7 +36,7 @@ cert_chain:
   YUhDS0xaZFNLai9SSHVUT3QrZ2JsUmV4OEZBaDhOZUEKY21saFhlNDZwWk5K
   Z1dLYnhaYWg4NWpJang5NWhSOHZPSStOQU01aUg5a09xSzEzRHJ4YWNUS1Bo
   cWo1UGp3RgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2012-05-31 00:00:00.000000000 Z
+date: 2012-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri