strelka 0.0.1.pre.219 → 0.0.1.pre.224

data/Rakefile

@@ -31,6 +31,7 @@ hoespec = Hoe.spec 'strelka' do
 	self.dependency 'uuidtools',       '~> 2.1'
 	self.dependency 'configurability', '~> 1.0'
 	self.dependency 'pluginfactory',   '~> 1.0'
+	self.dependency 'loggability',     '~> 0.0'
 
 	self.dependency 'hoe-deveiate',    '~> 0.1', :developer
 	self.dependency 'hoe-manualgen',   '~> 0.3', :developer

data/bin/strelka

@@ -293,7 +293,9 @@ class Strelka::CLICommand
 		fork do
 			self.log.debug "  in the child."
 			Strelka.load_config( self.options.config ) if self.options.config
-			Kernel.load( path )
+			apps = Strelka::App.load( path )
+			self.log.debug "  loaded: %p" % [ apps ]
+			apps.first.run
 		end
 
 		message "started. Waiting for shutdown."

data/lib/strelka.rb

@@ -3,9 +3,11 @@
 # encoding: utf-8
 
 require 'mongrel2'
+require 'loggability'
 require 'configurability'
 require 'configurability/config'
 
+
 # A Ruby application framework for Mongrel2[http://mongrel2.org/].
 #
 # == Author/s
@@ -16,20 +18,16 @@ require 'configurability/config'
 # :main: README.rdoc
 #
 module Strelka
+	extend Loggability
+
+	# Loggability API -- Set up this module as a log host.
+	log_as :strelka
 
 	# Library version constant
 	VERSION = '0.0.1'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 5bd05add55ad $
-
-
-	require 'strelka/logging'
-	extend Strelka::Logging
-
-	# Combine Strelka, Mongrel2, and Configurability logging
-	Mongrel2.logger = Strelka.logger
-	Configurability.logger = Strelka.logger
+	REVISION = %q$Revision: 4f0cbd7b3070 $
 
 	require 'strelka/constants'
 	include Strelka::Constants
@@ -73,7 +71,7 @@ module Strelka
 	### Convenience method -- Load the Configurability::Config from +configfile+
 	### and install it.
 	def self::load_config( configfile, defaults={} )
-		Strelka.log.info "Loading universal config from %p" % [ configfile ]
+		self.log.info "Loading universal config from %p" % [ configfile ]
 		self.config = Configurability::Config.load( configfile, defaults )
 		self.config.install
 	end

data/lib/strelka/app.rb

@@ -4,6 +4,7 @@
 
 require 'rubygems' # For the Rubygems API
 
+require 'loggability'
 require 'configurability'
 require 'mongrel2/handler'
 require 'strelka' unless defined?( Strelka )
@@ -13,13 +14,15 @@ require 'strelka/plugins'
 
 # The Strelka HTTP application base class.
 class Strelka::App < Mongrel2::Handler
-	extend Configurability,
+	extend Loggability,
+	       Configurability,
 	       Strelka::MethodUtilities,
 	       Strelka::PluginLoader
-	include Strelka::Loggable,
-	        Strelka::Constants,
+	include Strelka::Constants,
 	        Strelka::ResponseHelpers
 
+	# Loggability API -- set up logging
+	log_to :strelka
 
 	# Configurability API -- use the 'app' section of the config file.
 	config_key :app
@@ -59,10 +62,10 @@ class Strelka::App < Mongrel2::Handler
 	def self::run( appid=nil )
 		appid ||= self.default_appid
 
-		Strelka.logger.level = Logger::DEBUG if self.devmode?
-		Strelka.logger.formatter = Strelka::Logging::ColorFormatter.new( Strelka.logger ) if $stderr.tty?
+		Loggability.level = :debug if self.devmode?
+		Loggability.format_with( :color ) if $stderr.tty?
 
-		Strelka.log.info "Starting up with appid %p." % [ appid ]
+		self.log.info "Starting up with appid %p." % [ appid ]
 		super( appid )
 	end
 
@@ -167,6 +170,15 @@ class Strelka::App < Mongrel2::Handler
 	end
 
 
+	### Returns +true+ if the application has been configured to run in 'developer mode'.
+	### Developer mode is mostly informational by default (it just makes logging more
+	### verbose), but plugins and such might alter their behavior based on this setting.
+	def self::devmode?
+		return @devmode
+	end
+	singleton_method_alias :in_devmode?, :devmode?
+
+
 	### Configure the App. Override this if you wish to add additional configuration
 	### to the 'app' section of the config that will be passed to you when the config
 	### is loaded.
@@ -181,15 +193,6 @@ class Strelka::App < Mongrel2::Handler
 	end
 
 
-	### Returns +true+ if the application has been configured to run in 'developer mode'.
-	### Developer mode is mostly informational by default (it just makes logging more
-	### verbose), but plugins and such might alter their behavior based on this setting.
-	def self::devmode?
-		return @devmode
-	end
-	singleton_method_alias :in_devmode?, :devmode?
-
-
 	#
 	# :section: Application declarative methods
 	#

data/lib/strelka/app/auth.rb

@@ -2,6 +2,8 @@
 # vim: set nosta noet ts=4 sw=4:
 #encoding: utf-8
 
+require 'loggability'
+
 require 'strelka' unless defined?( Strelka )
 require 'strelka/app' unless defined?( Strelka::App )
 require 'strelka/plugins'
@@ -238,10 +240,15 @@ require 'strelka/authprovider'
 module Strelka::App::Auth
 	extend Strelka::Plugin,
 	       Strelka::MethodUtilities,
-	       Configurability
-	include Strelka::Loggable,
-	        Strelka::Constants
+	       Configurability,
+	       Loggability
+	include Strelka::Constants
+
+	# Loggability API -- set up logging under the 'strelka' log host
+	log_to :strelka
+
 
+	# Plugins API -- Set up load order
 	run_before :routing, :restresources
 	run_after  :templating, :errors, :sessions
 

data/lib/strelka/app/routing.rb

@@ -2,6 +2,8 @@
 # vim: set nosta noet ts=4 sw=4:
 # encoding: utf-8
 
+require 'loggability'
+
 require 'strelka' unless defined?( Strelka )
 require 'strelka/app' unless defined?( Strelka::App )
 
@@ -80,10 +82,15 @@ require 'strelka/plugins'
 # routing strategies.
 #
 module Strelka::App::Routing
-	extend Strelka::Plugin
-	include Strelka::Loggable,
-	        Strelka::Constants
+	extend Loggability,
+	       Strelka::Plugin
+	include Strelka::Constants
+
+
+	# Loggability API -- set up logging under the 'strelka' log host
+	log_to :strelka
 
+	# Plugins API -- set up load order
 	run_after :templating, :filters, :parameters
 
 

data/lib/strelka/app/sessions.rb

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+require 'loggability'
+
 require 'strelka' unless defined?( Strelka )
 require 'strelka/app' unless defined?( Strelka::App )
 
@@ -80,20 +82,25 @@ require 'strelka/httpresponse/session'
 module Strelka::App::Sessions
 	extend Strelka::Plugin,
 	       Strelka::MethodUtilities,
-	       Configurability
-	include Strelka::Loggable,
-	        Strelka::Constants
+	       Configurability,
+	       Loggability
+	include Strelka::Constants
 
-	# Default options to pass to the session object
-	DEFAULT_OPTIONS = {}
+	# Loggability API -- set up logging under the 'strelka' log host
+	log_to :strelka
 
 	# Configurability API -- specify which section of the config this class gets
 	config_key :sessions
 
-	# Specify load order; run as late as possible so other plugins can use the session
+	# Plugins API -- Specify load order; run as late as possible so other plugins
+	# can use the session
 	run_after :templating, :filters, :parameters
 
 
+	# Default options to pass to the session object
+	DEFAULT_OPTIONS = {}
+
+
 	##
 	# What session class to use (Class object)
 	singleton_attr_writer :session_class

data/lib/strelka/authprovider.rb

