strelka 0.0.1.pre.244 → 0.0.1.pre.252

data/ChangeLog

@@ -1,8 +1,62 @@
+2012-05-31  Michael Granger  <ged@FaerieMUD.org>
+
+	* .tm_properties, lib/strelka/app/auth.rb,
+	lib/strelka/authprovider/basic.rb,
+	lib/strelka/authprovider/hostaccess.rb,
+	spec/strelka/app/auth_spec.rb,
+	spec/strelka/authprovider/basic_spec.rb:
+	Rewriting auth plugin to work app-agnostically
+	[f569df3baa60] [tip]
+
+	* lib/strelka/app/sessions.rb, lib/strelka/cookie.rb,
+	lib/strelka/session/db.rb, lib/strelka/session/default.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:
+	Made session configuration consistent
+	[0b493098c008]
+
+2012-05-30  Michael Granger  <ged@FaerieMUD.org>
+
+	* data/strelka/apps/hello-world, examples/.env, examples/Procfile,
+	examples/apps/auth-demo, examples/apps/auth-demo2, examples/apps
+	/hello-world, examples/apps/sessions-demo, examples/apps/ws-echo,
+	examples/config.yml, examples/gen-config.rb, examples/templates
+	/auth-form.tmpl, examples/templates/auth-success.tmpl:
+	Consolidated examples into a more-cohesive environment
+	[a594decb869b]
+
+	* bin/strelka, lib/strelka.rb, lib/strelka/app.rb,
+	lib/strelka/constants.rb, lib/strelka/logging.rb,
+	spec/strelka/app_spec.rb, spec/strelka/logging_spec.rb:
+	Modify local discovery to be configurable
+	[c3b2a812c363]
+
+2012-05-29  Michael Granger  <ged@FaerieMUD.org>
+
+	* .rvm.gems:
+	Update the inversion depenedency in RVM gemset, too
+	[6d2b72cb478f]
+
+2012-05-30  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/strelka/httpresponse/negotiation.rb:
+	Dup the negotiated content type in case it's frozen.
+	[dcc8fd6d6c76]
+
 2012-05-21  Michael Granger  <ged@FaerieMUD.org>
 
 	* Rakefile:
 	Updating Inversion dependency
-	[87e4f57ec907] [tip]
+	[8309cf9a784a]
+
+2012-05-27  Michael Granger  <ged@FaerieMUD.org>
+
+	* .rvm.gems, Rakefile, spec/lib/helpers.rb:
+	Update to Loggability 0.3 and use its spec helpers.
+	[dff6dc0f1b19]
 
 2012-05-23  Michael Granger  <ged@FaerieMUD.org>
 
@@ -72,7 +126,7 @@
 	- Adding a 'config' subcommand to dump Configurability defaults for
 	discovered apps.
 	- Update for Loggability changes.
-	[f5c63705cd79] [github/master]
+	[f5c63705cd79]
 
 	* lib/strelka/app.rb, lib/strelka/app/auth.rb:
 	Adding support for config-discovery
@@ -646,7 +700,7 @@
 
 	* lib/strelka/app/errors.rb, spec/strelka/app/errors_spec.rb:
 	Add documentation for the Errors plugin, improve test coverage.
-	[ff3ef6e5a7a1] [github/master@default]
+	[ff3ef6e5a7a1]
 
 	* Manifest.txt:
 	Add session files to the manifest

data/Manifest.txt

@@ -16,11 +16,12 @@ contrib/hoetemplate/data/project/templates/layout.tmpl.erb
 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/.env
+examples/Procfile
 examples/apps/auth-demo
 examples/apps/auth-demo2
+examples/apps/hello-world
 examples/apps/sessions-demo
-examples/apps/ws-echo
 examples/config.yml
 examples/gen-config.rb
 examples/static/examples.css
@@ -55,7 +56,6 @@ lib/strelka/httprequest/session.rb
 lib/strelka/httpresponse.rb
 lib/strelka/httpresponse/negotiation.rb
 lib/strelka/httpresponse/session.rb
