strelka 0.0.1.pre.187 → 0.0.1.pre.193

data/lib/strelka/session.rb

@@ -61,6 +61,14 @@ class Strelka::Session
 	end
 
 
+	### Fetch the session ID from the given +request, returning +nil+ if it doesn't
+	### have any session attributes. You should override this and provide the
+	### code which fetches the ID from the +request+.
+	def self::get_existing_session_id( request )
+		return nil
+	end
+
+
 	### Fetch the session ID from the given +request+, or create a new one if the
 	### request is +nil+ or doesn't have the necessary attributes. You should
 	### override this, as the default implementation just returns +nil+.
@@ -106,13 +114,23 @@ class Strelka::Session
 	end
 
 
+	### Return +true+ if the given +request+ has a valid session token, and that
+	### token corresponds to an existing session ID. You should override this if
+	### there's a cheaper way to check for an existing session than just calling
+	### ::load_session_data.
+	def self::has_session_for?( request )
+		id = self.get_existing_session_id( request ) or return false
+		return true if self.load( id )
+	end
+
+
 	#################################################################
 	###	I N S T A N C E   M E T H O D S
 	#################################################################
 
 	### Set up a new instance with the given +session_id+ and +initial_values+.
-	def initialize( session_id, initial_values={} ) # :notnew:
-		@session_id = session_id
+	def initialize( session_id=nil, initial_values={} ) # :notnew:
+		@session_id = session_id || self.class.get_session_id
 	end
 
 

data/lib/strelka/session/db.rb

@@ -15,7 +15,8 @@ require 'strelka/session/default'
 #
 class Strelka::Session::Db < Strelka::Session::Default
 	include Strelka::Loggable
-	extend Forwardable
+	extend Forwardable,
+	       Strelka::MethodUtilities
 
 	# Class-instance variables
 	@table_name   = :sessions
@@ -25,16 +26,17 @@ class Strelka::Session::Db < Strelka::Session::Default
 		:name => 'strelka-session'
 	}
 
-	class << self
-		# The Sequel dataset connection
-		attr_reader :db
+	##
+	# The Sequel dataset connection
+	singleton_attr_reader :db
 
-		# The Sequel dataset for the sessions table
-		attr_reader :dataset
+	##
+	# The Sequel dataset for the sessions table
+	singleton_attr_reader :dataset
 
-		# The configured session cookie parameters
-		attr_accessor :cookie_options
-	end
+	##
+	# The configured session cookie parameters
+	singleton_attr_accessor :cookie_options
 
 
 	########################################################################
@@ -94,7 +96,7 @@ class Strelka::Session::Db < Strelka::Session::Default
 
 
 	### Save the given +data+ associated with the +session_id+ to the DB.
-	def self::save_session_data( session_id, data )
+	def self::save_session_data( session_id, data={} )
 		self.db.transaction do
 			self.delete_session_data( session_id.to_s )
 			self.dataset.insert(
@@ -111,5 +113,13 @@ class Strelka::Session::Db < Strelka::Session::Default
 		self.dataset.filter( :session_id => session_id ).delete
 	end
 
+
+	### Return +true+ if the given +request+ has a session token which corresponds
+	### to an existing session key.
+	def self::has_session_for?( request )
+		id = self.get_existing_session_id( request ) or return false
+		return !self.dataset.filter( :session_id => id ).empty?
+	end
+
 end # class Strelka::Session::Db
 

data/lib/strelka/session/default.rb

@@ -18,31 +18,38 @@ require 'strelka/mixins'
 # #[], #[]=, #delete, #key?
 class Strelka::Session::Default < Strelka::Session
 	extend Forwardable,
+	       Strelka::MethodUtilities,
 	       Strelka::Delegation
 	include Strelka::Loggable,
 			Strelka::DataUtilities
 
+	# Default configuration
+	DEFAULT_COOKIE_OPTIONS = {
+		:name => 'strelka-session'
+	}.freeze
+
+
 	# Class-instance variables
+	@cookie_options = DEFAULT_COOKIE_OPTIONS.dup
 	@sessions = {}
-	@cookie_options = {
-		:name => 'strelka-session'
-	}
 
-	class << self
-		# Persist sessions in memory
-		attr_reader :sessions
+	##
+	# In-memory session store
+	singleton_attr_reader :sessions
 
-		# The configured session cookie parameters
-		attr_accessor :cookie_options
-	end
+	##
+	# The configured session cookie parameters
+	singleton_attr_accessor :cookie_options
 
 
 	### Configure the session class with the given +options+, which should be a
 	### Hash or an object that has a Hash-like interface. Sets cookie options
 	### for the session if the +:cookie+ key is set.
-	def self::configure( options )
+	def self::configure( options=nil )
 		if options
 			self.cookie_options.merge!( options[:cookie] ) if options[:cookie]
+		else
+			self.cookie_options = DEFAULT_COOKIE_OPTIONS.dup
 		end
 	end
 
@@ -66,17 +73,35 @@ class Strelka::Session::Default < Strelka::Session
 	end
 
 
+	### Try to fetch a session ID from the specified +request+, returning +nil+
+	### if there isn't one.
+	def self::get_existing_session_id( request )
+		cookie = request.cookies[ self.cookie_options[:name] ] or return nil
+
+		if cookie.value =~ /^([[:xdigit:]]+)$/i
+			return $1.untaint
+		else
+			Strelka.log.warn "Request with a malformed session cookie: %p" % [ request ]
+			return nil
+		end
+	end
+
+
 	### Fetch the session ID from the given +request+, or create a new one if the
 	### request doesn't have the necessary attributes.
 	def self::get_session_id( request=nil )
-		id = nil
+		id = self.get_existing_session_id( request ) if request
+		return id || SecureRandom.hex
+	end
 
-		# Fetch and untaint the existing ID if it exists and looks valid
-		if request && (cookie = request.cookies[ self.cookie_options[:name] ])
-			id = $1.untaint if cookie.value =~ /^([[:xdigit:]]+)$/i
-		end
 
-		return id || SecureRandom.hex
+	### 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 ]
+		id = self.get_existing_session_id( request ) or return false
+		Strelka.log.debug "  got a session ID: %p" % [ id ]
+		return @sessions.key?( id )
 	end
 
 
@@ -86,8 +111,6 @@ class Strelka::Session::Default < Strelka::Session
 
 	### Create a new session store using the given +hash+ for initial values.
 	def initialize( session_id=nil, initial_values={} )
-		session_id ||= self.class.get_session_id
-
 		@hash       = Hash.new {|h,k| h[k] = {} }
 		@hash.merge!( initial_values )
 

data/spec/lib/helpers.rb

@@ -38,7 +38,7 @@ require 'mongrel2/testing'
 require 'strelka'
 
 require 'spec/lib/constants'
-# require 'spec/lib/matchers'
+
 
 ### RSpec helper functions.
 module Strelka::SpecHelpers

data/spec/strelka/app/auth_spec.rb

@@ -12,7 +12,7 @@ require 'rspec/mocks'
 require 'spec/lib/helpers'
 
 require 'strelka'
-require 'strelka/app/plugins'
+require 'strelka/plugins'
 require 'strelka/app/auth'
 require 'strelka/authprovider'
 

data/spec/strelka/app/errors_spec.rb

@@ -14,7 +14,7 @@ require 'inversion'
 require 'spec/lib/helpers'
 
 require 'strelka'
-require 'strelka/app/plugins'
+require 'strelka/plugins'
 require 'strelka/app/errors'
 
 require 'strelka/behavior/plugin'

data/spec/strelka/app/filters_spec.rb

@@ -13,7 +13,7 @@ require 'rspec'
 require 'spec/lib/helpers'
 
 require 'strelka'
-require 'strelka/app/plugins'
+require 'strelka/plugins'
 require 'strelka/app/filters'
 
 require 'strelka/behavior/plugin'

data/spec/strelka/app/negotiation_spec.rb

@@ -13,7 +13,7 @@ require 'rspec'
 require 'spec/lib/helpers'
 
 require 'strelka'
-require 'strelka/app/plugins'
+require 'strelka/plugins'
 require 'strelka/app/negotiation'
 require 'strelka/behavior/plugin'
 

data/spec/strelka/app/parameters_spec.rb

@@ -13,7 +13,7 @@ require 'rspec'
 require 'spec/lib/helpers'
 
 require 'strelka'
-require 'strelka/app/plugins'
+require 'strelka/plugins'
 require 'strelka/app/parameters'
 require 'strelka/behavior/plugin'
 

data/spec/strelka/app/restresources_spec.rb

@@ -13,7 +13,7 @@ require 'rspec'
 require 'spec/lib/helpers'
 
 require 'strelka'
-require 'strelka/app/plugins'
+require 'strelka/plugins'
 require 'strelka/app/restresources'
 
 require 'strelka/behavior/plugin'

data/spec/strelka/app/routing_spec.rb

@@ -13,7 +13,7 @@ require 'rspec'
 require 'spec/lib/helpers'
 
 require 'strelka'
-require 'strelka/app/plugins'
+require 'strelka/plugins'
 require 'strelka/app/routing'
 
 require 'strelka/behavior/plugin'
@@ -203,6 +203,7 @@ describe Strelka::App::Routing do
 
 		it "has its routes inherited by subclasses" do
 			@app.class_eval do
+				router :deep
 				get( '/info' ) {}
 				get( '/about' ) {}
 				get( '/origami' ) {}
@@ -220,6 +221,8 @@ describe Strelka::App::Routing do
 			subclass.routes.should include(
 				[ :GET, ['origami'], {action: subclass.instance_method(:GET_origami), options: {}} ]
 			)
+
+			subclass.routerclass.should == @app.routerclass
 		end
 
 		describe "that also uses the :parameters plugin" do

data/spec/strelka/app/sessions_spec.rb

@@ -11,7 +11,7 @@ require 'rspec'
 require 'spec/lib/helpers'
 
 require 'strelka'
-require 'strelka/app/plugins'
+require 'strelka/plugins'
 require 'strelka/app/sessions'
 
 require 'strelka/behavior/plugin'
@@ -36,23 +36,50 @@ describe Strelka::App::Sessions do
 	it_should_behave_like( "A Strelka::App Plugin" )
 
 
-	it "has an associated session class" do
-		Strelka::App::Sessions.session_class.should be_a( Class )
-		Strelka::App::Sessions.session_class.should < Strelka::Session
-	end
+	describe "session-class loading" do
+		before( :all ) do
+			# First, hook the anonymous class up to the 'testing' name using the PluginFactory API
+			@test_session_class = Class.new( Strelka::Session ) do
+				class << self; attr_accessor :options; end
+				def self::configure( options )
+					@options = options
+				end
+			end
+			Strelka::Session.derivatives[ 'testing' ] = @test_session_class
+		end
 
-	it "is can be configured to use a different session class" do
-		# First, hook the anonymous class up to the 'testing' name using the PluginFactory API
-		test_session_class = Class.new( Strelka::Session )
-		Strelka::Session.derivatives[ 'testing' ] = test_session_class
+		after( :each ) do
+			Strelka::App::Sessions.instance_variable_set( :@session_class, nil )
+		end
 
-		# Now configuring it to use the 'testing' session type should set it to use the 
-		# anonymous class
-		Strelka::App::Sessions.configure( :session_class => 'testing' )
+		it "has a default associated session class" do
+			Strelka::App::Sessions.session_class.should be_a( Class )
+			Strelka::App::Sessions.session_class.should < Strelka::Session
+		end
 
-		Strelka::App::Sessions.session_class.should == test_session_class
-	end
+		it "is can be configured to use a different session class" do
+			Strelka::App::Sessions.configure( :session_class => 'testing' )
+			Strelka::App::Sessions.session_class.should == @test_session_class
+		end
 
+		it "configures the configured session class with default options" do
+			Strelka::App::Sessions.configure( :session_class => 'testing' )
+			Strelka::App::Sessions.session_class.options.should == Strelka::App::Sessions::DEFAULT_OPTIONS
+		end
+
+		it "merges any config options for the configured session class" do
+			options = { 'cookie_name' => 'patience' }
+			Strelka::App::Sessions.configure( :session_class => 'testing', :options => options )
+			Strelka::App::Sessions.session_class.options.
+				should == Strelka::App::Sessions::DEFAULT_OPTIONS.merge( options )
+		end
+
+		it "uses the default session class if the config doesn't have a session section" do
+			Strelka::App::Sessions.configure
+			Strelka::App::Sessions.session_class.should be( Strelka::Session::Default )
+		end
+
+	end
 
 	describe "an including App" do
 
@@ -72,9 +99,11 @@ describe Strelka::App::Sessions do
 					super
 				end
 
-				def handle( req )
-					req.session[ :test ] = 'session data'
-					return req.response
+				def handle_request( req )
+					super do
+						req.session[ :test ] = 'session data'
+						req.response
+					end
 				end
 			end
 		end
@@ -107,6 +136,23 @@ describe Strelka::App::Sessions do
 			@app.session_namespace.should == :findizzle
 		end
 
+		it "extends the request and response classes" do
+			@app.install_plugins
+			Strelka::HTTPRequest.should < Strelka::HTTPRequest::Session
+			Strelka::HTTPResponse.should < Strelka::HTTPResponse::Session
+		end
+
+		it "sets the session namespace on requests" do
+			req = @request_factory.get( '/foom' )
+			res = @app.new.handle( req )
+			req.session_namespace.should == @app.default_appid
+		end
+
+		it "saves the session automatically" do
+			req = @request_factory.get( '/foom' )
+			res = @app.new.handle( req )
+			res.cookies.should include( Strelka::Session::Default.cookie_options[:name] )
+		end
 
 	end
 

data/spec/strelka/app/templating_spec.rb

@@ -14,7 +14,7 @@ require 'inversion'
 require 'spec/lib/helpers'
 
 require 'strelka'
-require 'strelka/app/plugins'
+require 'strelka/plugins'
 require 'strelka/app/templating'
 
 require 'strelka/behavior/plugin'

data/spec/strelka/app_spec.rb

@@ -26,6 +26,7 @@ describe Strelka::App do
 
 	before( :all ) do
 		setup_logging( :fatal )
+		@initial_registry = Strelka::App.loaded_plugins.dup
 		@request_factory = Mongrel2::RequestFactory.new( route: '/mail' )
 		Mongrel2::Config.db = Mongrel2::Config.in_memory_db
 		Mongrel2::Config.init_database
@@ -39,6 +40,7 @@ describe Strelka::App do
 	end
 
 	before( :each ) do
+		Strelka::App.loaded_plugins.clear
 		@app = Class.new( Strelka::App ) do
 			def initialize( appid=TEST_APPID, sspec=TEST_SEND_SPEC, rspec=TEST_RECV_SPEC )
 				super
@@ -55,6 +57,7 @@ describe Strelka::App do
 	end
 
 	after( :all ) do
+		Strelka::App.loaded_plugins = @initial_registry
 		reset_logging()
 	end
 
@@ -174,7 +177,8 @@ describe Strelka::App do
 
 		# make a plugin that always 304s and install it
 		not_modified_plugin = Module.new do
-			extend Strelka::App::Plugin
+			def self::name; "Strelka::App::NotModified"; end
+			extend Strelka::Plugin
 			def handle_request( r )
 				finish_with( HTTP::NOT_MODIFIED, "Unchanged." )
 				fail "Shouldn't be reached."
@@ -193,7 +197,8 @@ describe Strelka::App do
 	it "creates a simple response body for status responses that can have them" do
 		# make an auth plugin that always denies requests
 		forbidden_plugin = Module.new do
-			extend Strelka::App::Plugin
+			def self::name; "Strelka::App::Forbidden"; end
+			extend Strelka::Plugin
 			def handle_request( r )
 				finish_with( HTTP::FORBIDDEN, "You aren't allowed to look at that." )
 				fail "Shouldn't be reached."
@@ -213,7 +218,8 @@ describe Strelka::App do
 	it "uses the specified content type for error responses" do
 		# make an auth plugin that always denies requests
 		forbidden_plugin = Module.new do
-			extend Strelka::App::Plugin
+			def self::name; "Strelka::App::Forbidden"; end
+			extend Strelka::Plugin
 			def handle_request( r )
 				finish_with( HTTP::FORBIDDEN, "You aren't allowed to look at that.",
 					:content_type => 'text/html' )
@@ -350,7 +356,8 @@ describe Strelka::App do
 		it "provides a plugin hook for plugins to manipulate the request before handling it" do
 			# make a fixup plugin that adds a custom x- header to the request
 			header_fixup_plugin = Module.new do
-				extend Strelka::App::Plugin
+				def self::name; "Strelka::App::HeaderFixup"; end
+				extend Strelka::Plugin
 				def fixup_request( r )
 					r.headers[:x_funted_by] = 'Cragnux/1.1.3'
 					super
@@ -375,7 +382,8 @@ describe Strelka::App do
 		it "provides a plugin hook for plugins to manipulate the response before it's returned to Mongrel2" do
 			# make a fixup plugin that adds a custom x- header to the response
 			header_fixup_plugin = Module.new do
-				extend Strelka::App::Plugin
+				def self::name; "Strelka::App::HeaderFixup"; end
+				extend Strelka::Plugin
 				def fixup_response( res )
 					res.headers.x_funted_by = 'Cragnux/1.1.3'
 					super