strelka 0.0.1.pre177 → 0.0.1.pre184

data/ChangeLog

@@ -1,22 +1,100 @@
-2012-04-06  Mahlon E. Smith  <mahlon@martini.nu>
+2012-04-11  Michael Granger  <ged@FaerieMUD.org>
 
-	* lib/strelka/app/sessions.rb, lib/strelka/cookie.rb,
-	lib/strelka/cookieset.rb, lib/strelka/session.rb,
-	lib/strelka/session/db.rb, lib/strelka/session/default.rb,
-	spec/strelka/cookie_spec.rb, spec/strelka/session/db_spec.rb,
-	spec/strelka/session/default_spec.rb:
-	Expose cookie options to the default and db session stores.
-	[49e538cdee68] [tip]
+	* Rakefile, lib/strelka/app.rb, lib/strelka/app/auth.rb,
+	lib/strelka/app/errors.rb, lib/strelka/app/filters.rb,
+	lib/strelka/app/negotiation.rb, lib/strelka/app/parameters.rb,
+	lib/strelka/app/plugins.rb, lib/strelka/app/restresources.rb,
+	lib/strelka/app/routing.rb, lib/strelka/app/sessions.rb,
+	spec/strelka/app/auth_spec.rb, spec/strelka/app/errors_spec.rb,
+	spec/strelka/app/filters_spec.rb, spec/strelka/app/plugins_spec.rb,
+	spec/strelka/app/restresources_spec.rb,
+	spec/strelka/app/routing_spec.rb:
+	Fixing specs broken by the deferred plugins change. Ugh, I suck.
+	[d762ebcce3a6] [tip]
 
-	* Manifest.txt, lib/strelka/app/sessions.rb, lib/strelka/session.rb,
-	lib/strelka/session/db.rb, lib/strelka/session/default.rb,
-	spec/strelka/session/db_spec.rb,
-	spec/strelka/session/default_spec.rb:
-	Add a persistent DB session store, using sequel.
-	[99f3c3f5d6ca]
+	* Merging with ssh://hg@deveiate.org/Strelka@8f1c27819e70
+	[5fcd76455aad]
+
+	* Manifest.txt:
+	Updating the manifest
+	[35165b3d01cc]
+
+2012-04-11  Mahlon E. Smith  <mahlon@martini.nu>
+
+	* lib/strelka/session/default.rb:
+	Use the built-in securerandom method for obtaining a hex value.
+	[8f1c27819e70]
+
+2012-04-10  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/strelka/app/auth.rb, lib/strelka/app/parameters.rb,
+	lib/strelka/app/restresources.rb, lib/strelka/app/routing.rb,
+	lib/strelka/paramvalidator.rb, spec/strelka/app/auth_spec.rb,
+	spec/strelka/app/parameters_spec.rb,
+	spec/strelka/app/routing_spec.rb,
+	spec/strelka/paramvalidator_spec.rb:
+	Rework the paramvalidator and parameters plugin to allow per-request
+	overrides
+	[e7393474988b]
+
+	* bin/leash, examples/apps/auth-demo, examples/apps/auth-demo2,
+	examples/apps/sessions-demo, examples/auth-demo.rb, examples/auth-
+	demo2.rb, examples/auth-form.tmpl, examples/auth-success.tmpl,
+	examples/config.yml, examples/examples.css, examples/examples.html,
+	examples/layout.tmpl, examples/sessions-demo.rb,
+	examples/static/examples.css, examples/static/examples.html,
+	examples/templates/auth-form.tmpl, examples/templates/auth-
+	success.tmpl, examples/templates/layout.tmpl, lib/strelka/app.rb,
+	lib/strelka/app/auth.rb, lib/strelka/app/plugins.rb,
+	lib/strelka/constants.rb, spec/strelka/app/plugins_spec.rb:
+	Modify the plugins mixin to defer adding the mixin part of plugins
+	as long as possible.
+
+	This allows someone to call plugin/plugins multiple times without
+	having to worry about what order they're called in, and makes using
+	a common Strelka::App subclass for a suite of applications easier.
+	[546809f3204f]
+
+2012-04-09  Mahlon E. Smith  <mahlon@martini.nu>
+
+	* lib/strelka/app/templating.rb:
+	Ensure the templating plugin runs before the errors plugin, so
+	symbols are properly converted to Strelka::HTTPResponse objects
+	before errors see them.
+	[9423c8ba3ee0]
 
 2012-04-06  Michael Granger  <ged@FaerieMUD.org>
 
