strelka 0.0.1.pre.216 → 0.0.1.pre.219

data/lib/strelka/app/errors.rb

@@ -168,27 +168,34 @@ module Strelka::App::Errors
 
 		# If the app or any plugins threw a finish, look for a handler for the status code
 		# and call it if one is found.
-		if status_response
-			request.notes[:status_info] = status_response
-			response = request.response
-			status = status_response[:status]
-			self.log.info "[:errors] Handling a status response: %d" % [ status ]
-
-			# If we can't find a custom handler for this status, re-throw
-			# to the default handler instead
-			handler = self.status_handler_for( status ) or
-				throw( :finish, status_response )
-
-			# The handler is an UnboundMethod, so bind it to the app instance
-			# and call it
-			response.status = status
-			response = handler.bind( self ).call( response, status_response )
-		end
+		response = self.handle_status_response( request, status_response ) if status_response
 
 		return response
 	end
 
 
+	### Return a response built out of the +status_info+ for the specified +request+ if there
+	### is a custom handler. If there isn't one, rethrows to the main :finish handler.
+	def handle_status_response( request, status_info )
+		status = status_info[:status]
+
+		# If we can't find a custom handler for this status, re-throw
+		# to the default handler instead
+		handler = self.status_handler_for( status ) or
+			throw( :finish, status_info )
+		self.log.info "Using custom handler %p for status response: %d: %s" % [ handler, status, status_info ]
+
+		# Set up the request's response with the right status code
+		request.notes[:status_info] = status_info
+		response = request.response
+		response.status = status
+
+		# The handler is an UnboundMethod, so bind it to the app instance
+		# and call it
+		return handler.bind( self ).call( response, status_info )
+	end
+
+
 	### Find a status handler for the given +status_code+ and return it as an UnboundMethod.
 	def status_handler_for( status_code )
 		self.log.debug "[:errors] Looking for a status handler for %d responses" % [ status_code ]

data/lib/strelka/app/templating.rb

@@ -149,8 +149,8 @@ module Strelka::App::Templating
 	# The map of template names to Inversion::Template instances.
 	attr_reader :template_map
 
-	# The layout template (an Inversion::Template), if one was declarted
-	attr_reader :layout
+	# The layout template (an Inversion::Template), if one was declared
+	attr_accessor :layout
 
 
 	### Return the template keyed by the given +name+.

data/lib/strelka/mixins.rb

@@ -374,6 +374,11 @@ module Strelka
 				}
 			end
 
+			# Log using the instance logger if possible, else use the global one
+			logger = self.respond_to?( :log ) ? self.log : Strelka.log
+			logmethod = status_info[:status] > 399 ? logger.method(:error) : logger.method(:info)
+			logmethod.call "Finishing with status %d: %s" % [ status_info[:status], status_info[:message] ]
+
 			throw :finish, status_info
 		end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strelka
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre.216
+  version: 0.0.1.pre.219
   prerelease: 
 platform: ruby
 authors:
@@ -36,7 +36,7 @@ cert_chain:
   YUhDS0xaZFNLai9SSHVUT3QrZ2JsUmV4OEZBaDhOZUEKY21saFhlNDZwWk5K
   Z1dLYnhaYWg4NWpJang5NWhSOHZPSStOQU01aUg5a09xSzEzRHJ4YWNUS1Bo
   cWo1UGp3RgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2012-05-03 00:00:00.000000000 Z
+date: 2012-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop