mongrel2 0.25.0.pre.285 → 0.25.0.pre.288

data/lib/mongrel2.rb

@@ -23,7 +23,7 @@ module Mongrel2
 	VERSION = '0.25.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 928743f397cc $
+	REVISION = %q$Revision: 893e0493be04 $
 
 
 	require 'mongrel2/constants'

data/lib/mongrel2/httprequest.rb

@@ -32,10 +32,6 @@ class Mongrel2::HTTPRequest < Mongrel2::Request
 	###	I N S T A N C E   M E T H O D S
 	#################################################################
 
-	# Allow the entity body of the request to be modified
-	attr_writer :body
-
-
 	### Return +true+ if the request is an HTTP/1.1 request and its
 	### 'Connection' header indicates that the connection should stay
 	### open.

data/lib/mongrel2/request.rb

@@ -141,13 +141,21 @@ class Mongrel2::Request
 	attr_reader :headers
 	alias_method :header, :headers
 
-	# The request body data, if there is any, as an IO object
+	# The request body data, if there is any, as an IO(ish) object
 	attr_reader :body
 
 	# The raw request content, if the request was parsed from mongrel2
 	attr_reader :raw
 
 
+	### Set the request's entity body to +newbody+. If +newbody+ is a String-ish object
+	### (i.e., it responds to #to_str), it will be wrapped in a StringIO in 'r+' mode).
+	def body=( newbody )
+		newbody = StringIO.new( newbody, 'a+' ) if newbody.respond_to?( :to_str )
+		@body = newbody
+	end
+
+
 	### Create a Mongrel2::Response that will respond to the same server/connection as
 	### the receiver. If you wish your specialized Request class to have a corresponding
 	### response type, you can override the Mongrel2::Request.response_class method 

data/lib/mongrel2/response.rb

@@ -64,10 +64,10 @@ class Mongrel2::Response
 	attr_accessor :chunksize
 
 
-	### Set the response body to +newbody+. If +newbody+ is not a IO-like object (i.e., it
-	### doesn't respond to #eof?, it will be wrapped in a StringIO in 'a+' mode).
+	### Set the response's entity body to +newbody+. If +newbody+ is a String-ish object
+	### (i.e., it responds to #to_str), it will be wrapped in a StringIO in 'a+' mode).
 	def body=( newbody )
-		newbody = StringIO.new( newbody, 'a+' ) unless newbody.respond_to?( :eof? )
+		newbody = StringIO.new( newbody, 'a+' ) if newbody.respond_to?( :to_str )
 		@body = newbody
 	end
 

data/spec/mongrel2/httprequest_spec.rb

@@ -79,12 +79,6 @@ describe Mongrel2::HTTPRequest do
 		@req.should be_keepalive()
 	end
 
-	it "allows the request body to be rewritten" do
-		@req.body = 'something else'
-		@req.body.should == 'something else'
-	end
-
-
 	describe "header convenience methods" do
 
 		before( :each ) do

data/spec/mongrel2/request_spec.rb

@@ -108,6 +108,18 @@ describe Mongrel2::Request do
 			@req.response.should equal( @req.response )
 		end
 
+		it "allows the entity body to be replaced by assigning a String" do
+			@req.body = 'something else'
+			@req.body.should be_a( StringIO )
+			@req.body.string.should == 'something else'
+		end
+
+		it "doesn't try to wrap non-stringish entity body replacements in a StringIO" do
+			testobj = Object.new
+			@req.body = testobj
+			@req.body.should be( testobj )
+		end
+
 	end
 
 

data/spec/mongrel2/response_spec.rb

@@ -61,13 +61,20 @@ describe Mongrel2::Response do
 		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
+	it "wraps stringifiable 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
 
+	it "doesn't try to wrap non-stringfiable bodies in a StringIO" do
+		response = Mongrel2::Response.new( TEST_UUID, 8 )
+		testbody = Object.new
+		response.body = testbody
+		response.body.should be( testbody )
+	end
+
 	context	"an instance with default values" do
 
 		before( :each ) do

metadata

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