strelka 0.0.1.pre.263 → 0.0.1.pre.265

data/lib/strelka/httpresponse/negotiation.rb

@@ -124,19 +124,14 @@ module Strelka::HTTPResponse::Negotiation
 
 	### Stringify the response -- overridden to use the negotiated body.
 	def to_s
-		return [
-			self.status_line,
-			self.header_data,
-			self.negotiated_body
-		].join( "\r\n" )
+		self.negotiate
+		super
 	end
 
 
 	### Transform the entity body if it doesn't meet the criteria
 	def negotiated_body
-		return '' if self.bodiless?
-
-		self.negotiate 
+		self.negotiate
 		return self.body
 	end
 

data/lib/strelka/httpresponse.rb

@@ -111,12 +111,15 @@ class Strelka::HTTPResponse < Mongrel2::HTTPResponse
 
 	### Add a charset to the content-type header in +headers+ if possible.
 	def add_content_type_charset( headers )
+		return unless headers.content_type.start_with?( 'text' )
+
 		charset = self.find_header_charset
 		self.log.debug "Setting the charset in the content-type header to: %p" % [ charset.name ]
 
 		headers.content_type.slice!( CONTENT_TYPE_CHARSET_RE ) and
 			self.log.debug "  removed old charset parameter."
-		headers.content_type += "; charset=#{charset.name}" unless charset == Encoding::ASCII_8BIT
+		headers.content_type += "; charset=#{charset.name}" unless
+			charset == Encoding::ASCII_8BIT
 	end
 
 
@@ -157,7 +160,7 @@ class Strelka::HTTPResponse < Mongrel2::HTTPResponse
 		enc ||= @body.internal_encoding if @body.respond_to?( :internal_encoding )
 		enc ||= @body.external_encoding if @body.respond_to?( :external_encoding )
 
-		self.log.debug "  Body didn't respond to either #internal_encoding or #external_encoding." unless enc
+		self.log.debug "  encoding of the entity body is: %p" % [ enc ]
 		return enc
 	end
 

data/spec/strelka/httpresponse/negotiation_spec.rb

@@ -44,6 +44,20 @@ describe Strelka::HTTPResponse::Negotiation do
 	end
 
 
+	it "still stringifies as a valid HTTP response" do
+		@res.puts( "FOOM!" )
+		@res.content_type = 'text/plain'
+		@res.charset = Encoding::UTF_8
+		@res.to_s.should include(
+			'HTTP/1.1 200 OK',
+			'Content-Length: 6',
+			'Content-Type: text/plain; charset=UTF-8',
+			"\r\n\r\nFOOM!"
+		)
+	end
+
+
+
 	describe "content-alternative callback methods" do
 
 		it "can provide blocks for bodies of several different mediatypes" do

data/spec/strelka/httpresponse_spec.rb

@@ -34,14 +34,14 @@ describe Strelka::HTTPResponse do
 	end
 
 
-	it "adds a charset to the response's content-type header if one is explicitly set" do
+	it "adds a charset to the response's content-type header if it's text/* and one is explicitly set" do
 		@res.content_type = 'text/html'
 		@res.charset = Encoding::UTF_8
 
 		@res.header_data.should =~ %r{Content-type: text/html; charset=UTF-8}i
 	end
 
-	it "replaces the existing content-type header charset if one is explicitly set" do
+	it "replaces the existing content-type header charset if it's text/* and one is explicitly set" do
 		@res.content_type = 'text/html; charset=iso-8859-1'
 		@res.charset = Encoding::UTF_8
 
@@ -50,7 +50,7 @@ describe Strelka::HTTPResponse do
 	end
 
 	it "adds a charset to the response's content-type header based on the entity body's encoding " +
-	   "if there isn't already one set on the request or the header" do
+	   "if it's text/* and there isn't already one set on the request or the header" do
 		@res.body = "Стрелке".encode( 'koi8-r' )
 		@res.content_type = 'text/plain'
 
@@ -58,14 +58,14 @@ describe Strelka::HTTPResponse do
 	end
 
 	it "adds a charset to the response's content-type header based on the entity body's " +
-	   "external encoding if there isn't already one set on the request or the header" do
+	   "external encoding if it's text/* and there isn't already one set on the request or the header" do
 		@res.body = File.open( __FILE__, 'r:iso-8859-5' )
 		@res.content_type = 'text/plain'
 
 		@res.header_data.should =~ /charset=iso-8859-5/i
 	end
 
-	it "doesn't replace a charset in the content-type header with one based on the entity body" do
+	it "doesn't replace a charset in a text/* content-type header with one based on the entity body" do
 		@res.body = "Стрелке".encode( 'iso-8859-5' )
 		@res.content_type = 'text/plain; charset=utf-8'
 
@@ -81,6 +81,11 @@ describe Strelka::HTTPResponse do
 		@res.header_data.should_not =~ /charset/i
 	end
 
+	it "doesn't add a charset to the response's content-type header if it's not text/*" do
+		@res.content_type = 'application/octet-stream'
+		@res.header_data.should_not =~ /charset/i
+	end
+
 	it "strips an existing charset from the response's content-type header if it's explicitly " +
 	   "set to ASCII-8BIT" do
 		@res.content_type = 'text/plain; charset=ISO-8859-15'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strelka
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre.263
+  version: 0.0.1.pre.265
   prerelease: 
 platform: ruby
 authors: