strelka 0.0.1.pre.257 → 0.0.1.pre.262

data/ChangeLog

@@ -1,9 +1,34 @@
+2012-06-20  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/strelka/httprequest/session.rb,
+	lib/strelka/httpresponse/session.rb, lib/strelka/session.rb,
+	lib/strelka/session/default.rb,
+	spec/strelka/httprequest/session_spec.rb,
+	spec/strelka/httpresponse/session_spec.rb,
+	spec/strelka/session/default_spec.rb:
+	Fix session expiration for cookie-based persistance
+	* * * Conversion to stream-based Mongrel2 API
+	[7389c2f1e8e3] [tip]
+
+2012-06-20  Mahlon E. Smith  <mahlon@martini.nu>
+
+	* lib/strelka/httprequest.rb:
+	Ignore possible Content-Type charsets when parsing form data.
+	[432d88e45c15]
+
+2012-06-19  Mahlon E. Smith  <mahlon@laika.com>
+
+	* lib/strelka/paramvalidator.rb, spec/strelka/paramvalidator_spec.rb:
+	Don't use the raw_form to determine if the ParamValidator required
+	revalidation, just keep track of that ourselves.
+	[4d71cc097677]
+
 2012-06-04  Mahlon E. Smith  <mahlon@martini.nu>
 
 	* lib/strelka/app/auth.rb, lib/strelka/authprovider/hostaccess.rb,
 	spec/strelka/authprovider/hostaccess_spec.rb:
 	Fix required arguments for the hostaccess auth provider.
-	[4a20533a0551] [tip]
+	[4a20533a0551]
 
 2012-06-01  Michael Granger  <ged@FaerieMUD.org>
 
@@ -126,7 +151,7 @@
 	* bin/strelka:
 	Load the apps in bin/strelka before dumping the config so
 	Configurability defaults for them show up
-	[726ed30cb34e] [github/master]
+	[726ed30cb34e]
 
 	* .rvm.gems, Rakefile:
 	Add dependency on Foreman
@@ -738,7 +763,7 @@
 
 	* lib/strelka/app/errors.rb, spec/strelka/app/errors_spec.rb:
 	Add documentation for the Errors plugin, improve test coverage.
-	[ff3ef6e5a7a1] [github/master@default]
+	[ff3ef6e5a7a1]
 
 	* Manifest.txt:
 	Add session files to the manifest

data/lib/strelka/app/negotiation.rb

@@ -24,6 +24,7 @@ require 'strelka/httpresponse/negotiation'
 #       add_content_type :tnetstring, 'text/x-tnetstring' do |response|
 #           tnetstr = nil
 #           begin
+#               response.body.rewind
 #               tnetstr = TNetString.dump( response.body )
 #           rescue => err
 #               self.log.error "%p while transforming entity body to a TNetString: %s" %

data/lib/strelka/httprequest.rb

@@ -177,11 +177,15 @@ class Strelka::HTTPRequest < Mongrel2::HTTPRequest
 
 	### Return a Hash of request form data.
 	def parse_form_data
-		case self.headers.content_type
-		when nil
+		unless self.headers.content_type
 			finish_with( HTTP::BAD_REQUEST, "Malformed request (no content type?)" )
+		end
+
+		self.body.rewind
+
+		case self.headers.content_type.split( ';' ).first
 		when 'application/x-www-form-urlencoded'
-			return merge_query_args( URI.decode_www_form(self.body) )
+			return merge_query_args( URI.decode_www_form(self.body.read) )
 		when 'application/json', 'text/javascript'
 			return Yajl.load( self.body )
 		when 'text/x-yaml', 'application/x-yaml'

data/lib/strelka/httprequest/session.rb

@@ -67,17 +67,9 @@ module Strelka::HTTPRequest::Session
 	end
 
 
-	### Purge the request's session from the session store.
-	def destroy_session
-		self.log.debug "Removing session id %s" % [ self.session.session_id ]
-		Strelka::App::Sessions.session_class.delete_session_data( self.session.session_id )
-		@session = nil
-	end
-
-
 	### Set the request's session object.
 	def session=( new_session )
-		new_session.namespace = self.session_namespace
+		new_session.namespace = self.session_namespace if new_session.respond_to?( :namespace )
 		@session = new_session
 	end
 

data/lib/strelka/httpresponse.rb

@@ -122,12 +122,14 @@ class Strelka::HTTPResponse < Mongrel2::HTTPResponse
 
 	### Try to find a character set for the request, using the #charset attribute first,
 	### then the 'charset' parameter from the content-type header, then the Encoding object
-	### associated with the entity body, then the default external encoding (if it's set). If
-	### none of those are found, this method returns ISO-8859-1.
+	### associated with the entity body, then the default internal and external encodings
+	### (if they're set, in that order). If none of those are found, this method returns
+	### ISO-8859-1.
 	def find_header_charset
 		return ( self.charset ||
 		         self.content_type_charset ||
-		         self.entity_body_charset ||
+		         self.entity_body_charset  ||
+				 Encoding.default_internal ||
 		         Encoding.default_external ||
 		         Encoding::ISO_8859_1 )
 	end
@@ -150,20 +152,13 @@ class Strelka::HTTPResponse < Mongrel2::HTTPResponse
 	### couldn't be determined.
 	def entity_body_charset
 		self.log.debug "Deriving charset from the entity body..."
+		enc = nil
 
-		# Have to use the instance variable instead of #body because plugins can
-		# override #body
+		enc ||= @body.internal_encoding if @body.respond_to?( :internal_encoding )
+		enc ||= @body.external_encoding if @body.respond_to?( :external_encoding )
 
-		if @body.respond_to?( :encoding )
-			self.log.debug "  String-ish API. Encoding is: %p" % [ @body.encoding ]
-			return @body.encoding
-		elsif @body.respond_to?( :external_encoding )
-			self.log.debug "  IO-ish API. Encoding is: %p" % [ @body.external_encoding ]
-			return @body.external_encoding
-		end
-
-		self.log.debug "  Body didn't respond to either #encoding or #external_encoding."
-		return nil
+		self.log.debug "  Body didn't respond to either #internal_encoding or #external_encoding." unless enc
+		return enc
 	end
 
 

data/lib/strelka/httpresponse/negotiation.rb

@@ -51,6 +51,15 @@ module Strelka::HTTPResponse::Negotiation
 		'application/json'   => Yajl.method( :dump ),
 	}
 
+	# Transcoding to Unicode is likely enough to work to warrant auto-transcoding. These
+	# are the charsets that will be used for auto-transcoding in the case where the whole
+	# entity body isn't in memory
+	UNICODE_CHARSETS = [
+		Encoding::UTF_8,
+		Encoding::UTF_16BE,
+		Encoding::UTF_32BE,
+	]
+
 
 	### Add some instance variables for negotiation.
 	def initialize( * )
@@ -127,7 +136,7 @@ module Strelka::HTTPResponse::Negotiation
 	def negotiated_body
 		return '' if self.bodiless?
 
-		self.negotiate
+		self.negotiate 
 		return self.body
 	end
 
@@ -460,45 +469,65 @@ module Strelka::HTTPResponse::Negotiation
 	### if it
 	def transform_charset
 		self.log.debug "Looking for charset transformations."
-		self.better_charsets.each do |charset|
-			self.log.debug "  trying to transcode to: %s" % [ charset ]
+		if self.body.respond_to?( :string ) || self.body.respond_to?( :fileno )
+
+			# Try each charset that's better than what we have already
+			self.better_charsets.each do |charset|
+				self.log.debug "  trying to transcode to: %s" % [ charset ]
 
-			if self.body.respond_to?( :encode )
-				self.log.debug "  body is a string; trying direct transcoding"
-				if self.transcode_body_string( charset )
-					self.log.debug "  success; body is now %p" % [ self.body.encoding ]
+				# If it succeeds, indicate that transcoding took place in the Vary header
+				if self.transcode_body( charset )
+					self.log.debug "  success; body is now %p" % [ charset ]
 					self.vary_fields.add( 'accept-charset' )
 					break
 				end