+	* lib/strelka/session/db.rb:
+	Change the DB session class to default to Mongrel2's in-memory DB.
+
+	Use Mongrel2's in-memory config db for unconfigured db sessions
+	instead of depending on the sqlite3 gem.
+	[2a1129fed218]
+
+	* Manifest.txt:
+	Update the manifest
+	[54d6bde6cb0c]
+
+	* Merged with 49e538cdee68
+	[05d72a2ed8cc]
+
+	* lib/strelka.rb:
+	Set some RDoc metadata from the main module
+	[28465ed81190]
+
+	* lib/strelka/logging.rb:
+	Remove ERB dependency from the HTML logger
+	[6e6a14f86dc6]
+
+	* spec/lib/helpers.rb:
+	Update the setup_config_db helper for Mongrel2-0.20.x
+	[9f5393deb2da]
+
+	* .hgignore:
+	Add the ChangeLog to the ignorefile
+	[cc8c30d38652]
+
 	* lib/strelka/app/templating.rb:
 	Add API docs to the :templating plugin module
 	[3c160d996320]
@@ -33,11 +111,28 @@
 	Update dependencies
 	[787e523777d1]
 
+2012-04-06  Mahlon E. Smith  <mahlon@martini.nu>
+
+	* lib/strelka/app/sessions.rb, lib/strelka/cookie.rb,
+	lib/strelka/cookieset.rb, lib/strelka/session.rb,
+	lib/strelka/session/db.rb, lib/strelka/session/default.rb,
+	spec/strelka/cookie_spec.rb, spec/strelka/session/db_spec.rb,
+	spec/strelka/session/default_spec.rb:
+	Expose cookie options to the default and db session stores.
+	[49e538cdee68]
+
+	* Manifest.txt, lib/strelka/app/sessions.rb, lib/strelka/session.rb,
+	lib/strelka/session/db.rb, lib/strelka/session/default.rb,
+	spec/strelka/session/db_spec.rb,
+	spec/strelka/session/default_spec.rb:
+	Add a persistent DB session store, using sequel.
+	[99f3c3f5d6ca]
+
 2012-04-04  Michael Granger  <ged@FaerieMUD.org>
 
 	* manual/src/tutorial.page:
 	Add a bit more content to the manual.
-	[79a26c9e4dd5] [github/master]
+	[79a26c9e4dd5]
 
 2012-04-02  Michael Granger  <ged@FaerieMUD.org>
 
@@ -88,7 +183,7 @@
 	* examples/auth-demo.rb, lib/strelka/app/auth.rb,
 	lib/strelka/authprovider.rb, spec/strelka/app/auth_spec.rb:
 	Merging with accidentally-committed auth patch on Github
-	[3025b5711352]
+	[3025b5711352] [github/master]
 
 2012-03-20  Michael Granger  <ged@FaerieMUD.org>
 

data/Manifest.txt

@@ -16,16 +16,16 @@ contrib/hoetemplate/data/project/templates/top.tmpl.erb
 contrib/hoetemplate/lib/file_name.rb.erb
 contrib/hoetemplate/spec/file_name_spec.rb.erb
 data/strelka/apps/hello-world
-examples/auth-demo.rb
-examples/auth-demo2.rb
-examples/auth-form.tmpl
-examples/auth-success.tmpl
+examples/apps/auth-demo
+examples/apps/auth-demo2
+examples/apps/sessions-demo
 examples/config.yml