-lib/strelka/logging.rb
 lib/strelka/mixins.rb
 lib/strelka/paramvalidator.rb
 lib/strelka/plugins.rb
@@ -94,7 +94,6 @@ 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

data/Rakefile

@@ -31,7 +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.2'
+	self.dependency 'loggability',     '~> 0.3'
 	self.dependency 'foreman',         '~> 0.46'
 
 	self.dependency 'hoe-deveiate',    '~> 0.1', :developer

data/bin/strelka

@@ -205,10 +205,7 @@ class Strelka::CLICommand
 		# Set the datadir override if it's given
 		if self.options.datadir
 			self.log.debug "Using data dir option: %s" % [ self.options.datadir ]
-			Strelka.datadir = Pathname( self.options.datadir )
-		elsif File.directory?( 'data' ) && subdir = Dir[ 'data/*' ].first
-			self.log.debug "Using local data dir: %s" % [ subdir ]
-			Strelka.datadir = subdir
+			Strelka::App.local_data_dirs = Pathname( self.options.datadir )
 		end
 
 		# Include a 'lib' directory if there is one
@@ -330,10 +327,10 @@ class Strelka::CLICommand
 		discovered_apps[ discovery_name ].each do |apppath|
 			message "  loading %s (%s)" % [ apppath, apppath.basename('.rb') ]
 			Strelka::App.load( apppath )
-
-			message "  dumping config:"
-			$stdout.puts Configurability.default_config.dump
 		end
+
+		message "  dumping config:"
+		$stdout.puts Configurability.default_config.dump
 	end
 	help :config, "Dump the configuration for GEMNAME (or the local directory if no gem is specified)"
 	usage :config, "[GEMNAME]"

data/examples/.env

@@ -0,0 +1,4 @@
+STRELKA_DATADIR=.
+RUNMODE=development
+RUBYOPT=-I../lib
+MONGREL2=/Users/mgranger/source/C/mongrel2/bin/mongrel2

data/examples/Procfile

@@ -0,0 +1,8 @@
+# Foreman procfile
+mongrel: m2sh.rb -c mongrel2.sqlite start
+helloworld: ../bin/strelka -l info -c config.yml start hello-world
+auth: ../bin/strelka -l info -c config.yml start auth-demo
+auth2: ../bin/strelka -l info -c config.yml start auth-demo2
+sessions: ../bin/strelka -l info -c config.yml start sessions-demo
+# ws: ../bin/strelka -l info -c config.yml start ws-echo
+

data/examples/apps/auth-demo

@@ -9,10 +9,7 @@ class AuthDemo < Strelka::App
 	# The Mongrel2 appid of this app
 	ID = 'auth-demo'
 
-	plugin :auth
-	auth_provider :basic
-
-	plugin :routing
+	plugins :auth, :routing
 
 	### Handle any (authenticated) HTTP request
 	get do |req|
@@ -29,4 +26,5 @@ class AuthDemo < Strelka::App
 
 end # class AuthDemo
 
-AuthDemo.run
+AuthDemo.run if __FILE__ == $0
+

data/examples/apps/auth-demo2

@@ -12,19 +12,20 @@ class AuthDemo2 < Strelka::App
 	# The Mongrel2 appid of this app
 	ID = 'auth-demo2'
 
-	plugins :auth, :errors, :templating
-	auth_provider :session
+	plugins :auth, :errors, :templating, :routing
 
-	layout 'examples/layout.tmpl'
+	default_type 'text/html'
+
+	layout 'templates/layout.tmpl'
 	templates \
-		form: 'examples/auth-form.tmpl',
-		success: 'examples/auth-success.tmpl'
+		form: 'templates/auth-form.tmpl',
+		success: 'templates/auth-success.tmpl'
 
-	on_status AUTH_REQUIRED, :form
+	on_status HTTP::AUTH_REQUIRED, :form
 
 
 	### Handle any (authenticated) HTTP request
-	def handle_request( req )
+	get do |req|
 		return :success
 	end
 
@@ -32,6 +33,6 @@ class AuthDemo2 < Strelka::App
 end # class AuthDemo2
 
 
-Strelka.load_config( 'examples/config.yml' )
-AuthDemo2.run
+AuthDemo2.run if __FILE__ == $0
+
 

data/{data/strelka → examples}/apps/hello-world

@@ -18,8 +18,7 @@ class HelloWorldApp < Strelka::App
 	# Handle all GET requests the same way
 	get do |req|
 		res = req.response
-		res.status = HTTP::OK
-		res << 'Hello, world!'
+		res.puts 'Hello, world!'
 		return res
 	end
 

data/examples/apps/sessions-demo

@@ -39,5 +39,5 @@ class SessionsDemo < Strelka::App
 end # class SessionsDemo
 
 
-Strelka.load_config( 'examples/config.yml' )
-SessionsDemo.run
+SessionsDemo.run if __FILE__ == $0
+

data/examples/config.yml

@@ -1,7 +1,10 @@
 mongrel2:
-  configdb: amalgalite://examples/mongrel2.sqlite
+  configdb: amalgalite://mongrel2.sqlite
 
 auth:
+  provider: basic
+
+basicauth:
   realm: Examples
   users:
     ged: "iEPX+SQWIR3p67lj/0zigSWTKHg="
@@ -17,3 +20,11 @@ templates:
   template_paths:
     - examples/templates
 
+logging:
+  strelka: debug (color)
+  inversion: info (color)
+  configurability: debug (color)
+  mongrel2: debug (color)
+
+
+

data/examples/gen-config.rb

@@ -27,15 +27,14 @@ server 'examples' do
 
 	host 'localhost' do
 
-		route '/', directory( 'examples/static/', 'examples.html', 'text/html' )
-
-		authdemo = handler( 'tcp://127.0.0.1:9910', 'auth-demo' )
+		route '/', directory( 'static/', 'examples.html', 'text/html' )
 
 		# Handlers
-		route '/hello', handler( 'tcp://127.0.0.1:9900', 'helloworld-handler' )
+		route '/hello', handler( 'tcp://127.0.0.1:9900', 'hello-world' )
 		route '/sessions', handler( 'tcp://127.0.0.1:9905', 'sessions-demo' )
-		route '/auth', authdemo
-		route '/chunkers', authdemo
+		route '/auth', handler( 'tcp://127.0.0.1:9910', 'auth-demo' )
+		route '/formauth', handler( 'tcp://127.0.0.1:9915', 'auth-demo2' )
+		route '/ws', handler( 'tcp://127.0.0.1:9920', 'ws-echo' )
 
 	end
 

data/examples/templates/auth-form.tmpl

@@ -1,3 +1,7 @@
+<?import request ?>
+
+<?publish title ?>Please Log In<?end publish ?>
+
 <form action="[?call request.uri ?]" method="post" accept-charset="utf-8">
 	<label for="username">Username</label>
 	<input type="text" name="username" value="" id="username-input" />

data/examples/templates/auth-success.tmpl

@@ -1,3 +1,5 @@
+<?import request ?>
+
 <?publish title ?>Auth Successful<?end publish ?>
 
-<p>You succesfully authenticated as: <?call request.user ?></p>
+<p>You successfully authenticated as: <?call request.authenticated_user ?></p>

data/lib/strelka.rb

@@ -27,14 +27,25 @@ module Strelka
 	VERSION = '0.0.1'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 5288bf325ace $
+	REVISION = %q$Revision: c3b2a812c363 $
 
 	require 'strelka/constants'
+	require 'strelka/exceptions'
 	include Strelka::Constants
 
-	require 'strelka/exceptions'
-	require 'strelka/mixins'
-	extend Strelka::MethodUtilities
+	autoload :AuthProvider,   'strelka/authprovider'
+	autoload :Cookie,         'strelka/cookie'
+	autoload :CookieSet,      'strelka/cookieset'
+	autoload :ParamValidator, 'strelka/httpresponse'
+	autoload :Plugin,         'strelka/plugins'
+	autoload :PluginLoader,   'strelka/plugins'
+	autoload :PluginRegistry, 'strelka/plugins'
+	autoload :Router,         'strelka/router'
+	autoload :Session,        'strelka/session'
+
+	require 'strelka/app'
+	require 'strelka/httprequest'
+	require 'strelka/httpresponse'
 
 
 	### Get the library version. If +include_buildnum+ is true, the version string will
