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

data/ChangeLog

@@ -1,3 +1,75 @@
+2012-04-18  Michael Granger  <ged@FaerieMUD.org>
+
+	* examples/apps/ws-echo, experiments/reflective-module.rb,
+	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,
+	lib/strelka/app/templating.rb, lib/strelka/behavior/plugin.rb,
+	lib/strelka/plugins.rb, spec/strelka/app/auth_spec.rb,
+	spec/strelka/app/errors_spec.rb, spec/strelka/app/filters_spec.rb,
+	spec/strelka/app/negotiation_spec.rb,
+	spec/strelka/app/parameters_spec.rb,
+	spec/strelka/app/plugins_spec.rb,
+	spec/strelka/app/restresources_spec.rb,
+	spec/strelka/app/routing_spec.rb, spec/strelka/app/sessions_spec.rb,
+	spec/strelka/app/templating_spec.rb, spec/strelka/app_spec.rb,
+	spec/strelka/plugins_spec.rb:
+	Generalize the plugin system.
+
+	This change pulls the plugin system out of App and makes it a
+	generic system that can extend any class with a plugin system. This
+	was done in anticipation of a new WebSocket server class, which will
+	also have App-style plugins, but with a different API, and loaded
+	from a different place in the filesystem.
+
+	This change requires code changes to plugins and the classes that
+	are extended by them:
+
+	* Strelka::App::Plugin is now Strelka::Plugin
+	* Strelka::App::Plugins is now Strelka::PluginLoader
+	[ea4c4358a943] [tip]
+
+2012-04-16  Mahlon E. Smith  <mahlon@martini.nu>
+
+	* lib/strelka/app/sessions.rb, lib/strelka/httprequest/session.rb,
+	lib/strelka/httpresponse/session.rb, lib/strelka/session.rb,
+	lib/strelka/session/db.rb, lib/strelka/session/default.rb,
+	manual/src/starting.page, spec/lib/helpers.rb,
+	spec/strelka/app/sessions_spec.rb,
+	spec/strelka/httprequest/session_spec.rb,
+	spec/strelka/httpresponse/session_spec.rb,
+	spec/strelka/session/db_spec.rb,
+	spec/strelka/session/default_spec.rb:
+	Make Request#session? ask the session store if a session exists.
+	[a351bc3b9528]
+
+	* lib/strelka/httprequest.rb, spec/strelka/httprequest_spec.rb,
+	spec/strelka/router/default_spec.rb:
+	Explicitly handle nil content-types during form data parsing.
+	[59b791e4bfbe]
+
+	* lib/strelka/app.rb, lib/strelka/authprovider.rb,
+	lib/strelka/mixins.rb, lib/strelka/router/default.rb,
+	spec/strelka/router/default_spec.rb,
+	spec/strelka/router/exclusive_spec.rb:
+	Return an HTTP::METHOD_NOT_ALLOWED if the request route is valid,
+	but the method is not.
+	[5d62cb4be772]
+
+2012-04-11  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/strelka/app/routing.rb, lib/strelka/app/templating.rb,
+	spec/strelka/app/routing_spec.rb:
+	Add Router#routerclass to subclasses. nil guard for
+	layout_templates.
+	[279f2399ad4a] [github/master]
+
+	* Rakefile:
+	Remove outdated Rakefile cruft.
+	[02441af05e37]
+
 2012-04-11  Mahlon E. Smith  <mahlon@martini.nu>
 
 	* lib/strelka/app/auth.rb, lib/strelka/app/errors.rb,
@@ -16,7 +88,7 @@
 	Currently, this is done manually by defining an inherited hook in
 	each plugin's ClassMethods, but we'll likely try to find some way to
 	automate it or at least refacter it into a declarative or two.
-	[4217deb1952c] [tip]
+	[4217deb1952c]
 
 2012-04-11  Michael Granger  <ged@FaerieMUD.org>
 
@@ -40,18 +112,16 @@
 	* 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-11  Michael Granger  <ged@FaerieMUD.org>
-
-	* Manifest.txt:
-	Updating the manifest
-	[35165b3d01cc]
-
 2012-04-10  Michael Granger  <ged@FaerieMUD.org>
 
 	* lib/strelka/app/auth.rb, lib/strelka/app/parameters.rb,
@@ -62,7 +132,7 @@
 	spec/strelka/paramvalidator_spec.rb:
 	Rework the paramvalidator and parameters plugin to allow per-request
 	overrides
-	[e7393474988b] [github/master]
+	[e7393474988b]
 
 	* bin/leash, examples/apps/auth-demo, examples/apps/auth-demo2,
 	examples/apps/sessions-demo, examples/auth-demo.rb, examples/auth-
@@ -122,6 +192,22 @@
 	Add the ChangeLog to the ignorefile
 	[cc8c30d38652]
 
+	* lib/strelka/app/templating.rb:
+	Add API docs to the :templating plugin module
+	[3c160d996320]
+
+	* README.rdoc:
+	Add more URLs
+	[060962556bd1]
+
+	* Rakefile:
+	Oops. Fix typo
+	[5a8aa207860b]
+
+	* .rvm.gems, Rakefile:
+	Update dependencies
+	[787e523777d1]
+
 2012-04-06  Mahlon E. Smith  <mahlon@martini.nu>
 
 	* lib/strelka/app/sessions.rb, lib/strelka/cookie.rb,
@@ -139,24 +225,6 @@
 	Add a persistent DB session store, using sequel.
 	[99f3c3f5d6ca]
 
-2012-04-06  Michael Granger  <ged@FaerieMUD.org>
-
-	* lib/strelka/app/templating.rb:
-	Add API docs to the :templating plugin module
-	[3c160d996320]
-
-	* README.rdoc:
-	Add more URLs
-	[060962556bd1]
-
-	* Rakefile:
-	Oops. Fix typo
-	[5a8aa207860b]
-
-	* .rvm.gems, Rakefile:
-	Update dependencies
-	[787e523777d1]
-
 2012-04-04  Michael Granger  <ged@FaerieMUD.org>
 
 	* manual/src/tutorial.page:

data/Manifest.txt

@@ -19,6 +19,7 @@ data/strelka/apps/hello-world
 examples/apps/auth-demo
 examples/apps/auth-demo2
 examples/apps/sessions-demo
+examples/apps/ws-echo
 examples/config.yml
 examples/gen-config.rb
 examples/static/examples.css
@@ -33,7 +34,6 @@ 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
@@ -57,6 +57,7 @@ lib/strelka/httpresponse/session.rb
 lib/strelka/logging.rb
 lib/strelka/mixins.rb
 lib/strelka/paramvalidator.rb
+lib/strelka/plugins.rb
 lib/strelka/router.rb
 lib/strelka/router/default.rb
 lib/strelka/router/exclusive.rb
@@ -73,7 +74,6 @@ spec/strelka/app/errors_spec.rb
 spec/strelka/app/filters_spec.rb
 spec/strelka/app/negotiation_spec.rb
 spec/strelka/app/parameters_spec.rb
-spec/strelka/app/plugins_spec.rb
 spec/strelka/app/restresources_spec.rb
 spec/strelka/app/routing_spec.rb
 spec/strelka/app/sessions_spec.rb
@@ -91,10 +91,12 @@ spec/strelka/httprequest/negotiation_spec.rb
 spec/strelka/httprequest/session_spec.rb
 spec/strelka/httprequest_spec.rb
 spec/strelka/httpresponse/negotiation_spec.rb
+spec/strelka/httpresponse/session_spec.rb
 spec/strelka/httpresponse_spec.rb
 spec/strelka/logging_spec.rb
 spec/strelka/mixins_spec.rb
 spec/strelka/paramvalidator_spec.rb
+spec/strelka/plugins_spec.rb
 spec/strelka/router/default_spec.rb
 spec/strelka/router/exclusive_spec.rb
 spec/strelka/router_spec.rb