@@ -40,13 +40,16 @@ require 'strelka/mixins'
 #
 #
 class Strelka::AuthProvider
-	extend Strelka::Delegation
+	extend Loggability,
+	       Strelka::Delegation
 	include PluginFactory,
-	        Strelka::Loggable,
 	        Strelka::Constants,
 	        Strelka::AbstractClass,
 	        Strelka::ResponseHelpers
 
+	# Loggability API -- set up logging under the 'strelka' log host
+	log_to :strelka
+
 
 	### PluginFactory API -- return the Array of directories to search for concrete
 	### AuthProvider classes.

data/lib/strelka/authprovider/basic.rb

@@ -1,6 +1,7 @@
 # -*- ruby -*-
 # vim: set nosta noet ts=4 sw=4:
 
+require 'loggability'
 require 'configurability'
 
 require 'strelka' unless defined?( Strelka )
@@ -30,10 +31,10 @@ require 'strelka/mixins'
 #       kmurgen: "MZj9+VhZ8C9+aJhmwp+kWBL76Vs="
 #
 class Strelka::AuthProvider::Basic < Strelka::AuthProvider
-	extend Configurability,
+	extend Loggability,
+	       Configurability,
 	       Strelka::MethodUtilities
-	include Strelka::Constants,
-	        Strelka::Loggable
+	include Strelka::Constants
 
 	# Configurability API - set the section of the config
 	config_key :auth

data/lib/strelka/authprovider/hostaccess.rb

@@ -2,6 +2,7 @@
 # vim: set nosta noet ts=4 sw=4:
 
 require 'ipaddr'
+require 'loggability'
 require 'configurability'
 
 require 'strelka' unless defined?( Strelka )
@@ -19,12 +20,16 @@ require 'strelka/mixins'
 #     - 127.0.0.0/8
 #     - 10.5.3.0/22
 class Strelka::AuthProvider::HostAccess < Strelka::AuthProvider
+	extend Loggability
 	include Configurability,
 	        Strelka::Constants,
-	        Strelka::Loggable,
 	        Strelka::MethodUtilities
 
 
+	# Loggability API -- set up logging under the 'strelka' log host
+	log_to :strelka
+
+
 	# The default list of netblocks to allow
 	DEFAULT_ALLOWED_NETBLOCKS = %w[127.0.0.0/8]
 

data/lib/strelka/cookie.rb

@@ -5,6 +5,7 @@
 require 'date'
 require 'time'
 require 'uri'
+require 'loggability'
 
 require 'strelka' unless defined?( Strelka )
 require 'strelka/mixins'
@@ -21,7 +22,11 @@ require 'strelka/mixins'
 #   reserved.
 #
 class Strelka::Cookie
-	include Strelka::Loggable
+	extend Loggability
+
+	# Loggability API -- set up logging under the 'strelka' log host
+	log_to :strelka
+
 
 	# The format of the date field
 	COOKIE_DATE_FORMAT = '%a, %d %b %Y %H:%M:%S GMT'

data/lib/strelka/httprequest.rb

@@ -5,6 +5,7 @@
 require 'yajl'
 require 'yaml'
 require 'uri'
+require 'loggability'
 
 require 'mongrel2/httprequest'
 require 'strelka' unless defined?( Strelka )
@@ -14,10 +15,13 @@ require 'strelka/mixins'
 
 # An HTTP request class.
 class Strelka::HTTPRequest < Mongrel2::HTTPRequest
-	include Strelka::Loggable,
-	        Strelka::Constants,
+	extend Loggability
+	include Strelka::Constants,
 	        Strelka::ResponseHelpers,
-			Strelka::DataUtilities
+	        Strelka::DataUtilities
+
+	# Loggability API -- set up logging under the 'strelka' log host
+	log_to :strelka
 
 	# Set Mongrel2 to use Strelka's request class for HTTP requests
 	register_request_type( self, *HTTP::RFC2616_VERBS )
@@ -152,6 +156,13 @@ class Strelka::HTTPRequest < Mongrel2::HTTPRequest
 	end
 
 
+	### A convenience method for redirecting a request to another URI.
+	def redirect( uri, perm=false )
+		code = perm ? HTTP::MOVED_PERMANENTLY : HTTP::MOVED_TEMPORARILY
+		finish_with( code, "redirect from #{self.uri.path} to #{uri}", :location => uri )
+	end
+
+
 	#########
 	protected
 	#########

data/lib/strelka/httprequest/acceptparams.rb

@@ -2,6 +2,7 @@
 # vim: set nosta noet ts=4 sw=4:
 # encoding: utf-8
 
+require 'loggability'
 require 'strelka/mixins'
 require 'strelka/httprequest'
 
@@ -49,11 +50,15 @@ class Strelka::HTTPRequest
 	# * Mahlon E. Smith <mahlon@martini.nu>
 	#
 	class AcceptParam
+		extend Loggability
 		include Comparable,
-		        Strelka::Loggable,
 		        Strelka::AbstractClass
 
 
+		# Loggability API -- set up logging under the 'strelka' log host
+		log_to :strelka
+
+
 		# The default quality value (weight) if none is specified
 		Q_DEFAULT = 1.0
 

data/lib/strelka/httprequest/session.rb

@@ -61,6 +61,14 @@ 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

data/lib/strelka/httpresponse.rb

@@ -2,15 +2,20 @@
 # vim: set nosta noet ts=4 sw=4:
 # encoding: utf-8
 
+require 'loggability'
 require 'mongrel2/httpresponse'
 require 'strelka' unless defined?( Strelka )
 require 'strelka/cookieset'
 
 # An HTTP response class.
 class Strelka::HTTPResponse < Mongrel2::HTTPResponse
-	include Strelka::Loggable,
-	        Strelka::Constants,
-			Strelka::DataUtilities
+	extend Loggability
+	include Strelka::Constants,
+	        Strelka::DataUtilities
+
+
+	# Loggability API -- set up logging under the 'strelka' log host
+	log_to :strelka
 
 
 	# Pattern for matching a 'charset' parameter in a media-type string, such as the

data/lib/strelka/mixins.rb

@@ -2,90 +2,12 @@
 # vim: set nosta noet ts=4 sw=4:
 # encoding: utf-8
 
-require 'logger'
-
 require 'strelka' unless defined?( Strelka )
 require 'strelka/constants'
 
 
 module Strelka
 
-	# Add logging to a Strelka class. Including classes get #log and
-	# #log_debug methods.
-	#
-	#   class MyClass
-	#       include Inversion::Loggable
-	#
-	#       def a_method
-	#           self.log.debug "Doing a_method stuff..."
-	#       end
-	#   end
-	#
-	module Loggable
-
-		# A logging proxy class that wraps calls to the logger into calls that include
-		# the name of the calling class.
-		class ClassNameProxy
-
-			### Create a new proxy for the given +klass+.
-			def initialize( klass, force_debug=false )
-				@classname   = klass.name
-				@force_debug = force_debug
-			end
-
-			### Delegate debug messages to the global logger with the appropriate class name.
-			def debug( msg=nil, &block )
-				Strelka.logger.add( Logger::DEBUG, msg, @classname, &block )
-			end
-
-			### Delegate info messages to the global logger with the appropriate class name.
-			def info( msg=nil, &block )
-				return self.debug( msg, &block ) if @force_debug
-				Strelka.logger.add( Logger::INFO, msg, @classname, &block )
-			end
-
-			### Delegate warn messages to the global logger with the appropriate class name.
-			def warn( msg=nil, &block )
-				return self.debug( msg, &block ) if @force_debug
-				Strelka.logger.add( Logger::WARN, msg, @classname, &block )
-			end
-
-			### Delegate error messages to the global logger with the appropriate class name.
-			def error( msg=nil, &block )
-				return self.debug( msg, &block ) if @force_debug
-				Strelka.logger.add( Logger::ERROR, msg, @classname, &block )
-			end
-
-			### Delegate fatal messages to the global logger with the appropriate class name.
-			def fatal( msg=nil, &block )
-				Strelka.logger.add( Logger::FATAL, msg, @classname, &block )
-			end
-
-		end # ClassNameProxy
-
-		#########
-		protected
-		#########
-
-		### Copy constructor -- clear the original's log proxy.
-		def initialize_copy( original )
-			@log_proxy = @log_debug_proxy = nil
-			super
-		end
-
-		### Return the proxied logger.
-		def log
-			@log_proxy ||= ClassNameProxy.new( self.class )
-		end
-
-		### Return a proxied "debug" logger that ignores other level specification.
-		def log_debug
-			@log_debug_proxy ||= ClassNameProxy.new( self.class, true )
-		end
-
-	end # module Loggable
-
-
 	# Hides your class's ::new method and adds a +pure_virtual+ method generator for
 	# defining API methods. If subclasses of your class don't provide implementations of
 	# "pure_virtual" methods, NotImplementedErrors will be raised if they are called.
@@ -351,6 +273,7 @@ module Strelka
 
 	# A collection of functions for generating responses.
 	module ResponseHelpers
+		include Strelka::Constants
 
 		### Abort the current execution and return a response with the specified
 		### http_status code immediately. The specified +message+ will be logged,
@@ -375,9 +298,13 @@ 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] ]
+			logmsg = "Finishing with status %d: %s" % [ status_info[:status], status_info[:message] ]
+			if status_info[:status] > 399
+				self.log.info( logmsg )
+			else
+				self.log.error( logmsg )
+			end
+
 
 			throw :finish, status_info
 		end

data/lib/strelka/paramvalidator.rb

@@ -8,6 +8,7 @@ require 'uri'
 require 'forwardable'
 require 'date'
 require 'formvalidator'
+require 'loggability'
 
 require 'strelka/mixins'
 require 'strelka' unless defined?( Strelka )
@@ -52,8 +53,12 @@ require 'strelka/app' unless defined?( Strelka::App )
 #	end
 #
 class Strelka::ParamValidator < ::FormValidator
-	extend Forwardable
-	include Strelka::Loggable
+	extend Forwardable,
+	       Loggability
+
+	# Loggability API -- set up logging under the 'strelka' log host
+	log_to :strelka
+
 
 	# Options that are passed as Symbols to .param
 	FLAGS = [ :required, :untaint ]

data/lib/strelka/router.rb

@@ -2,6 +2,7 @@
 # vim: set nosta noet ts=4 sw=4:
 # encoding: utf-8
 
+require 'loggability'
 require 'pluginfactory'
 
 require 'strelka' unless defined?( Strelka )
@@ -23,9 +24,13 @@ require 'strelka/mixins'
 # <tt>strelka/router/{something}.rb</tt>, and be sure to override the
 # #add_route and #route_request methods.
 class Strelka::Router
+	extend Loggability
 	include PluginFactory,
-	        Strelka::Loggable,
-			Strelka::AbstractClass
+	        Strelka::AbstractClass
+
+	# Loggability API -- set up logging under the 'strelka' log host
+	log_to :strelka
+
 
 	### PluginFactory API -- return the Array of directories to search for plugins.
 	def self::derivative_dirs

data/lib/strelka/router/default.rb

@@ -2,14 +2,16 @@
 # vim: set nosta noet ts=4 sw=4:
 # encoding: utf-8
 
+require 'loggability'
+
 require 'strelka' unless defined?( Strelka )
 require 'strelka/app' unless defined?( Strelka::App )
 require 'strelka/router'
 
 # Simple (dumb?) request router for Strelka::App-based applications.
 class Strelka::Router::Default < Strelka::Router
-	include Strelka::Loggable,
-	        Strelka::Constants,
+	extend Loggability
+	include Strelka::Constants,
 	        Strelka::ResponseHelpers
 
 	### Create a new router that will route requests according to the specified

data/lib/strelka/router/exclusive.rb

@@ -2,6 +2,8 @@
 # vim: set nosta noet ts=4 sw=4:
 # encoding: utf-8
 
+require 'loggability'
+
 require 'strelka' unless defined?( Strelka )
 require 'strela/app' unless defined?( Strelka::App )
 
@@ -24,7 +26,11 @@ require 'strelka/router/default'
 #     end # class MyApp
 #
 class Strelka::Router::Exclusive < Strelka::Router::Default
-	include Strelka::Loggable
+	extend Loggability
+
+	# Loggability API -- set up logging under the 'strelka' log host
+	log_to :strelka
+
 
 	######
 	public

data/lib/strelka/session.rb

@@ -3,6 +3,7 @@
 
 require 'digest/sha1'
 require 'pluginfactory'
+require 'loggability'
 
 require 'strelka' unless defined?( Strelka )
 require 'strelka/mixins'
@@ -42,9 +43,12 @@ require 'strelka/mixins'
 #
 #
 class Strelka::Session
+	extend Loggability
 	include PluginFactory,
-	        Strelka::Loggable,
-			Strelka::AbstractClass
+	        Strelka::AbstractClass
+
+	# Loggability API -- set up logging under the 'strelka' log host
+	log_to :strelka
 
 
 	### PluginFactory API -- return the Array of directories to search for concrete

data/lib/strelka/session/db.rb

@@ -1,6 +1,7 @@
 # -*- ruby -*-
 # vim: set nosta noet ts=4 sw=4:
 
+require 'loggability'
 require 'securerandom'
 require 'forwardable'
 require 'sequel'
@@ -14,10 +15,14 @@ require 'strelka/session/default'
 # any database that Sequel supports.  It defaults to non-persistent, in memory Sqlite.
 #
 class Strelka::Session::Db < Strelka::Session::Default
-	include Strelka::Loggable
-	extend Forwardable,
+	extend Loggability,
+	       Forwardable,
 	       Strelka::MethodUtilities
 
+	# Loggability API -- set up logging under the 'strelka' log host
+	log_to :strelka
+
+
 	# Class-instance variables
 	@table_name   = :sessions
 	@db           = nil
@@ -59,7 +64,7 @@ class Strelka::Session::Db < Strelka::Session::Default
 		@db = options[ :connect ].nil? ?
 			 Mongrel2::Config.in_memory_db :
 			 Sequel.connect( options[:connect] )
-		@db.logger = Strelka.logger
+		@db.logger = Loggability[ Mongrel2 ].proxy_for( @db )
 
 		self.initialize_sessions_table
 	end

data/lib/strelka/session/default.rb

@@ -1,6 +1,7 @@
 # -*- ruby -*-
 # vim: set nosta noet ts=4 sw=4:
 
+require 'loggability'
 require 'securerandom'
 require 'forwardable'
 
@@ -17,11 +18,11 @@ require 'strelka/mixins'
 # The following methods are delegated to the inner Hash via the #namespaced_hash method:
 # #[], #[]=, #delete, #key?
 class Strelka::Session::Default < Strelka::Session
-	extend Forwardable,
+	extend Loggability,
+	       Forwardable,
 	       Strelka::MethodUtilities,
 	       Strelka::Delegation
-	include Strelka::Loggable,
-			Strelka::DataUtilities
+	include Strelka::DataUtilities
 
 	# Default configuration
 	DEFAULT_COOKIE_OPTIONS = {

data/spec/lib/helpers.rb

@@ -83,35 +83,28 @@ module Strelka::SpecHelpers
 
 	### Reset the logging subsystem to its default state.
 	def reset_logging
-		Strelka.reset_logger
-		Mongrel2.reset_logger
+		Loggability.formatter = nil
+		Loggability.output_to( $stderr )
+		Loggability.level = :fatal
 	end
 
 
 	### Alter the output of the default log formatter to be pretty in SpecMate output
 	def setup_logging( level=Logger::FATAL )
 
-		# Turn symbol-style level config into Logger's expected Fixnum level
-		if Strelka::Logging::LOG_LEVELS.key?( level.to_s )
-			level = Strelka::Logging::LOG_LEVELS[ level.to_s ]
-		end
-
-		logger = Logger.new( $stderr )
-		Strelka.logger = logger
-		Strelka.logger.level = level
-		Mongrel2.logger.level = level
-
 		# Only do this when executing from a spec in TextMate
 		if ENV['HTML_LOGGING'] || (ENV['TM_FILENAME'] && ENV['TM_FILENAME'] =~ /_spec\.rb/)
-			Thread.current['logger-output'] = []
-			logdevice = ArrayLogger.new( Thread.current['logger-output'] )
-			Strelka.logger = Logger.new( logdevice )
-			# Strelka.logger.level = level
-			Strelka.logger.formatter = Strelka::Logging::HtmlFormatter.new( logger )
-			Mongrel2.logger = Strelka.logger
+			logarray = []
+			Thread.current['logger-output'] = logarray
+			Loggability.output_to( logarray )
+			Loggability.format_as( :html )
+			Loggability.level = :debug
+		else
+			Loggability.level = level
 		end
 	end
 
+
 	### Set up a Mongrel2 configuration database according to the specified +dbspec+.
 	### Set up a Mongrel2 configuration database in memory.
 	def setup_config_db

data/spec/strelka/httprequest/session_spec.rb

@@ -110,13 +110,18 @@ describe Strelka::HTTPRequest::Session, "-extended request" do
 		context "and a corresponding entry in the database" do
 
 			before( :each ) do
-				Strelka::Session::Default.sessions[ @sess_id ] = {}
+				@req.session[ :test ] = true
 			end
 
 			it "knows that it has a session" do
 				@req.should have_session()
 			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/httprequest_spec.rb

@@ -65,6 +65,16 @@ describe Strelka::HTTPRequest do
 			@req.notes[:routing][:route].should be_a( Hash )
 		end
 
+		it "can redirect the request to a different URI" do
+			uri = 'http://www.google.com/'
+			expect {
+				@req.redirect( uri )
+			}.to finish_with( HTTP::MOVED_TEMPORARILY, nil, :location => uri )
+
+			expect {
+				@req.redirect( uri, true )
+			}.to finish_with( HTTP::MOVED_PERMANENTLY, nil, :location => uri )
+		end
 	end
 
 

data/spec/strelka/mixins_spec.rb

@@ -21,40 +21,6 @@ require 'strelka/mixins'
 describe Strelka, "mixins" do
 
 
-	describe Strelka::Loggable do
-		before(:each) do
-			@logfile = StringIO.new('')
-			Strelka.logger = Logger.new( @logfile )
-
-			@test_class = Class.new do
-				include Strelka::Loggable
-
-				def log_test_message( level, msg )
-					self.log.send( level, msg )
-				end
-
-				def logdebug_test_message( msg )
-					self.log_debug.debug( msg )
-				end
-			end
-			@obj = @test_class.new
-		end
-
-
-		it "is able to output to the log via its #log method" do
-			@obj.log_test_message( :debug, "debugging message" )
-			@logfile.rewind
-			@logfile.read.should =~ /debugging message/
-		end
-
-		it "is able to output to the log via its #log_debug method" do
-			@obj.logdebug_test_message( "sexydrownwatch" )
-			@logfile.rewind
-			@logfile.read.should =~ /sexydrownwatch/
-		end
-	end
-
-
 	describe Strelka::AbstractClass do
 
 		context "mixed into a class" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strelka
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre.219
+  version: 0.0.1.pre.224
   prerelease: 
 platform: ruby
 authors:
@@ -36,7 +36,7 @@ cert_chain:
   YUhDS0xaZFNLai9SSHVUT3QrZ2JsUmV4OEZBaDhOZUEKY21saFhlNDZwWk5K
   Z1dLYnhaYWg4NWpJang5NWhSOHZPSStOQU01aUg5a09xSzEzRHJ4YWNUS1Bo
   cWo1UGp3RgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2012-05-04 00:00:00.000000000 Z
+date: 2012-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -182,6 +182,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: loggability
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
   requirement: !ruby/object:Gem::Requirement