@@ -46,23 +57,6 @@ module Strelka
 	end
 
 
-	##
-	# The Pathname of the directory that will be searched for default applications,
-	# config, etc.
-	singleton_attr_reader :datadir
-
-	### Set the local data directory to +dir+.
-	def self::datadir=( dir )
-		@datadir = Pathname( dir )
-	end
-	self.datadir = DEFAULT_DATADIR
-
-
-	require 'strelka/app'
-	require 'strelka/httprequest'
-	require 'strelka/httpresponse'
-
-
 	# The installed Configurability::Config object
 	@config = nil
 	class << self; attr_accessor :config; end

data/lib/strelka/app.rb

@@ -31,16 +31,27 @@ class Strelka::App < Mongrel2::Handler
 
 	# Glob for matching Strelka apps relative to a gem's data directory
 	APP_GLOB_PATTERN = '{apps,handlers}/**/*'
+	APP_GLOB_PATTERN.freeze
+
+	# The glob for matching data directories relative to the PWD
+	LOCAL_DATA_DIRS = 'data/*'
+	LOCAL_DATA_DIRS.freeze
 
 	# Default config
-	CONFIG_DEFAULTS = { devmode: false }
+	CONFIG_DEFAULTS = {
+		devmode: false,
+		app_glob_pattern: APP_GLOB_PATTERN,
+		local_data_dirs: LOCAL_DATA_DIRS,
+	}.freeze
 
 
 	# Class instance variables
-	@devmode      = false
-	@default_type = nil
-	@loading_file = nil
-	@subclasses   = Hash.new {|h,k| h[k] = [] }
+	@devmode          = false
+	@default_type     = nil
+	@loading_file     = nil
+	@subclasses       = Hash.new {|h,k| h[k] = [] }
+	@app_glob_pattern = APP_GLOB_PATTERN
+	@local_data_dirs  = LOCAL_DATA_DIRS
 
 
 	##
@@ -52,6 +63,42 @@ class Strelka::App < Mongrel2::Handler
 	# 'Developer mode' flag.
 	singleton_attr_writer :devmode
 
+	##
+	# The glob(3) pattern for matching Apps during discovery
+	singleton_attr_accessor :app_glob_pattern
+
+	##
+	# The glob(3) pattern for matching local data directories during discovery. Local
+	# data directories are evaluated relative to the CWD.
+	singleton_attr_accessor :local_data_dirs
+
+
+	### 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.
+	def self::configure( config=nil )
+		if config
+			self.devmode          = true if config[:devmode]
+			self.app_glob_pattern = config[:app_glob_pattern]
+			self.local_data_dirs  = config[:local_data_dirs]
+		else
+			self.devmode          = $DEBUG ? true : false
+			self.app_glob_pattern = APP_GLOB_PATTERN
+			self.local_data_dirs  = LOCAL_DATA_DIRS
+		end
+
+		self.log.info "Enabled developer mode." if self.devmode?
+	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?
+
 
 	### Inheritance callback -- add subclasses to @subclasses so .load can figure out which
 	### classes correspond to which files.
@@ -94,10 +141,8 @@ 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
-		self.log.debug "Local paths: %s" % [ Strelka.datadir + APP_GLOB_PATTERN ]
-
 		appfiles = {
-			'' => Pathname.glob( Strelka.datadir + APP_GLOB_PATTERN )
+			'' => Pathname.glob( File.join(self.local_data_dirs, self.app_glob_pattern) )
 		}
 
 		# Find all the gems that depend on Strelka
@@ -172,29 +217,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?
-
-
-	### 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.
-	def self::configure( config=nil )
-		if config
-			self.devmode = true if config[:devmode]
-		else
-			self.devmode = $DEBUG ? true : false
-		end
-
-		self.log.info "Enabled developer mode." if self.devmode?
-	end
-
-
 	#
 	# :section: Application declarative methods
 	#