data/examples/apps/ws-echo

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# vim: set nosta noet ts=4 sw=4:
+#encoding: utf-8
+
+require 'strelka'
+
+# A demo of the WebSocketServer -- this does the same thing as the Mongrel2
+# echo server, but uses the Strelka WebSocket class.
+class WebSocketEchoServer < Strelka::WebSocketServer
+
+	# Use the heartbeat plugin
+	plugins :heartbeat
+
+
+	
+
+end

data/lib/strelka/app.rb

@@ -7,17 +7,16 @@ require 'rubygems' # For the Rubygems API
 require 'mongrel2/handler'
 require 'strelka' unless defined?( Strelka )
 require 'strelka/mixins'
+require 'strelka/plugins'
 
 
 # The application base class.
 class Strelka::App < Mongrel2::Handler
-	extend Strelka::MethodUtilities
+	extend Strelka::MethodUtilities,
+	       Strelka::PluginLoader
 	include Strelka::Loggable,
-	        Strelka::Constants
-
-	# Load the plugin system
-	require 'strelka/app/plugins'
-	include Strelka::App::Plugins
+	        Strelka::Constants,
+	        Strelka::ResponseHelpers
 
 
 	# Glob for matching Strelka apps relative to a gem's data directory
@@ -238,22 +237,35 @@ class Strelka::App < Mongrel2::Handler
 	### wish to modify or replace the request before the request cycle is
 	### started.
 	def fixup_request( request )
-		self.log.debug "Fixing up request: %p" % [ request ]
-		request = super
-		self.log.debug "  after fixup: %p" % [ request ]
-
 		return request
 	end
 
 
 	### Handle the request and return a +response+. This is the main extension-point
 	### for the plugin system. Without being overridden or extended by plugins, this
-	### method just returns the default Mongrel2::HTTPRequest#response.
+	### method just returns the default Mongrel2::HTTPRequest#response. If you override
+	### this directly in your App subclass, you'll need to +super+ with a block if you
+	### wish the plugins to run on the request, then do whatever it is you want in the
+	### block and return the response, which the plugins will again have an opportunity
+	### to modify.
+	###
+	### Example:
+	###
+	###     class MyApp < Strelka::App
+	###         def handle_request( request )
+	###             super do |req|
+	###                 res = req.response
+	###                 res.content_type = 'text/plain'
+	###                 res.puts "Hello!"
+	###                 return res
+	###             end
+	###         end
+	###     end
 	def handle_request( request, &block )
 		if block
-			return super( request, &block )
+			return block.call( request )
 		else
-			return super( request ) {|r| r.response }
+			return request.response
 		end
 	end
 
@@ -269,7 +281,7 @@ class Strelka::App < Mongrel2::Handler
 			response.request && response.request.verb == :HEAD
 		self.log.debug "  after fixup: %p" % [ response ]
 
-		return super
+		return response
 	end
 
 
@@ -309,16 +321,6 @@ class Strelka::App < Mongrel2::Handler
 	end
 
 
-	### Abort the current execution and return a response with the specified
-	### http_status code immediately. The specified +message+ will be logged,
-	### and will be included in any message that is returned as part of the
-	### response. The +headers+ hash will be used to set response headers.
-	def finish_with( http_status, message, headers={} )
-		status_info = { :status => http_status, :message => message, :headers => headers }
-		throw :finish, status_info
-	end
-
-
 	### Create a response to specified +request+ based on the specified +status_code+
 	### and +message+.
 	### :TODO: Document and test the :content_type status_info field.

data/lib/strelka/app/auth.rb

@@ -4,6 +4,7 @@
 
 require 'strelka' unless defined?( Strelka )
 require 'strelka/app' unless defined?( Strelka::App )
+require 'strelka/plugins'
 
 require 'strelka/httprequest/auth'
 require 'strelka/authprovider'
@@ -235,7 +236,7 @@ require 'strelka/authprovider'
 #    end
 #
 module Strelka::App::Auth
-	extend Strelka::App::Plugin,
+	extend Strelka::Plugin,
 	       Strelka::MethodUtilities,
 	       Configurability
 	include Strelka::Loggable,

data/lib/strelka/app/errors.rb

