strelka 0.0.1.pre.224 → 0.0.1.pre.229

data/ChangeLog

@@ -1,10 +1,124 @@
+2012-05-09  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/strelka/cookieset.rb, spec/strelka/cookieset_spec.rb:
+	Add delegation for some more Set methods to CookieSet
+	[c88faf6871e7] [tip]
+
+2012-05-08  Michael Granger  <ged@FaerieMUD.org>
+
+	* .rvm.gems, Rakefile, lib/strelka/app.rb, lib/strelka/app/auth.rb,
+	lib/strelka/app/negotiation.rb, lib/strelka/app/parameters.rb,
+	lib/strelka/app/restresources.rb, lib/strelka/app/routing.rb,
+	lib/strelka/app/sessions.rb, lib/strelka/authprovider/basic.rb,
+	lib/strelka/cookie.rb, lib/strelka/cookieset.rb,
+	lib/strelka/plugins.rb, lib/strelka/session/db.rb,
+	lib/strelka/session/default.rb, spec/lib/helpers.rb,
+	spec/strelka/app/filters_spec.rb,
+	spec/strelka/app/restresources_spec.rb,
+	spec/strelka/app/routing_spec.rb, spec/strelka/app/sessions_spec.rb,
+	spec/strelka/httprequest/session_spec.rb:
+	Convert class-/module-level logging to Loggability API.
+	[751512af4f1f]
+
+2012-05-07  Mahlon E. Smith  <mahlon@martini.nu>
+
+	* lib/strelka/app/templating.rb:
+	Provide access to the request during layout template wrapping, so
+	handlers can potentially override the method and attach arbitrary
+	request attributes to the layout.
+	[1fc0cf040a1e] [github/master]
+
+2012-05-07  Michael Granger  <ged@FaerieMUD.org>
+
+	* spec/lib/helpers.rb:
+	Removed some leftover logging code from pre-Loggability.
+	[60fdf52af868]
+
+2012-05-07  Mahlon E. Smith  <mahlon@martini.nu>
+
+	* lib/strelka/httprequest.rb, spec/strelka/httprequest_spec.rb:
+	Add a simple shortcut method for URI redirection.
+	[eb22b0f1372c]
+
+	* lib/strelka/httprequest/session.rb,
+	spec/strelka/httprequest/session_spec.rb:
+	Add a method to completely purge a session, from the request object.
+	[b8ed17e550e2]
+
+2012-05-07  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/strelka/app.rb:
+	Move Strelka::App.devmode? above ::configure.
+
+	This is required when the App config is loaded by the deferred
+	loader.
+	[09e467f68dca]
+
+	* .rvm.gems, Rakefile, bin/strelka, lib/strelka.rb,
+	lib/strelka/app.rb, lib/strelka/app/auth.rb,
+	lib/strelka/app/routing.rb, lib/strelka/app/sessions.rb,
+	lib/strelka/authprovider.rb, lib/strelka/authprovider/basic.rb,
+	lib/strelka/authprovider/hostaccess.rb, lib/strelka/cookie.rb,
+	lib/strelka/httprequest.rb, lib/strelka/httprequest/acceptparams.rb,
+	lib/strelka/httpresponse.rb, lib/strelka/mixins.rb,
+	lib/strelka/paramvalidator.rb, lib/strelka/router.rb,
+	lib/strelka/router/default.rb, lib/strelka/router/exclusive.rb,
+	lib/strelka/session.rb, lib/strelka/session/db.rb,
+	lib/strelka/session/default.rb, spec/lib/helpers.rb,
+	spec/strelka/mixins_spec.rb:
+	Convert to Loggability for logging.
+	[4f0cbd7b3070]
+
+2012-05-03  Michael Granger  <ged@FaerieMUD.org>
+
+	* bin/strelka:
+	Run started apps directly instead of counting on the app to run
+	itself
+	[7a2694d364b3]
+
+	* lib/strelka/app/errors.rb:
+	Extract a method from the status response part of the :errors
+	plugin.
+	[2b827b37bae5]
+
+	* lib/strelka/app/templating.rb:
+	Make the #layout method an accessor in the :templating plugin
+	[b3dc560d0863]
+
+	* lib/strelka/mixins.rb:
+	Log uses of finish_with
+	[01cd0a6edde9]
+
+	* MILESTONES.rdoc:
+	Add another task to MILESTONES
+	[22e60aaebaea]
+
+	* .rvm.gems, MILESTONES.rdoc, README.rdoc, lib/strelka.rb,
+	lib/strelka/app.rb, lib/strelka/app/templating.rb,
+	lib/strelka/httprequest/acceptparams.rb:
+	Add some documentation
+	[5bd05add55ad]
+
+2012-05-02  Michael Granger  <ged@FaerieMUD.org>
+
+	* MILESTONES.rdoc, Manifest.txt:
+	Adding a MILESTONES file.
+
+	We'll use this as a checklist of what needs to be done for the next
+	release.
+	[d8e74e3bf97b]
+
+	* lib/strelka/logging.rb:
+	Change fatal output color to be more readable
+	[403cf0ef01f0]
+
 2012-04-25  Michael Granger  <ged@FaerieMUD.org>
 
 	* lib/strelka/app.rb, lib/strelka/plugins.rb,
 	spec/strelka/httpresponse/negotiation_spec.rb,
 	spec/strelka/plugins_spec.rb:
 	Add an #application_stack method to the PluginLoader mixin
-	[7427a74ae313] [tip]
+	[7427a74ae313]
 
 	* lib/strelka/app.rb, spec/strelka/app_spec.rb:
 	Add configurable ::devmode? setting to Strelka::App
@@ -28,7 +142,7 @@
 
 	* lib/strelka/app/templating.rb, spec/strelka/app/templating_spec.rb:
 	Refactored on of the big methods in :templating.
-	[f933118fb9db] [github/master]
+	[f933118fb9db]
 
 2012-04-23  Michael Granger  <ged@FaerieMUD.org>
 

data/Rakefile

@@ -27,11 +27,11 @@ hoespec = Hoe.spec 'strelka' do
 	self.dependency 'sysexits',        '~> 1.0'
 	self.dependency 'formvalidator',   '~> 0.1'
 	self.dependency 'inversion',       '~> 0.8'
-	self.dependency 'mongrel2',        '~> 0.20'
+	self.dependency 'mongrel2',        '~> 0.22'
 	self.dependency 'uuidtools',       '~> 2.1'
 	self.dependency 'configurability', '~> 1.0'
 	self.dependency 'pluginfactory',   '~> 1.0'
-	self.dependency 'loggability',     '~> 0.0'
+	self.dependency 'loggability',     '~> 0.1'
 
 	self.dependency 'hoe-deveiate',    '~> 0.1', :developer
 	self.dependency 'hoe-manualgen',   '~> 0.3', :developer

data/lib/strelka/app.rb

@@ -73,16 +73,16 @@ class Strelka::App < Mongrel2::Handler
 	### Calculate a default application ID for the class based on either its ID
 	### constant or its name and return it.
 	def self::default_appid
-		Strelka.log.info "Looking up appid for %p" % [ self.class ]
+		self.log.info "Looking up appid for %p" % [ self.class ]
 		appid = nil
 
 		if self.const_defined?( :ID )
 			appid = self.const_get( :ID )
-			Strelka.log.info "  app has an ID: %p" % [ appid ]
+			self.log.info "  app has an ID: %p" % [ appid ]
 		else
 			appid = ( self.name || "anonymous#{self.object_id}" ).downcase
 			appid.gsub!( /[^[:alnum:]]+/, '-' )
-			Strelka.log.info "  deriving one from the class name: %p" % [ appid ]
+			self.log.info "  deriving one from the class name: %p" % [ appid ]
 		end
 
 		return appid
@@ -92,7 +92,7 @@ class Strelka::App < Mongrel2::Handler
 	### Return a Hash of Strelka app files as Pathname objects from installed gems,
 	### keyed by gemspec name .
 	def self::discover_paths
-		Strelka.log.debug "Local paths: %s" % [ Strelka.datadir + APP_GLOB_PATTERN ]
+		self.log.debug "Local paths: %s" % [ Strelka.datadir + APP_GLOB_PATTERN ]
 
 		appfiles = {
 			'' => Pathname.glob( Strelka.datadir + APP_GLOB_PATTERN )
@@ -103,7 +103,7 @@ class Strelka::App < Mongrel2::Handler
 			gemspec.dependencies.find {|dep| dep.name == 'strelka'}
 		end
 
-		Strelka.log.debug "Found %d gems with a Strelka dependency" % [ gems.length ]
+		self.log.debug "Found %d gems with a Strelka dependency" % [ gems.length ]
 
 		# Find all the files under those gems' data directories that match the application
 		# pattern
@@ -112,11 +112,11 @@ class Strelka::App < Mongrel2::Handler
 			next if appfiles.key?( gemspec.name )
 			appfiles[ gemspec.name ] = []
 
-			Strelka.log.debug "  checking %s for apps in its datadir" % [ gemspec.name ]
+			self.log.debug "  checking %s for apps in its datadir" % [ gemspec.name ]
 			pattern = File.join( gemspec.full_gem_path, "data", gemspec.name, APP_GLOB_PATTERN )
-			Strelka.log.debug "    glob pattern is: %p" % [ pattern ]
+			self.log.debug "    glob pattern is: %p" % [ pattern ]
 			gemapps = Pathname.glob( pattern )
-			Strelka.log.debug "    found %d app files" % [ gemapps.length ]
+			self.log.debug "    found %d app files" % [ gemapps.length ]
 			appfiles[ gemspec.name ] += gemapps
 		end
 
@@ -129,22 +129,22 @@ class Strelka::App < Mongrel2::Handler
 		discovered_apps = []
 		app_paths = self.discover_paths
 
-		Strelka.log.debug "Loading apps from %d discovered paths" % [ app_paths.length ]
+		self.log.debug "Loading apps from %d discovered paths" % [ app_paths.length ]
 		app_paths.each do |gemname, paths|
-			Strelka.log.debug "  loading gem %s" % [ gemname ]
+			self.log.debug "  loading gem %s" % [ gemname ]
 			gem( gemname ) unless gemname == ''
 
-			Strelka.log.debug "  loading apps from %s: %d handlers" % [ gemname, paths.length ]
+			self.log.debug "  loading apps from %s: %d handlers" % [ gemname, paths.length ]
 			paths.each do |path|
 				classes = begin
 					Strelka::App.load( path )
 				rescue StandardError, ScriptError => err
-					Strelka.log.error "%p while loading Strelka apps from %s: %s" %
+					self.log.error "%p while loading Strelka apps from %s: %s" %
 						[ err.class, path, err.message ]
-					Strelka.log.debug "Backtrace: %s" % [ err.backtrace.join("\n\t") ]
+					self.log.debug "Backtrace: %s" % [ err.backtrace.join("\n\t") ]
 					[]
 				end
-				Strelka.log.debug "  loaded app classes: %p" % [ classes ]
+				self.log.debug "  loaded app classes: %p" % [ classes ]
 
 				discovered_apps += classes
 			end
@@ -157,12 +157,12 @@ class Strelka::App < Mongrel2::Handler
 	### Load the specified +file+, and return any Strelka::App subclasses that are loaded
 	### as a result.
 	def self::load( file )
-		Strelka.log.debug "Loading application/s from %p" % [ file ]
+		self.log.debug "Loading application/s from %p" % [ file ]
 		@loading_file = Pathname( file ).expand_path
 		self.subclasses.delete( @loading_file )
 		Kernel.load( @loading_file.to_s )
 		new_subclasses = self.subclasses[ @loading_file ]
-		Strelka.log.debug "  loaded %d new app class/es" % [ new_subclasses.size ]
+		self.log.debug "  loaded %d new app class/es" % [ new_subclasses.size ]
 
 		return new_subclasses
 	ensure
@@ -189,7 +189,7 @@ class Strelka::App < Mongrel2::Handler
 			self.devmode = $DEBUG ? true : false
 		end
 
-		Strelka.log.info "Enabled developer mode." if self.devmode?
+		self.log.info "Enabled developer mode." if self.devmode?
 	end
 
 

data/lib/strelka/app/auth.rb

@@ -286,9 +286,9 @@ module Strelka::App::Auth
 				@auth_provider = Strelka::AuthProvider.get_subclass( type )
 			end
 
-			Strelka.log.debug "Auth provider %p" % [ @auth_provider ]
+			self.log.debug "Auth provider %p" % [ @auth_provider ]
 			@auth_provider ||= Strelka::AuthProvider.get_subclass( DEFAULT_AUTH_PROVIDER )
-			Strelka.log.debug "Auth provider %p" % [ @auth_provider ]
+			self.log.debug "Auth provider %p" % [ @auth_provider ]
 			return @auth_provider
 		end
 
@@ -350,7 +350,7 @@ module Strelka::App::Auth
 
 			criteria.each do |pattern|
 				pattern.gsub!( %r{^/+|/+$}, '' ) if pattern.respond_to?( :gsub! )
-				Strelka.log.debug "  adding require_auth for %p" % [ pattern ]
+				self.log.debug "  adding require_auth for %p" % [ pattern ]
 				self.positive_auth_criteria[ pattern ] = block
 			end
 		end
@@ -369,7 +369,7 @@ module Strelka::App::Auth
 
 			criteria.each do |pattern|
 				pattern.gsub!( %r{^/+|/+$}, '' ) if pattern.respond_to?( :gsub! )
-				Strelka.log.debug "  adding no_auth for %p" % [ pattern ]
+				self.log.debug "  adding no_auth for %p" % [ pattern ]
 				self.negative_auth_criteria[ pattern ] = block
 			end
 		end
@@ -381,7 +381,7 @@ module Strelka::App::Auth
 	### Extension callback -- extend the HTTPRequest class with Auth
 	### support when this plugin is loaded.
 	def self::included( object )
-		Strelka.log.debug "Extending Request with Auth mixin"
+		self.log.debug "Extending Request with Auth mixin"
 		Strelka::HTTPRequest.class_eval { include Strelka::HTTPRequest::Auth }
 		super
 	end

data/lib/strelka/app/negotiation.rb

@@ -82,7 +82,7 @@ module Strelka::App::Negotiation
 	### Extension callback -- extend the HTTPRequest and HTTPResponse classes with Negotiation
 	### support when this plugin is loaded.
 	def self::included( object )
-		Strelka.log.debug "Extending Request and Response with Negotiation mixins"
+		self.log.debug "Extending Request and Response with Negotiation mixins"
 		Strelka::HTTPRequest.class_eval { include Strelka::HTTPRequest::Negotiation }
 		Strelka::HTTPResponse.class_eval { include Strelka::HTTPResponse::Negotiation }
 		super

data/lib/strelka/app/parameters.rb

@@ -94,7 +94,7 @@ module Strelka::App::Parameters
 		### +constraint+. The +constraint+ can be any of the types supported by
 		### Strelka::ParamValidator.
 		def param( name, *args )
-			Strelka.log.debug "New param %p" % [ name ]
+			self.log.debug "New param %p" % [ name ]
 			self.paramvalidator.add( name, *args )
 		end
 

data/lib/strelka/app/restresources.rb

@@ -117,7 +117,7 @@ module Strelka::App::RestResources
 		### Expose the specified +rsrcobj+ (which should be an object that responds to #dataset
 		### and returns a Sequel::Dataset)
 		def resource( rsrcobj, options={} )
-			Strelka.log.debug "Adding REST resource for %p" % [ rsrcobj ]
+			self.log.debug "Adding REST resource for %p" % [ rsrcobj ]
 			options = self.service_options.merge( options )
 
 			# Figure out what the resource name is, and make the route from it
@@ -128,7 +128,7 @@ module Strelka::App::RestResources
 			self.add_parameters( rsrcobj, options )
 
 			# Make and install handler methods
-			Strelka.log.debug "  adding readers"
+			self.log.debug "  adding readers"
 			self.add_options_handler( route, rsrcobj, options )
 			self.add_read_handler( route, rsrcobj, options )
 			self.add_collection_read_handler( route, rsrcobj, options )
@@ -136,7 +136,7 @@ module Strelka::App::RestResources
 			# Add handler methods for the mutator parts of the API unless
 			# the resource is read-only
 			if options[:readonly]
-				Strelka.log.debug "  skipping mutators (read-only set)"
+				self.log.debug "  skipping mutators (read-only set)"
 			else
 				self.add_collection_create_handler( route, rsrcobj, options )
 				self.add_update_handler( route, rsrcobj, options )
@@ -152,10 +152,10 @@ module Strelka::App::RestResources
 
 		### Add parameter declarations for parameters related to +rsrcobj+.
 		def add_parameters( rsrcobj, options )
-			Strelka.log.debug "Declaring validations for columns from %p" % [ rsrcobj ]
+			self.log.debug "Declaring validations for columns from %p" % [ rsrcobj ]
 			self.untaint_all_constraints
 			rsrcobj.db_schema.each do |col, config|
-				Strelka.log.debug "  %s (%p)" % [ col, config[:type] ]
+				self.log.debug "  %s (%p)" % [ col, config[:type] ]
 				param col, config[:type]
 			end
 		end
@@ -165,7 +165,7 @@ module Strelka::App::RestResources
 		### OPTIONS /resources
 		def add_options_handler( route, rsrcobj, options )
 			# :TODO: Documentation for HTML mode (possibly using http://swagger.wordnik.com/)
-			Strelka.log.debug "Adding OPTIONS handler for %p" % [ route, rsrcobj ]
+			self.log.debug "Adding OPTIONS handler for %p" % [ route, rsrcobj ]
 			self.add_route( :OPTIONS, route, options ) do |req|
 				self.log.debug "OPTIONS handler!"
 				verbs = self.class.resource_verbs[ route ].sort
@@ -191,7 +191,7 @@ module Strelka::App::RestResources
 			pkey = rsrcobj.primary_key
 			route = "#{route_prefix}/:#{pkey}"
 
-			Strelka.log.debug "Creating handler for reading a single %p: GET %s" % [ rsrcobj, route ]
+			self.log.debug "Creating handler for reading a single %p: GET %s" % [ rsrcobj, route ]
 			self.add_route( :GET, route, options ) do |req|
 				finish_with( HTTP::BAD_REQUEST, req.params.error_messages.join("\n") ) unless
 					req.params.okay?
@@ -214,7 +214,7 @@ module Strelka::App::RestResources
 		### Sequel::Model class or a ducktype-alike.
 		### GET /resources
 		def add_collection_read_handler( route, rsrcobj, options )
-			Strelka.log.debug "Creating handler for reading collections of %p: GET %s" % [ rsrcobj, route ]
+			self.log.debug "Creating handler for reading collections of %p: GET %s" % [ rsrcobj, route ]
 			self.add_route( :GET, route, options ) do |req|
 				finish_with( HTTP::BAD_REQUEST, req.params.error_messages.join("\n") ) unless
 					req.params.okay?
@@ -241,7 +241,7 @@ module Strelka::App::RestResources
 		### Add a handler method for creating a new instance of +rsrcobj+.
 		### POST /resources
 		def add_collection_create_handler( route, rsrcobj, options )
-			Strelka.log.debug "Creating handler for creating %p resources: POST %s" % [ rsrcobj, route ]
+			self.log.debug "Creating handler for creating %p resources: POST %s" % [ rsrcobj, route ]
 
 			self.add_route( :POST, route, options ) do |req|
 				finish_with( HTTP::BAD_REQUEST, req.params.error_messages.join(", ") ) unless
@@ -279,7 +279,7 @@ module Strelka::App::RestResources
 			pkey = rsrcobj.primary_key
 			route = "#{route_prefix}/:#{pkey}"
 
-			Strelka.log.debug "Creating handler for creating %p resources: POST %s" % [ rsrcobj, route ]
+			self.log.debug "Creating handler for creating %p resources: POST %s" % [ rsrcobj, route ]
 			self.add_route( :PUT, route, options ) do |req|
 				finish_with( HTTP::BAD_REQUEST, req.params.error_messages.join(", ") ) unless
 					req.params.okay?
@@ -312,7 +312,7 @@ module Strelka::App::RestResources
 		### PUT /resources
 		def add_collection_update_handler( route, rsrcobj, options )
 			pkey = rsrcobj.primary_key
-			Strelka.log.debug "Creating handler for updating every %p resources: PUT %s" % [ rsrcobj, route ]
+			self.log.debug "Creating handler for updating every %p resources: PUT %s" % [ rsrcobj, route ]
 
 			self.add_route( :PUT, route, options ) do |req|
 				finish_with( HTTP::BAD_REQUEST, req.params.error_messages.join(", ") ) unless
@@ -379,7 +379,7 @@ module Strelka::App::RestResources
 		### DELETE /resources
 		def add_collection_deletion_handler( route, rsrcobj, options )
 			pkey = rsrcobj.primary_key
-			Strelka.log.debug "Creating handler for deleting every %p resources: DELETE %s" %
+			self.log.debug "Creating handler for deleting every %p resources: DELETE %s" %
 				[ rsrcobj, route ]
 
 			self.add_route( :DELETE, route, options ) do |req|
@@ -411,7 +411,7 @@ module Strelka::App::RestResources
 			# :TODO: Support multiple args? (customers/by_city_state/{city}/{state})
 			rsrcobj.dataset_methods.each do |name, proc|
 				if proc.parameters.length > 1
-					Strelka.log.debug "  skipping dataset method %p: more than 1 argument" % [ name ]
+					self.log.debug "  skipping dataset method %p: more than 1 argument" % [ name ]
 					next
 				end
 
@@ -420,16 +420,16 @@ module Strelka::App::RestResources
 				#        or a parameter-type more gracefully.
 				param = proc.parameters.first[1]
 				route = "%s/%s/:%s" % [ route_prefix, name, param ]
-				Strelka.log.debug "  route for dataset method %s: %s" % [ name, route ]
+				self.log.debug "  route for dataset method %s: %s" % [ name, route ]
 				self.add_dataset_read_handler( route, rsrcobj, name, param, options )
 			end
 
 			# Add composite service routes for each association
-			Strelka.log.debug "Adding composite resource routes for %p" % [ rsrcobj ]
+			self.log.debug "Adding composite resource routes for %p" % [ rsrcobj ]
 			rsrcobj.association_reflections.each do |name, refl|
 				pkey = rsrcobj.primary_key
 				route = "%s/:%s/%s" % [ route_prefix, pkey, name ]
-				Strelka.log.debug "  route for associated %p objects via the %s association: %s" %
+				self.log.debug "  route for associated %p objects via the %s association: %s" %
 					[ refl[:class_name], name, route ]
 				self.add_composite_read_handler( route, rsrcobj, name, options )
 			end
@@ -440,7 +440,7 @@ module Strelka::App::RestResources
 		### Add a GET route for the dataset method +dsname+ for the given +rsrcobj+ at the
 		### given +path+.
 		def add_dataset_read_handler( path, rsrcobj, dsname, param, options )
-			Strelka.log.debug "Adding dataset method read handler: %s" % [ path ]
+			self.log.debug "Adding dataset method read handler: %s" % [ path ]
 
 			self.add_route( :GET, path, options ) do |req|
 				self.log.debug "Resource dataset GET request for dataset %s on %p" % [ dsname, rsrcobj ]
@@ -474,7 +474,7 @@ module Strelka::App::RestResources
 		### +path+.
 		def add_composite_read_handler( path, rsrcobj, association, options )
 			pkey = rsrcobj.primary_key
-			Strelka.log.debug "Adding composite read handler for association: %s" % [ association ]
+			self.log.debug "Adding composite read handler for association: %s" % [ association ]
 
 			self.add_route( :GET, path, options ) do |req|
 				finish_with( HTTP::BAD_REQUEST, req.params.error_messages.join("\n") ) unless

data/lib/strelka/app/routing.rb

@@ -166,7 +166,7 @@ module Strelka::App::Routing
 		### Get/set the router class to use for mapping requests to handlers to +newclass.
 		def router( newclass=nil )
 			if newclass
-				Strelka.log.info "%p router class set to: %p" % [ self, newclass ]
+				self.log.info "%p router class set to: %p" % [ self, newclass ]
 				self.routerclass = newclass
 			end
 
@@ -182,7 +182,7 @@ module Strelka::App::Routing
 			# route pattern into its components
 			methodparts = [ verb.upcase ]
 			patternparts = self.split_route_pattern( pattern )
-			Strelka.log.debug "Split pattern %p into parts: %p" % [ pattern, patternparts ]
+			self.log.debug "Split pattern %p into parts: %p" % [ pattern, patternparts ]
 
 			# Make a method name from the directories and the named captures of the patterns
 			# in the route
@@ -193,11 +193,11 @@ module Strelka::App::Routing
 					methodparts << part
 				end
 			end
-			Strelka.log.debug "  route methodname parts are: %p" % [ methodparts ]
+			self.log.debug "  route methodname parts are: %p" % [ methodparts ]
 			methodname = methodparts.join( '_' )
 
 			# Define the method using the block from the route as its body
-			Strelka.log.debug "  adding route method %p for %p route: %p" % [ methodname, verb, block ]
+			self.log.debug "  adding route method %p for %p route: %p" % [ methodname, verb, block ]
 			define_method( methodname, &block )
 
 			# Remove any existing route for the same verb, patternparts, and options
@@ -223,7 +223,7 @@ module Strelka::App::Routing
 			return pattern.split( '/' ).collect do |component|
 
 				if component.start_with?( ':' )
-					Strelka.log.debug "translating parameter component %p to a regexp" % [component]
+					self.log.debug "translating parameter component %p to a regexp" % [component]
 					raise ScriptError,
 						"parameter-based routing not supported without a 'parameters' plugin" unless
 						self.respond_to?( :paramvalidator )

data/lib/strelka/app/sessions.rb

@@ -165,9 +165,9 @@ module Strelka::App::Sessions
 	### Extension callback -- extend the HTTPRequest classes with Session
 	### support when this plugin is loaded.
 	def self::included( object )
-		Strelka.log.debug "Extending Request with Session mixin"
+		self.log.debug "Extending Request with Session mixin"
 		Strelka::HTTPRequest.class_eval { include Strelka::HTTPRequest::Session }
-		Strelka.log.debug "Extending Response with Session mixin"
+		self.log.debug "Extending Response with Session mixin"
 		Strelka::HTTPResponse.class_eval { include Strelka::HTTPResponse::Session }
 		super
 	end

data/lib/strelka/app/templating.rb

@@ -191,7 +191,7 @@ module Strelka::App::Templating
 			return response
 
 		# Wrap the template in a layout if there is one
-		template = self.wrap_in_layout( template )
+		template = self.wrap_in_layout( template, request )
 
 		# Set some default stuff on the top-level template
 		self.set_common_attributes( template, request )
@@ -235,7 +235,7 @@ module Strelka::App::Templating
 
 	### Wrap the specified +content+ template in the layout template and
 	### return it. If there isn't a layout declared, just return +content+ as-is.
-	def wrap_in_layout( content )
+	def wrap_in_layout( content, request )
 		return content unless self.layout
 
 		self.layout.reload if self.layout.changed?

data/lib/strelka/authprovider/basic.rb

@@ -55,7 +55,7 @@ class Strelka::AuthProvider::Basic < Strelka::AuthProvider
 	### Configurability API -- configure the auth provider instance.
 	def self::configure( config=nil )
 		if config
-			Strelka.log.debug "Configuring Basic authprovider: %p" % [ config ]
+			self.log.debug "Configuring Basic authprovider: %p" % [ config ]
 			self.realm = config['realm'] if config['realm']
 			self.users = config['users'] if config['users']
 		else

data/lib/strelka/cookie.rb

@@ -103,39 +103,39 @@ class Strelka::Cookie
 	### one or more new Strelka::Cookie objects, keyed by name.
 	def self::parse( header )
 		return {} if header.nil? or header.empty?
-		Strelka.log.debug "Parsing cookie header: %p" % [ header ]
+		self.log.debug "Parsing cookie header: %p" % [ header ]
 		cookies = []
 		version = 0
 		header = header.strip
 
 		# "$Version" = value
 		if COOKIE_VERSION.match( header )
-			Strelka.log.debug "  Found cookie version %p" % [ $1 ]
+			self.log.debug "  Found cookie version %p" % [ $1 ]
 			version = Integer( dequote($1) )
 			header.slice!( COOKIE_VERSION )
 		end
 
 		# 1*((";" | ",") NAME "=" VALUE [";" path] [";" domain])
 		header.split( /[,;]\s*/ ).each do |pair|
-			Strelka.log.debug "  Found pair %p" % [ pair ]
+			self.log.debug "  Found pair %p" % [ pair ]
 			key, valstr = pair.split( /=/, 2 ).collect {|s| s.strip }
 
 			case key
 			when COOKIE_PATH
-				Strelka.log.debug "    -> cookie-path %p" % [ valstr ]
+				self.log.debug "    -> cookie-path %p" % [ valstr ]
 				cookies.last.path = dequote( valstr ) unless cookies.empty?
 
 			when COOKIE_DOMAIN
-				Strelka.log.debug "    -> cookie-domain %p" % [ valstr ]
+				self.log.debug "    -> cookie-domain %p" % [ valstr ]
 				cookies.last.domain = dequote( valstr ) unless cookies.empty?
 
 			when HTTP_TOKEN
 				values = parse_valuestring( valstr )
-				Strelka.log.debug "    -> cookie-values %p" % [ values ]
+				self.log.debug "    -> cookie-values %p" % [ values ]
 				cookies << new( key, values, :version => version )
 
 			else
-				Strelka.log.warn \
+				self.log.warn \
 					"Malformed cookie header %p: %p is not a valid token; ignoring" %
 					[ header, key ]
 			end

data/lib/strelka/cookieset.rb

@@ -2,10 +2,12 @@
 # vim: set nosta noet ts=4 sw=4:
 # encoding: utf-8
 
-require 'strelka' unless defined?( Strelka )
-require 'strelka/cookie'
 require 'set'
 require 'forwardable'
+require 'loggability'
+
+require 'strelka' unless defined?( Strelka )
+require 'strelka/cookie'
 
 
 # An object class which provides a convenient way of accessing a set of Strelka::Cookies.
@@ -35,16 +37,21 @@ require 'forwardable'
 # * Jeremiah Jordan <phaedrus@FaerieMUD.org>
 #
 class Strelka::CookieSet
-	extend Forwardable
+	extend Forwardable,
+	       Loggability
 	include Enumerable
 
 
+	# Loggability API -- send logs through the :strelka logger
+	log_to :strelka
+
+
 	### Parse the Cookie header of the specified +request+ into Strelka::Cookie objects
 	### and return them in a new CookieSet.
 	def self::parse( request )
-		Strelka.log.debug "Parsing cookies from header: %p" % [ request.header.cookie ]
+		self.log.debug "Parsing cookies from header: %p" % [ request.header.cookie ]
 		cookies = Strelka::Cookie.parse( request.header.cookie )
-		Strelka.log.debug "  found %d cookies: %p" % [ cookies.length, cookies ]
+		self.log.debug "  found %d cookies: %p" % [ cookies.length, cookies ]
 		return new( cookies.values )
 	end
 
@@ -63,15 +70,9 @@ class Strelka::CookieSet
 	public
 	######
 
-	def_delegators :@cookie_set, :each
+	def_delegators :@cookie_set, :each, :empty?, :member?, :length, :size
 
 
-	### Returns the number of cookies in the cookieset
-	def length
-		return @cookie_set.length
-	end
-	alias_method :size, :length
-
 
 	### Index operator method: returns the Strelka::Cookie with the given +name+ if it
 	### exists in the cookieset.

data/lib/strelka/httprequest/session.rb

@@ -50,6 +50,12 @@ module Strelka::HTTPRequest::Session
 	alias_method :has_session?, :session?
 
 
+	### Returns +true+ if the request has loaded its session.
+	def session_loaded?
+		return @session ? true : false
+	end
+
+
 	### Return the session associated with the request, creating it if necessary.
 	def session
 		unless @session

data/lib/strelka/httpresponse/session.rb

@@ -85,10 +85,16 @@ module Strelka::HTTPResponse::Session
 	alias_method :has_session?, :session?
 
 
+	### Returns +true+ if the response or its request has already loaded the session.
+	def session_loaded?
+		return @session || self.request.session_loaded?
+	end
+
+
 	### Tell the associated session to save itself and set up the session ID in the
 	### response, if one exists.
 	def save_session
-		if self.session?
+		if self.session_loaded?
 			self.log.debug "Saving session: %p" % [ self.session ]
 			self.session.save( self )
 		else

data/lib/strelka/plugins.rb

@@ -5,6 +5,7 @@
 require 'set'
 require 'tsort'
 
+require 'loggability'
 require 'strelka' unless defined?( Strelka )
 require 'strelka/mixins'
 
@@ -28,11 +29,18 @@ module Strelka
 
 	# Plugin Module extension -- adds registration, load-order support, etc.
 	module Plugin
+		extend Loggability
+
+		# Loggability API -- send logs through the :strelka logger
+		log_to :strelka
+
 
 		### Extension hook -- Extend the given object with methods for setting it
 		### up as a plugin for its containing namespace.
 		def self::extended( object )
 			super
+			object.extend( Loggability )
+			object.log_to( :strelka )
 
 			# Find the plugin's namespace container, which will be the
 			# pluggable class/module
@@ -41,18 +49,18 @@ module Strelka
 				mod.const_get( name )
 			end
 
-			Strelka.log.debug "Extending %p as a Strelka::Plugin for %p" % [ object, pluggable ]
+			self.log.debug "Extending %p as a Strelka::Plugin for %p" % [ object, pluggable ]
 			object.successors = Set.new
 			object.pluggable = pluggable
 
 			# Register any pending dependencies for the newly-loaded plugin
 			name = object.plugin_name
 			if (( deps = pluggable.loaded_plugins[name] ))
-				Strelka.log.debug "  installing deferred deps for %p" % [ name ]
+				self.log.debug "  installing deferred deps for %p" % [ name ]
 				object.run_after( *deps )
 			end
 
-			Strelka.log.debug "  adding %p (%p) to the plugin registry for %p" %
+			self.log.debug "  adding %p (%p) to the plugin registry for %p" %
 				[ name, object, pluggable ]
 			pluggable.loaded_plugins[ name ] = object
 		end
@@ -88,7 +96,7 @@ module Strelka
 				if mod.respond_to?( :run_after )
 					mod.run_after( name )
 				else
-					Strelka.log.debug "%p plugin not yet loaded; setting up pending deps" % [ other_name ]
+					self.log.debug "%p plugin not yet loaded; setting up pending deps" % [ other_name ]
 					mod << name
 				end
 			end
@@ -98,7 +106,7 @@ module Strelka
 		### Register the receiver as needing to be run after +other_plugins+ for requests, and
 		### *before* them for responses.
 		def run_after( *other_plugins )
-			Strelka.log.debug "  %p will run after %p" % [ self, other_plugins ]
+			self.log.debug "  %p will run after %p" % [ self, other_plugins ]
 			self.successors.merge( other_plugins )
 		end
 
@@ -113,6 +121,8 @@ module Strelka
 		### object.
 		def self::extended( mod )
 			super
+			mod.extend( Loggability )
+			mod.log_to( :strelka )
 			mod.loaded_plugins = Strelka::PluginRegistry.new
 			mod.plugin_path_prefix = mod.name.downcase.gsub( /::/, File::SEPARATOR )
 		end
@@ -156,7 +166,7 @@ module Strelka
 
 		### Load the plugins with the given +names+ and install them.
 		def plugins( *names )
-			Strelka.log.info "Adding plugins: %s" % [ names.flatten.map(&:to_s).join(', ') ]
+			self.log.info "Adding plugins: %s" % [ names.flatten.map(&:to_s).join(', ') ]
 
 			# Load the associated Plugin Module objects
 			names.flatten.each {|name| self.load_plugin(name) }
@@ -174,7 +184,7 @@ module Strelka
 					plugin = self.loaded_plugins[ name ]
 				end
 
-				Strelka.log.debug "  registering %p" % [ name ]
+				self.log.debug "  registering %p" % [ name ]
 				self.register_plugin( plugin )
 			end
 		end
@@ -205,12 +215,12 @@ module Strelka
 		def register_plugin( mod )
 			if mod.const_defined?( :ClassMethods )
 				cm_mod = mod.const_get(:ClassMethods)
-				Strelka.log.debug "  adding class methods from %p" % [ cm_mod ]
+				self.log.debug "  adding class methods from %p" % [ cm_mod ]
 
 				extend( cm_mod )
 				cm_mod.instance_variables.each do |ivar|
 					next if instance_variable_defined?( ivar )
-					Strelka.log.debug "  copying class instance variable %s" % [ ivar ]
+					self.log.debug "  copying class instance variable %s" % [ ivar ]
 					ival = cm_mod.instance_variable_get( ivar )
 
 					# Don't duplicate modules/classes or immediates
@@ -233,12 +243,12 @@ module Strelka
 		### of the plugins themselves.
 		def install_plugins
 			if self.plugins_installed?
-				Strelka.log.warn "Plugins were already installed for %p from %p" %
+				self.log.warn "Plugins were already installed for %p from %p" %
 					[ self, self.plugins_installed_from ]
-				Strelka.log.info "I'll attempt to install any new ones, but plugin ordering"
-				Strelka.log.info "and other functionality might exhibit strange behavior."
+				self.log.info "I'll attempt to install any new ones, but plugin ordering"
+				self.log.info "and other functionality might exhibit strange behavior."
 			else
-				Strelka.log.info "Installing plugins for %p." % [ self ]
+				self.log.info "Installing plugins for %p." % [ self ]
 			end
 
 			sorted_plugins = self.loaded_plugins.tsort.reverse
@@ -247,11 +257,11 @@ module Strelka
 				mod = self.loaded_plugins[ name ]
 
 				unless @plugins.include?( name ) || @plugins.include?( mod )
-					Strelka.log.debug "  skipping %s" % [ name ]
+					self.log.debug "  skipping %s" % [ name ]
 					next
 				end
 
-				Strelka.log.info "  including %p." % [ mod ]
+				self.log.info "  including %p." % [ mod ]
 				include( mod )
 			end
 
@@ -262,7 +272,7 @@ module Strelka
 		### Return the list of plugin modules that are in effect for the current
 		### app.
 		def application_stack
-			Strelka.log.debug "Ancestors are: %p" % [ self.class.ancestors ]
+			self.log.debug "Ancestors are: %p" % [ self.class.ancestors ]
 			return self.ancestors.select {|mod| mod.respond_to?(:plugin_name) }
 		end
 
@@ -270,7 +280,7 @@ module Strelka
 		### Output the application stack into the logfile.
 		def dump_application_stack
 			stack = self.application_stack.map( &:plugin_name )
-			Strelka.log.info "Application stack: request -> %s" % [ stack.join(" -> ") ]
+			self.log.info "Application stack: request -> %s" % [ stack.join(" -> ") ]
 		end
 
 	end # module PluginLoader

data/lib/strelka/session/db.rb

@@ -75,10 +75,10 @@ class Strelka::Session::Db < Strelka::Session::Default
 	###
 	def self::initialize_sessions_table
 		if self.db.table_exists?( @table_name )
-			Strelka.log.debug "Using existing sessions table for %p" % [ db ]
+			self.log.debug "Using existing sessions table for %p" % [ db ]
 
 		else
-			Strelka.log.debug "Creating new sessions table for %p" % [ db ]
+			self.log.debug "Creating new sessions table for %p" % [ db ]
 			self.db.create_table( @table_name ) do
 				text :session_id, :index => true
 				text :session

data/lib/strelka/session/default.rb

@@ -82,7 +82,7 @@ class Strelka::Session::Default < Strelka::Session
 		if cookie.value =~ /^([[:xdigit:]]+)$/i
 			return $1.untaint
 		else
-			Strelka.log.warn "Request with a malformed session cookie: %p" % [ request ]
+			self.log.warn "Request with a malformed session cookie: %p" % [ request ]
 			return nil
 		end
 	end
@@ -99,9 +99,9 @@ class Strelka::Session::Default < Strelka::Session
 	### Return +true+ if the given +request+ has a session token which corresponds
 	### to an existing session key.
 	def self::has_session_for?( request )
-		Strelka.log.debug "Checking request (%s/%d) for session." % [ request.sender_id, request.conn_id ]
+		self.log.debug "Checking request (%s/%d) for session." % [ request.sender_id, request.conn_id ]
 		id = self.get_existing_session_id( request ) or return false
-		Strelka.log.debug "  got a session ID: %p" % [ id ]
+		self.log.debug "  got a session ID: %p" % [ id ]
 		return @sessions.key?( id )
 	end
 

data/spec/lib/helpers.rb

@@ -27,6 +27,7 @@ if ENV['COVERAGE']
 	end
 end
 
+require 'loggability'
 require 'configurability'
 require 'pathname'
 require 'tmpdir'
@@ -44,33 +45,6 @@ require 'spec/lib/constants'
 module Strelka::SpecHelpers
 	include Strelka::TestConstants
 
-	class ArrayLogger
-		### Create a new ArrayLogger that will append content to +array+.
-		def initialize( array )
-			@array = array
-		end
-
-		### Write the specified +message+ to the array.
-		def write( message )
-			@array << message
-		end
-
-		### No-op -- this is here just so Logger doesn't complain
-		def close; end
-
-	end # class ArrayLogger
-
-
-	unless defined?( LEVEL )
-		LEVEL = {
-			:debug => Logger::DEBUG,
-			:info  => Logger::INFO,
-			:warn  => Logger::WARN,
-			:error => Logger::ERROR,
-			:fatal => Logger::FATAL,
-		  }
-	end
-
 	###############
 	module_function
 	###############
@@ -90,7 +64,7 @@ module Strelka::SpecHelpers
 
 
 	### Alter the output of the default log formatter to be pretty in SpecMate output
-	def setup_logging( level=Logger::FATAL )
+	def setup_logging( level=:fatal )
 
 		# Only do this when executing from a spec in TextMate
 		if ENV['HTML_LOGGING'] || (ENV['TM_FILENAME'] && ENV['TM_FILENAME'] =~ /_spec\.rb/)

data/spec/strelka/app/filters_spec.rb

@@ -41,15 +41,12 @@ describe Strelka::App::Filters do
 	describe "an including App" do
 
 		before( :each ) do
-			Strelka.log.debug "Creating a new Strelka::App"
 			@app = Class.new( Strelka::App ) do
 				plugin :filters
 				def initialize( appid='params-test', sspec=TEST_SEND_SPEC, rspec=TEST_RECV_SPEC )
 					super
 				end
 			end
-			Strelka.log.debug "  App class is: %p, filters array: 0x%016x" %
-				[ @app, @app.filters.object_id * 2 ]
 		end
 
 		it "has its filters config inherited by subclasses" do

data/spec/strelka/app/restresources_spec.rb

@@ -45,7 +45,6 @@ describe Strelka::App::RestResources do
 	describe "an including App" do
 
 		before( :each ) do
-			Strelka.log.debug "Creating a new Strelka::App"
 			@app = Class.new( Strelka::App ) do
 				plugin :restresources
 				def initialize( appid='rest-test', sspec=TEST_SEND_SPEC, rspec=TEST_RECV_SPEC )

data/spec/strelka/app/routing_spec.rb

@@ -41,15 +41,12 @@ describe Strelka::App::Routing do
 	describe "an including App" do
 
 		before( :each ) do
-			Strelka.log.debug "Creating a new Strelka::App"
 			@app = Class.new( Strelka::App ) do
 				plugin :routing
 				def initialize( appid='params-test', sspec=TEST_SEND_SPEC, rspec=TEST_RECV_SPEC )
 					super
 				end
 			end
-			Strelka.log.debug "  App class is: %p, routes array: 0x%016x" %
-				[ @app, @app.routes.object_id * 2 ]
 		end
 
 

data/spec/strelka/app/sessions_spec.rb

@@ -85,8 +85,8 @@ describe Strelka::App::Sessions do
 
 		before( :each ) do
 			@app = Class.new( Strelka::App ) do
-				Strelka.log.info "Anonymous App class: %p" % [ self ]
-				Strelka.log.info "ID constant is: %p" % [ const_defined?(:ID) ? const_get(:ID) : "(not defined)" ]
+				self.log.info "Anonymous App class: %p" % [ self ]
+				self.log.info "ID constant is: %p" % [ const_defined?(:ID) ? const_get(:ID) : "(not defined)" ]
 
 				self::ID = 'monkeyshines'
 				# Guard against ID leakage
@@ -101,6 +101,7 @@ describe Strelka::App::Sessions do
 
 				def handle_request( req )
 					super do
+						self.log.debug "Session is: %p" % [ req.session ]
 						req.session[ :test ] = 'session data'
 						req.response
 					end

data/spec/strelka/cookieset_spec.rb

@@ -27,6 +27,14 @@ describe Strelka::CookieSet do
 	end
 
 
+	it "delegates some methods to its underlying Set" do
+		cookie = Strelka::Cookie.new( 'pants', 'baggy' )
+
+		@cookieset.should be_empty()
+		@cookieset.length.should == 0
+		@cookieset.member?( cookie ).should be_false()
+	end
+
 	it "is able to enummerate over each cookie in the set" do
 		pants_cookie = Strelka::Cookie.new( 'pants', 'baggy' )
 		shirt_cookie = Strelka::Cookie.new( 'shirt', 'pirate' )

data/spec/strelka/httprequest/session_spec.rb

@@ -35,7 +35,6 @@ describe Strelka::HTTPRequest::Session, "-extended request" do
 
 	before( :each ) do
 		@req = @request_factory.get( '/service/user/estark' )
-		Strelka.log.debug "Extending request %p" % [ @req ]
 		@req.extend( described_class )
 	end
 
@@ -110,13 +109,22 @@ describe Strelka::HTTPRequest::Session, "-extended request" do
 		context "and a corresponding entry in the database" do
 
 			before( :each ) do
-				@req.session[ :test ] = true
+				Strelka::Session::Default.sessions[ @sess_id ] = {}
 			end
 
 			it "knows that it has a session" do
 				@req.should have_session()
 			end
 
+			it "knows when its session hasn't been loaded" do
+				@req.session_loaded?.should be_false()
+			end
+
+			it "knows when its session has been loaded" do
+				@req.session # Load it
+				@req.session_loaded?.should be_true()
+			end
+
 			it "can purge the session from the database" do
 				@req.should have_session()
 				@req.destroy_session

data/spec/strelka/httpresponse/session_spec.rb

@@ -130,12 +130,33 @@ describe Strelka::HTTPResponse::Session, "-extended response" do
 				@res.should have_session()
 			end
 
-			it "saves the session via itself when told to do so" do
+			it "knows that its session has been loaded if it has one" do
+				@res.session
+				@res.session_loaded?.should be_true()
+			end
+
+			it "knows that its session has been loaded if its request has one" do
+				@res.request.session
+				@res.session_loaded?.should be_true()
+			end
+
+			it "knows that its session hasn't been loaded if neither its request not itself has one" do
+				@res.session_loaded?.should be_false()
+			end
+
+			it "saves the session via itself if it was loaded" do
 				@res.cookies.should_not include( @cookie_name )
+				@res.session
 				@res.save_session
 				@res.cookies[ @cookie_name ].value.should == @sess_id
 			end
 
+			it "doesn't save the session via itself if it wasn't loaded" do
+				@res.cookies.should_not include( @cookie_name )
+				@res.save_session
+				@res.cookies.should be_empty()
+			end
+
 		end
 
 	end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strelka
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre.224
+  version: 0.0.1.pre.229
   prerelease: 
 platform: ruby
 authors:
@@ -36,7 +36,7 @@ cert_chain:
   YUhDS0xaZFNLai9SSHVUT3QrZ2JsUmV4OEZBaDhOZUEKY21saFhlNDZwWk5K
   Z1dLYnhaYWg4NWpJang5NWhSOHZPSStOQU01aUg5a09xSzEzRHJ4YWNUS1Bo
   cWo1UGp3RgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2012-05-07 00:00:00.000000000 Z
+date: 2012-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -125,7 +125,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '0.22'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -133,7 +133,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '0.22'
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
@@ -189,7 +189,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -197,7 +197,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
   requirement: !ruby/object:Gem::Requirement