-
-			# Can change the external_encoding if it's a File that has a #path
-			elsif self.body.respond_to?( :external_encoding )
-				raise NotImplementedError,
-					"Support for transcoding %p objects isn't done." % [ self.body.class ]
-			else
-				self.log.warn "Don't know how to transcode a %p" % [ self.body.class ]
 			end
+		else
+			self.log.warn "Don't know how to transcode a %p" % [ self.body.class ]
 		end
 	end
 
 
-	### Try to transcode the entity body String to one of the specified +charsets+. Returns
+	### Try to transcode the entity body stream to one of the specified +charsets+. Returns
 	### the succesful Encoding object if transcoding succeeded, or +nil+ if transcoding
 	### failed.
-	def transcode_body_string( charset )
+	def transcode_body( charset )
 		unless enc = charset.encoding_object
 			self.log.warn "    unsupported charset: %s" % [ charset ]
 			return false
 		end
 
-		succeeded = false
 		begin
-			succeeded = self.body.encode!( enc )
+
+			# StringIOs get their internal string transcoded directly
+			if self.body.respond_to?( :string )
+				self.body.string.encode!( enc )
+				return true
+
+			# For other IO objects, the situation is trickier -- we can't know that
+			# encoding will succeed for more-restrictive charsets, so we only do
+			# automatic transcoding if the 'wanted' one is a Unicode charset.
+			# This probably isn't perfect, either.
+			# :FIXME: Probably need a list of exceptions, i.e., charsets that don't
+			# always transcode nicely into Unicode.
+			elsif self.body.respond_to?( :fileno ) && UNICODE_CHARSETS.include?( enc )
+				self.log.info "Assuming %s data can be transcoded into %s" %
+					[ self.body.internal_encoding, enc ]
+
+				# Don't close the FD when this IO goes out of scope
+				oldbody = self.body
+				oldbody.auto_close = false
+
+				# Re-open the same file descriptor, but transcoding to the wanted encoding
+				self.body = IO.for_fd( oldbody.fileno, internal_encoding: enc )
+				return true
+			end
+
 		rescue Encoding::UndefinedConversionError => err
 			self.log.error "%p while transcoding: %s" % [ err.class, err.message ]
 		end
 
-		return succeeded
+		return false
 	end
 
 

data/lib/strelka/httpresponse/session.rb

@@ -91,6 +91,18 @@ module Strelka::HTTPResponse::Session
 	end
 
 
+	### Purge the response's session from the session store and expire its ID.
+	def destroy_session
+		if self.session?
+			self.log.debug "Destroying session: %p" % [ self.session ]
+			self.session.destroy( self )
+			self.request.session = @session = nil
+		else
+			self.log.debug "No session to destroy."
+		end
+	end
+
+
 	### Tell the associated session to save itself and set up the session ID in the
 	### response, if one exists.
 	def save_session

data/lib/strelka/paramvalidator.rb

@@ -164,6 +164,7 @@ class Strelka::ParamValidator < ::FormValidator
 		@filters_array       = []
 		@untaint_fields      = []
 		@untaint_all         = false
+		@validated           = false
 
 		@parsed_params       = nil
 	end
@@ -188,6 +189,7 @@ class Strelka::ParamValidator < ::FormValidator
 		@filters_array       = @filters_array.clone
 		@untaint_fields      = @untaint_fields.clone
 		@untaint_all         = original.untaint_all?
+		@validated           = original.validated?
 
 		@parsed_params       = @parsed_params.clone if @parsed_params
 	end
@@ -358,6 +360,7 @@ class Strelka::ParamValidator < ::FormValidator
 
 		self.log.debug "Calling superclass's validate: %p" % [ self ]
 		super( params, profile )
+		@validated = true
 	end
 
 
@@ -443,7 +446,7 @@ class Strelka::ParamValidator < ::FormValidator
 
 	### Returns +true+ if the parameters have been validated.
 	def validated?
-		return !@raw_form.empty?
+		return @validated
 	end
 
 

data/lib/strelka/session.rb