@@ -36,7 +36,7 @@ require 'strelka/app' unless defined?( Strelka::App )
 #
 # See the documentation for ClassMethods.on_status for more details.
 module Strelka::App::Errors
-	extend Strelka::App::Plugin
+	extend Strelka::Plugin
 
 	DEFAULT_HANDLER_STATUS_RANGE = 400..599
 

data/lib/strelka/app/filters.rb

@@ -8,7 +8,7 @@ require 'strelka/app' unless defined?( Strelka::App )
 
 # Request/response filters plugin for Strelka::App.
 module Strelka::App::Filters
-	extend Strelka::App::Plugin
+	extend Strelka::Plugin
 
 	run_before :routing, :templating
 

data/lib/strelka/app/negotiation.rb

@@ -40,7 +40,7 @@ require 'strelka/httpresponse/negotiation'
 #
 module Strelka::App::Negotiation
 	include Strelka::Constants
-	extend Strelka::App::Plugin
+	extend Strelka::Plugin
 
 	run_before :routing
 	run_after  :filters, :templating, :parameters

data/lib/strelka/app/parameters.rb

@@ -4,7 +4,7 @@
 
 require 'strelka' unless defined?( Strelka )
 require 'strelka/app' unless defined?( Strelka::App )
-require 'strelka/app/plugins'
+require 'strelka/plugins'
 require 'strelka/paramvalidator'
 
 
@@ -36,7 +36,7 @@ require 'strelka/paramvalidator'
 #   end # class UserManager
 #
 module Strelka::App::Parameters
-	extend Strelka::App::Plugin
+	extend Strelka::Plugin
 
 	run_before :routing
 	run_after :filters

data/lib/strelka/app/restresources.rb

@@ -51,7 +51,7 @@ require 'strelka/app' unless defined?( Strelka::App )
 #   isn't clearly specified in the RFC (DELETE /resource)
 # * Sequel plugin for adding links to serialized representations
 module Strelka::App::RestResources
-	extend Strelka::App::Plugin
+	extend Strelka::Plugin
 
 	# Resource route option defaults
 	DEFAULTS = {

data/lib/strelka/app/routing.rb

@@ -7,7 +7,7 @@ require 'strelka/app' unless defined?( Strelka::App )
 
 require 'strelka/router'
 require 'strelka/exceptions'
-require 'strelka/app/plugins'
+require 'strelka/plugins'
 
 # Sinatra-ish routing logic for Strelka::Apps
 #
@@ -80,7 +80,7 @@ require 'strelka/app/plugins'
 # routing strategies.
 #
 module Strelka::App::Routing
-	extend Strelka::App::Plugin
+	extend Strelka::Plugin
 	include Strelka::Loggable,
 	        Strelka::Constants
 
@@ -232,6 +232,7 @@ module Strelka::App::Routing
 		### Inheritance hook -- inheriting classes inherit their parents' routes table.
 		def inherited( subclass )
 			super
+			subclass.instance_variable_set( :@routerclass, self.routerclass )
 			subclass.instance_variable_set( :@routes, self.routes.dup )
 		end
 

data/lib/strelka/app/sessions.rb

@@ -5,7 +5,7 @@ require 'strelka/app' unless defined?( Strelka::App )
 
 require 'strelka/mixins'
 require 'strelka/exceptions'
-require 'strelka/app/plugins'
+require 'strelka/plugins'
 
 require 'strelka/httprequest/session'
 require 'strelka/httpresponse/session'
@@ -78,7 +78,7 @@ require 'strelka/httpresponse/session'
 # is passed to the session class's ::configure method (if it has one).
 #
 module Strelka::App::Sessions
-	extend Strelka::App::Plugin,
+	extend Strelka::Plugin,
 	       Strelka::MethodUtilities,
 	       Configurability
 	include Strelka::Loggable,
@@ -134,7 +134,7 @@ module Strelka::App::Sessions
 
 	### Configurability API -- set up session type and options with values from
 	### the +config+.
-	def self::configure( config )
+	def self::configure( config=nil )
 		options = DEFAULT_OPTIONS.dup
 
 		# Figure out which session class is going to be used, or choose a default one