-examples/examples.css
-examples/examples.html
 examples/gen-config.rb
-examples/layout.tmpl
-examples/sessions-demo.rb
+examples/static/examples.css
+examples/static/examples.html
+examples/templates/auth-form.tmpl
+examples/templates/auth-success.tmpl
+examples/templates/layout.tmpl
 lib/strelka.rb
 lib/strelka/app.rb
 lib/strelka/app/auth.rb

data/Rakefile

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

data/bin/leash

@@ -103,7 +103,7 @@ class Strelka::LeashCommand
 				text ''
 
 				text 'Global Options'
-				opt :config, "Specify the config file to load."
+				opt :config, "Specify the config file to load.", :type => :string
 				text ''
 
 				text 'Other Options:'
@@ -163,7 +163,7 @@ class Strelka::LeashCommand
 	### Create a new instance of the command and set it up with the given
 	### +options+.
 	def initialize( options )
-		Strelka.logger.formatter = Strelka::Logging::ColorFormatter.new( Strelka.logger )
+		Strelka.logger.formatter = Strelka::Logging::ColorFormatter.new( Strelka.logger ) if $stderr.tty?
 		@options = options
 
 		if @options.debug
@@ -196,8 +196,8 @@ class Strelka::LeashCommand
 
 		begin
 			cmd_method = self.method( "#{command}_command" )
-		rescue NoMethodError => err
-			error "No such command"
+		rescue NameError => err
+			error "No such command %p" % [ command ]
 			exit :usage
 		end
 
@@ -264,8 +264,19 @@ class Strelka::LeashCommand
 
 	### The 'start' command
 	def start_command( *args )
+		path, appname, gemname = self.find_specified_app( *args )
+
+		header "Starting the %s app from the %s gem" % [ appname, gemname ]
+		fork do
+			self.log.debug "  in the child."
+			Strelka.load_config( self.options.config ) if self.options.config
+			Kernel.load( path )
+		end
+
+		message "started. Waiting for shutdown."
+		Process.wait
 	end
-	help :start, "Start the web adminstration app"
+	help :start, "Start a Strelka app"
 
 
 	### The 'version' command
@@ -276,36 +287,48 @@ class Strelka::LeashCommand
 
 
 	#
-	# Command functions
+	# Helper methods
 	#
 
-	### Install a bootstrap config database for the admin server.
-	def setup_bootstrap_config
-		Mongrel2::Config.init_database
-
-		if Mongrel2::Config::Server.by_uuid( ADMINSERVER_ID ).first
-			message "Admin server is already configured"
-			if !self.prompt.agree( "Replace the existing config? ", true )
-				message "Okay, keeping the existing config."
-				return
+	### Find the app specified in the specified +args+ and return the Pathname to it and the
+	### name of the gem it belongs to. Raises a RuntimeError if the +args+ didn't contain a
+	### valid application specification.
+	def find_specified_app( *args )
+		appname = args.pop
+		gemname = args.pop
+		discovered_apps = Strelka::App.discover_paths
+
+		path = nil
+		if gemname
+			discovered_apps[ gemname ].each do |apppath|
+				self.log.debug "    %s (%s)" % [ apppath, apppath.basename('.rb') ]
+				if apppath.basename('.rb').to_s == appname
+					path = apppath
+					break
+				end
+			end
+		else
+			self.log.debug "No gem name; searching them all:"
+			discovered_apps.each do |disc_gemname, paths|
+				self.log.debug "  %s: %d paths" % [ disc_gemname, paths.length ]
+				path = paths.find do |apppath|
+					self.log.debug "    %s (%s)" % [ apppath, apppath.basename('.rb') ]
+					self.log.debug "    %p vs. %p" % [ apppath.basename('.rb').to_s, appname ]
+					apppath.basename('.rb').to_s == appname
+				end or next
+				gemname = disc_gemname
+				break
 			end
 		end
 
-		configfile = DATADIR + 'bootstrap-config.rb'
-		runspace = Module.new do
-			extend Mongrel2::Config::DSL, FileUtils::Verbose
+		unless path
+			msg = "Couldn't find an app named '#{appname}'"
+			msg << " in the #{gemname} gem" if gemname
+			raise( msg )
 		end
+		self.log.debug "  found: %s" % [ path ]
 
-		header "Installing admin server config from #{configfile}"
-		source = configfile.read
-		runspace.module_eval( source, configfile.to_s, 1 )
-	end
-
-
-	### Set up the mongrel2 chroot directory for Strelka's adminserver by copying static 
-	### files, and creating the necessary directories. This depends on the configuration
-	### being installed.
-	def setup_runtime_directory
+		return path, appname, gemname
 	end
 
 

data/examples/{auth-demo.rb → apps/auth-demo}

@@ -9,9 +9,11 @@ class AuthDemo < Strelka::App
 	# The Mongrel2 appid of this app
 	ID = 'auth-demo'
 
-	plugins :routing, :auth
+	plugin :auth
 	auth_provider :basic
 
+	plugin :routing
+
 	### Handle any (authenticated) HTTP request
 	get do |req|
 		res = req.response
@@ -27,6 +29,4 @@ class AuthDemo < Strelka::App
 
 end # class AuthDemo
 
-
-Strelka.load_config( 'examples/config.yml' )
 AuthDemo.run

data/examples/config.yml

@@ -1,5 +1,5 @@
 mongrel2:
-  configdb: examples/mongrel2.sqlite
+  configdb: amalgalite://examples/mongrel2.sqlite
 
 auth:
   realm: Examples
@@ -13,3 +13,7 @@ sessions:
   options:
     cookie-name: "session-demo"
 
+templates:
+  template_paths:
+    - examples/templates
+

data/lib/strelka/app/auth.rb

@@ -31,7 +31,7 @@ require 'strelka/authprovider'
 #
 # == Applying Authentication
 #
-# The default authentication policy is to require authentification from every
+# The default authentication policy is to require authentication from every
 # request, but sometimes you may wish to narrow the restrictions a bit.
 #
 # === Relaxing \Auth for A Few Methods
@@ -51,7 +51,8 @@ require 'strelka/authprovider'
 # A String or a Regexp argument will be used to match against the request's
 # {#app_path}[rdoc-ref:Strelka::HTTPRequest#app_path] (the path of the request
 # URI with the Mongrel2 route omitted), and any requests which match are sent
-# along as-is.
+# along as-is. A String will match the path exactly, with any leading or trailing
+# '/' characters removed, and a Regexp will be tested against the \#app_path as-is.
 #
 # If you require some more-complex criteria for determining if the request should
 # skip the auth plugin, you can provide a block to +no_auth_for+ instead.
@@ -325,10 +326,12 @@ module Strelka::App::Auth
 					"defining both positive and negative auth criteria is unsupported."
 			end
 
-			criteria << '' if criteria.empty?
+			criteria << nil if criteria.empty?
 			block ||= Proc.new { true }
 
 			criteria.each do |pattern|
+				pattern.gsub!( %r{^/+|/+$}, '' ) if pattern.respond_to?( :gsub! )
+				Strelka.log.debug "  adding require_auth for %p" % [ pattern ]
 				self.positive_auth_criteria[ pattern ] = block
 			end
 		end
@@ -342,10 +345,12 @@ module Strelka::App::Auth
 					"defining both positive and negative auth criteria is unsupported."
 			end
 
-			criteria << '' if criteria.empty?
+			criteria << nil if criteria.empty?
 			block ||= Proc.new { true }
 
 			criteria.each do |pattern|
+				pattern.gsub!( %r{^/+|/+$}, '' ) if pattern.respond_to?( :gsub! )
+				Strelka.log.debug "  adding no_auth for %p" % [ pattern ]
 				self.negative_auth_criteria[ pattern ] = block
 			end
 		end
@@ -382,7 +387,7 @@ module Strelka::App::Auth
 	### Check authentication and authorization for requests that need it before
 	### sending them on.
 	def handle_request( request, &block )
-		self.log.debug "AuthProvider: %p" % [ self.auth_provider ]
+		self.log.debug "[:auth] Wrapping request in auth with a %p" % [ self.auth_provider ]
 
 		self.authenticate_and_authorize( request ) if self.request_should_auth?( request )
 
@@ -396,7 +401,7 @@ module Strelka::App::Auth
 
 	### Returns +true+ if the given +request+ requires authentication.
 	def request_should_auth?( request )
-		self.log.debug "Checking to see if Auth(entication/orization) should be applied for %s" %
+		self.log.debug "Checking to see if Auth(entication/orization) should be applied for app_path: %p" %
 			[ request.app_path ]
 
 		# If there are positive criteria, return true if the request matches any of them,
@@ -430,6 +435,10 @@ module Strelka::App::Auth
 	### at least one of them.
 	def request_matches_criteria( request, pattern )
 		case pattern
+		when nil
+			self.log.debug "  no pattern; calling the block"
+			return yield( request )
+
 		when Regexp
 			self.log.debug "  matching app_path with regexp: %p" % [ pattern ]
 			matchdata = pattern.match( request.app_path ) or return false
@@ -437,8 +446,8 @@ module Strelka::App::Auth
 			return yield( request, matchdata )
 
 		when String
-			self.log.debug "  matching app_path prefix: %p" % [ pattern ]
-			request.app_path.start_with?( pattern ) or return false
+			self.log.debug "  matching app_path: %p" % [ pattern ]
+			request.app_path.gsub( %r{^/+|/+$}, '' ) == pattern or return false
 			self.log.debug "  calling the block"
 			return yield( request )
 
@@ -475,6 +484,7 @@ module Strelka::App::Auth
 		provider.authorize( credentials, request, &callback )
 	end
 
+
 end # module Strelka::App::Auth
 
 

data/lib/strelka/app/errors.rb

@@ -113,6 +113,7 @@ module Strelka::App::Errors
 
 	### Check for a status response that is hooked, and run the hook if one is found.
 	def handle_request( request )
+		self.log.debug "[:errors] Wrapping request in custom error-handling."
 		response = nil
 
 		# Catch a finish_with; the status_response will only be non-nil
@@ -126,7 +127,7 @@ module Strelka::App::Errors
 		if status_response
 			response = request.response
 			status = status_response[:status]
-			self.log.info "Handling a status response: %d" % [ 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
@@ -145,7 +146,7 @@ module Strelka::App::Errors
 
 	### Find a status handler for the given +status_code+ and return it as an UnboundMethod.
 	def status_handler_for( status_code )
-		self.log.debug "Looking for a status handler for %d responses" % [ status_code ]
+		self.log.debug "[:errors] Looking for a status handler for %d responses" % [ status_code ]
 		handlers = self.class.status_handlers
 		ranges = handlers.keys
 

data/lib/strelka/app/filters.rb

@@ -51,6 +51,8 @@ module Strelka::App::Filters
 	### Apply filters to the given +request+ before yielding back to the App, then apply
 	### filters to the response that comes back.
 	def handle_request( request )
+		self.log.debug "[:filters] Wrapping request with request/response filters."
+
 		self.apply_request_filters( request )
 		response = super
 		self.apply_response_filters( response )

data/lib/strelka/app/negotiation.rb

@@ -83,6 +83,8 @@ module Strelka::App::Negotiation
 
 	### Start content-negotiation when the response has returned.
 	def handle_request( request )
+		self.log.debug "[:negotiation] Wrapping response with HTTP content negotiation."
+
 		response = super
 		response.negotiate