@@ -169,6 +169,13 @@ class Strelka::Session
 	pure_virtual :save
 
 
+	# :call-seq:
+	#   destroy( response )
+	# Destroy the session and set up the specified +response+ to expire the
+	# session ID.
+	pure_virtual :destroy
+
+
 	# :call-seq:
 	#   key?( key ) -> boolean
 	#

data/lib/strelka/session/default.rb

@@ -177,7 +177,7 @@ class Strelka::Session::Default < Strelka::Session
 	def save( response )
 		self.log.debug "Saving session %s" % [ self.session_id ]
 		self.class.save_session_data( self.session_id, @hash )
-		self.log.debug "Adding session cookie to the request."
+		self.log.debug "Adding session cookie to the response."
 
 		session_cookie = Strelka::Cookie.new(
 			self.class.cookie_name,
@@ -189,6 +189,23 @@ class Strelka::Session::Default < Strelka::Session
 	end
 
 
+	### Delete the session from storage and expire the session cookie from the given +response+.
+	def destroy( response )
+		self.log.debug "Destroying session %s" % [ self.session_id ]
+		self.class.delete_session_data( self.session_id )
+
+		self.log.debug "Adding expired session cookie to the response"
+		session_cookie = Strelka::Cookie.new(
+			self.class.cookie_name,
+			self.session_id,
+			self.class.cookie_options || {}
+		)
+		session_cookie.expire!
+
+		response.cookies << session_cookie
+	end
+
+
 	### Return the Hash that corresponds with the current namespace's storage. If no
 	### namespace is currently set, returns the entire session store as a Hash of Hashes
 	### keyed by namespaces as Symbols.

data/spec/strelka/app/errors_spec.rb

@@ -73,7 +73,8 @@ describe Strelka::App::Errors do
 			res = @app.new.handle( req )
 
 			res.status.should == HTTP::OK
-			res.body.should == "Oh yeah! Kool-Aid!\n"
+			res.body.rewind
+			res.body.read.should == "Oh yeah! Kool-Aid!\n"
 		end
 
 		it "raises an error if a handler is declared with both a template and a block" do
@@ -105,7 +106,8 @@ describe Strelka::App::Errors do
 			req = @request_factory.get( '/foom' )
 			res = @app.new.handle( req )
 
-			res.body.should =~ /internal server error/i
+			res.body.rewind
+			res.body.read.should =~ /internal server error/i
 		end
 
 		it "calls a callback-style handler for any status when finished with BAD_REQUEST" do
@@ -124,7 +126,8 @@ describe Strelka::App::Errors do
 			res = @app.new.handle( req )
 
 			res.status.should == HTTP::BAD_REQUEST
-			res.body.should == '(400) Filthy banana'
+			res.body.rewind
+			res.body.read.should == '(400) Filthy banana'
 		end
 
 
@@ -139,7 +142,8 @@ describe Strelka::App::Errors do
 			req = @request_factory.get( '/foom' )
 			res = @app.new.handle( req )
 
-			res.body.should == 'NOPE!'
+			res.body.rewind
+			res.body.read.should == 'NOPE!'
 		end
 
 
@@ -154,7 +158,8 @@ describe Strelka::App::Errors do
 			req = @request_factory.get( '/foom' )
 			res = @app.new.handle( req )
 
-			res.body.should == 'Error:  JAMBA'
+			res.body.rewind
+			res.body.read.should == 'Error:  JAMBA'
 		end
 
 		it "sets the error status info in the transaction notes when the response is handled by a status-handler" do
@@ -196,7 +201,8 @@ describe Strelka::App::Errors do
 			res.notes[:status_info][:status].should == HTTP::SERVER_ERROR
 			res.notes[:status_info][:message].should == "An uncaught exception"
 			res.notes[:status_info][:exception].should be_a( RuntimeError )
-			res.body.should == "RuntimeError"
+			res.body.rewind
+			res.body.read.should == "RuntimeError"
 		end
 
 
@@ -228,7 +234,8 @@ describe Strelka::App::Errors do
 				req = @request_factory.get( '/foom' )
 				res = @app.new.handle( req )
 
-				res.body.should =~ /error-handler template/i
+				res.body.rewind
+				res.body.read.should =~ /error-handler template/i
 			end
 		end
 

data/spec/strelka/app/restresources_spec.rb

@@ -225,7 +225,8 @@ describe Strelka::App::RestResources do
 					res = @app.new.handle( req )
 
 					res.status.should == HTTP::NOT_FOUND
-					res.body.should =~ /no such server/i
+					res.body.rewind
+					res.body.read.should =~ /no such server/i
 				end
 
 				it "returns a NOT FOUND response when fetching a resource with an invalid ID" do
@@ -233,7 +234,8 @@ describe Strelka::App::RestResources do
 					res = @app.new.handle( req )
 
 					res.status.should == HTTP::NOT_FOUND
-					res.body.should =~ /requested resource was not found/i
+					res.body.rewind
+					res.body.read.should =~ /requested resource was not found/i
 				end
 
 				it "has a GET route for fetching the resource via one of its dataset methods" do

data/spec/strelka/app/templating_spec.rb

@@ -116,7 +116,8 @@ describe Strelka::App::Templating do
 
 				res = @app.new.handle( @req )
 
-				res.body.should == "A template for testing the Templating plugin.\n"
+				res.body.rewind
+				res.body.read.should == "A template for testing the Templating plugin.\n"
 				res.status.should == 200
 			end
 
@@ -129,7 +130,8 @@ describe Strelka::App::Templating do
 
 				res = @app.new.handle( @req )
 
-				res.body.should == "A template for testing the Templating plugin.\n"
+				res.body.rewind
+				res.body.read.should == "A template for testing the Templating plugin.\n"
 				res.status.should == 200
 			end
 
@@ -146,7 +148,8 @@ describe Strelka::App::Templating do
 
 				res = @app.new.handle( @req )
 
-				res.body.should == "A template for testing the Templating plugin.\n"
+				res.body.rewind
+				res.body.read.should == "A template for testing the Templating plugin.\n"
 				res.status.should == 200
 			end
 
@@ -167,7 +170,8 @@ describe Strelka::App::Templating do
 
 				res = @app.new.handle( @req )
 
-				res.body.should == "A minimal layout template.\n" +
+				res.body.rewind
+				res.body.read.should == "A minimal layout template.\n" +
 					"A template for testing the Templating plugin.\n\n"
 				res.status.should == 200
 			end
@@ -188,7 +192,8 @@ describe Strelka::App::Templating do
 
 				res = @app.new.handle( @req )
 
-				res.body.should == "A template for testing the Templating plugin.\n"
+				res.body.rewind
+				res.body.read.should == "A template for testing the Templating plugin.\n"
 			end
 
 		end

data/spec/strelka/app_spec.rb

@@ -169,7 +169,8 @@ describe Strelka::App do
 
 		res.should be_a( Mongrel2::HTTPResponse )
 		res.status_line.should == 'HTTP/1.1 204 No Content'
-		res.body.should == ''
+		res.body.rewind
+		res.body.read.should == ''
 	end
 
 
@@ -190,7 +191,8 @@ describe Strelka::App do
 
 		res.should be_a( Mongrel2::HTTPResponse )
 		res.status_line.should == 'HTTP/1.1 304 Not Modified'
-		res.body.should == ''
+		res.body.rewind
+		res.body.read.should == ''
 	end
 
 
@@ -211,7 +213,8 @@ describe Strelka::App do
 		res.should be_a( Mongrel2::HTTPResponse )
 		res.status_line.should == 'HTTP/1.1 403 Forbidden'
 		res.content_type.should == 'text/plain'
-		res.body.should == "You aren't allowed to look at that.\n"
+		res.body.rewind
+		res.body.read.should == "You aren't allowed to look at that.\n"
 	end
 
 
@@ -233,7 +236,8 @@ describe Strelka::App do
 		res.should be_a( Mongrel2::HTTPResponse )
 		res.status_line.should == 'HTTP/1.1 403 Forbidden'
 		res.content_type.should == 'text/html'
-		res.body.should == "You aren't allowed to look at that.\n"
+		res.body.rewind
+		res.body.read.should == "You aren't allowed to look at that.\n"
 	end
 
 	it "sets the error status info in the transaction notes for error responses" do
@@ -302,7 +306,8 @@ describe Strelka::App do
 
 		res.should be_a( Mongrel2::HTTPResponse )
 		res.content_type.should == 'text/plain'
-		res.body.should be_empty()
+		res.body.rewind
+		res.body.read.should == ''
 		res.headers.content_length.should == "Rendered output.\n".bytesize
 	end
 
@@ -347,7 +352,8 @@ describe Strelka::App do
 		res.should be_a( Mongrel2::HTTPResponse )
 		res.status.should == HTTP::SERVER_ERROR
 		res.content_type = 'text/plain'
-		res.body.should =~ /internal server error/i
+		res.body.rewind
+		res.body.read.should =~ /internal server error/i
 	end
 
 	it "isn't in 'developer mode' by default" do
@@ -415,7 +421,8 @@ describe Strelka::App do
 
 			res.should be_a( Mongrel2::HTTPResponse )
 			res.status_line.should == 'HTTP/1.1 200 OK'
-			res.body.should == "Request was funted by Cragnux/1.1.3!\n"
+			res.body.rewind
+			res.body.read.should == "Request was funted by Cragnux/1.1.3!\n"
 		end
 
 

data/spec/strelka/httprequest/session_spec.rb

@@ -96,9 +96,7 @@ describe Strelka::HTTPRequest::Session, "-extended request" do
 	context "with a session ID" do
 
 		before( :each ) do
-			cookie_name = Strelka::Session::Default.cookie_name
 			@sess_id = Strelka::Session::Default.get_session_id
-			@req.header.cookie = "#{cookie_name}=#{@sess_id}"
 		end
 
 		it "knows that it doesn't have a session unless the ID exists" do
@@ -113,6 +111,8 @@ describe Strelka::HTTPRequest::Session, "-extended request" do
 			end
 
 			it "knows that it has a session" do
+				cookie_name = Strelka::Session::Default.cookie_name
+				@req.header.cookie = "#{cookie_name}=#{@sess_id}"
 				@req.should have_session()
 			end
 
@@ -125,11 +125,6 @@ describe Strelka::HTTPRequest::Session, "-extended request" do
 				@req.session_loaded?.should be_true()
 			end
 
-			it "can purge the session from the database" do
-				@req.should have_session()
-				@req.destroy_session
-				@req.should_not have_session()
-			end
 		end
 
 	end

data/spec/strelka/httpresponse/negotiation_spec.rb

@@ -52,7 +52,8 @@ describe Strelka::HTTPResponse::Negotiation do
 			@res.for( 'application/json' ) { %{["a JSON dump"]} }
 			@res.for( 'application/x-yaml' ) { "---\na: YAML dump\n\n" }
 
-			@res.negotiated_body.should == "---\na: YAML dump\n\n"
+			@res.negotiated_body.rewind
+			@res.negotiated_body.read.should == "---\na: YAML dump\n\n"
 			@res.content_type.should == "application/x-yaml"
 			@res.header_data.should =~ /accept(?!-)/i
 		end
@@ -64,7 +65,8 @@ describe Strelka::HTTPResponse::Negotiation do
 				{ uuid: 'fc85e35b-c9c3-4675-a882-25bf98d11e1b', name: "Harlot's Garden" }
 			end
 
-			@res.negotiated_body.should == "{\"uuid\":\"fc85e35b-c9c3-4675-a882-25bf98d11e1b\"," +
+			@res.negotiated_body.rewind
+			@res.negotiated_body.read.should == "{\"uuid\":\"fc85e35b-c9c3-4675-a882-25bf98d11e1b\"," +
 				"\"name\":\"Harlot's Garden\"}"
 			@res.content_type.should == "application/json"
 			@res.header_data.should =~ /accept(?!-)/i
@@ -77,7 +79,8 @@ describe Strelka::HTTPResponse::Negotiation do
 				{ uuid: 'fc85e35b-c9c3-4675-a882-25bf98d11e1b', name: "Harlot's Garden" }
 			end
 
-			@res.negotiated_body.should == "{\"uuid\":\"fc85e35b-c9c3-4675-a882-25bf98d11e1b\"," +
+			@res.negotiated_body.rewind
+			@res.negotiated_body.read.should == "{\"uuid\":\"fc85e35b-c9c3-4675-a882-25bf98d11e1b\"," +
 				"\"name\":\"Harlot's Garden\"}"
 			@res.content_type.should == "application/json"
 			@res.header_data.should =~ /accept(?!-)/i
@@ -94,7 +97,7 @@ describe Strelka::HTTPResponse::Negotiation do
 			@res.body = File.read( __FILE__, encoding: 'iso-8859-5' )
 			@res.content_type = 'text/plain'
 
-			@res.negotiated_body.encoding.should == Encoding::KOI8_R
+			@res.negotiated_body.external_encoding.should == Encoding::KOI8_R
 			@res.header_data.should =~ /accept-charset(?!-)/i
 		end
 
@@ -104,7 +107,7 @@ describe Strelka::HTTPResponse::Negotiation do
 			@res.body = File.read( __FILE__, encoding: 'iso-8859-5' )
 			@res.content_type = 'application/json'
 
-			@res.negotiated_body.encoding.should == Encoding::UTF_8
+			@res.negotiated_body.external_encoding.should == Encoding::UTF_8
 			@res.header_data.should =~ /accept-charset(?!-)/i
 		end
 
@@ -135,7 +138,8 @@ describe Strelka::HTTPResponse::Negotiation do
 			@res.for_language( :de ) { "German translation" }
 			@res.for_language( :sl ) { "Slovenian translation" }
 
-			@res.negotiated_body.should == "German translation"
+			@res.negotiated_body.rewind
+			@res.negotiated_body.read.should == "German translation"
 			@res.languages.should == ["de"]
 			@res.header_data.should =~ /accept-language/i
 		end
@@ -150,7 +154,8 @@ describe Strelka::HTTPResponse::Negotiation do
 			@res.for_language( :de ) { "German translation" }
 			@res.for_language( :sl ) { "Slovenian translation" }
 
-			@res.negotiated_body.should == "German translation"
+			@res.negotiated_body.rewind
+			@res.negotiated_body.read.should == "German translation"
 			@res.languages.should == ["de"]
 			@res.header_data.should =~ /accept-language/i
 		end
@@ -169,7 +174,8 @@ describe Strelka::HTTPResponse::Negotiation do
 				translations[ lang.to_sym ]
 			end
 
-			@res.negotiated_body.should == "Portuguese translation"
+			@res.negotiated_body.rewind
+			@res.negotiated_body.read.should == "Portuguese translation"
 			@res.languages.should == ["pt"]
 			@res.header_data.should =~ /accept-language/i
 		end
@@ -183,7 +189,8 @@ describe Strelka::HTTPResponse::Negotiation do
 			@res.for_language( :de ) { "German translation" }
 			@res.for_language( :sl ) { "Slovenian translation" }
 
-			@res.negotiated_body.should == "English translation"
+			@res.negotiated_body.rewind
+			@res.negotiated_body.read.should == "English translation"
 			@res.languages.should == ["en"]
 			@res.header_data.should =~ /accept-language/i
 		end
@@ -198,10 +205,11 @@ describe Strelka::HTTPResponse::Negotiation do
 
 			@res << "the text body"
 			@res.content_type = 'text/plain'
-			@res.for_encoding( :deflate ) { @res.body + " (deflated)" }
-			@res.for_encoding( :gzip ) { @res.body + " (gzipped)" }
+			@res.for_encoding( :deflate ) { @res.body << " (deflated)" }
+			@res.for_encoding( :gzip ) { @res.body << " (gzipped)" }
 
-			@res.negotiated_body.should == "the text body (gzipped)"
+			@res.negotiated_body.rewind
+			@res.negotiated_body.read.should == "the text body (gzipped)"
 			@res.encodings.should include( "gzip" )
 			@res.header_data.should =~ /accept-encoding/i
 			@res.header_data.should_not =~ /identity/i
@@ -213,10 +221,11 @@ describe Strelka::HTTPResponse::Negotiation do
 
 			@res << "the text body"
 			@res.content_type = 'text/plain'
-			@res.for_encoding( :deflate ) { @res.body + " (deflated)" }
-			@res.for_encoding( :gzip ) { @res.body + " (gzipped)" }
+			@res.for_encoding( :deflate ) { @res.body << " (deflated)" }
+			@res.for_encoding( :gzip ) { @res.body << " (gzipped)" }
 
-			@res.negotiated_body.should == "the text body (deflated)"
+			@res.negotiated_body.rewind
+			@res.negotiated_body.read.should == "the text body (deflated)"
 			@res.encodings.should include( "deflate" )
 			@res.header_data.should =~ /accept-encoding/i
 			@res.header_data.should_not =~ /identity/i

data/spec/strelka/httpresponse/session_spec.rb

@@ -157,6 +157,21 @@ describe Strelka::HTTPResponse::Session, "-extended response" do
 				@res.cookies.should be_empty()
 			end
 
+			it "destroys the session via itself if it was loaded" do
+				@res.cookies.should_not include( @cookie_name )
+				@res.session
+				@res.destroy_session
+				@res.cookies[ @cookie_name ].value.should == @sess_id
+				@res.cookies[ @cookie_name ].expires.should < Time.now
+			end
+
+			it "destroys the session via itself even if it wasn't loaded" do
+				@res.cookies.should_not include( @cookie_name )
+				@res.destroy_session
+				@res.cookies[ @cookie_name ].value.should == @sess_id
+				@res.cookies[ @cookie_name ].expires.should < Time.now
+			end
+
 		end
 
 	end

data/spec/strelka/paramvalidator_spec.rb

@@ -177,6 +177,19 @@ describe Strelka::ParamValidator do
 			@validator.error_messages.should include( "Invalid value for 'A Field'" )
 		end
 
+		it "re-validates if profile is modified, even with no parameters" do
+			@validator.add( :a_field, :string )
+			@validator.validate
+			@validator.should_not have_errors()
+			@validator.should be_okay()
+
+			@validator.override( :a_field, :string, :required )
+			@validator.should have_errors()
+			@validator.should_not be_okay()
+			@validator.error_messages.should include( "Missing value for 'A Field'" )
+		end
+
+
 	end # describe "validation"
 
 	describe "validation error descriptions" do

data/spec/strelka/session/default_spec.rb

@@ -100,6 +100,19 @@ describe Strelka::Session::Default do
 		response.header_data.should =~ /Set-Cookie: #{@cookie_name}=#{session_id}/i
 	end
 
+	it "can remove itself from the store and expire the response's session ID" do
+		req          = @request_factory.get( '/hungry/hungry/hippos' )
+		response     = req.response
+		session_id   = '3422067061a5790be374c81118d9ed3f'
+		session_data = { :namespace => {'fruit' => 'bowl'} }
+		session      = described_class.new( session_id, session_data )
+
+		session.destroy( response )
+
+		described_class.sessions.should_not include({ session_id => session_data })
+		response.header_data.should =~ /Set-Cookie: #{@cookie_name}=#{session_id}/i
+	end
+
 	describe "with no namespace set (the 'nil' namespace)" do
 
 		subject { Strelka::Session.create('default', 'the_session_id') }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strelka
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre.257
+  version: 0.0.1.pre.262
   prerelease: 
 platform: ruby
 authors:
@@ -36,7 +36,7 @@ cert_chain:
   YUhDS0xaZFNLai9SSHVUT3QrZ2JsUmV4OEZBaDhOZUEKY21saFhlNDZwWk5K
   Z1dLYnhaYWg4NWpJang5NWhSOHZPSStOQU01aUg5a09xSzEzRHJ4YWNUS1Bo
   cWo1UGp3RgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2012-06-07 00:00:00.000000000 Z
+date: 2012-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop