strelka 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b902501570fb51a630e6db3a1caf76e2d6b95cf
-  data.tar.gz: 887a594a9a0f7bec5f078780d70213bbbf42659c
+  metadata.gz: 9917d0f2aa0af3e703673e52fa232213ca6c1ecd
+  data.tar.gz: 33663b826ca6419b795bb01272c4d89bea9f1944
 SHA512:
-  metadata.gz: 6fa8677d58715cdbf5c49f5ebb869ee8375276bac1bfa7f053e12af22e4c2b5bdc8cd7bb67ffac82b5e1aa1fede89bce8b3135695c1270c76df8f1b37deb363f
-  data.tar.gz: a412d2434be44b12180bf63c76ffe8905fda2dd0728173a37a3522a8635c682de47f9bddb894b645af2c96aebff6be4cc70ccea76e2530b050d9650fdaf10459
+  metadata.gz: 0e9d6bc816de257d09d2f96135cec0f4e167e18657e458d172cf51fde131ba58f5f8e761adec8a4709cc4a3849e8a8c067539993ee9e01cca98ebaacd71818c4
+  data.tar.gz: ebfb61a89a233bba657937877bf1eb61ade3b907bda55ba2d188ce397358e52e5cc6a762a04c13664baa45867c8640967903acb63f095a979a011e87d3139c27

data/ChangeLog

@@ -1,8 +1,156 @@
+2013-10-15  Michael Granger  <ged@faeriemud.org>
+
+	* Close branch rdolgushin/ideasrdoc-russian-woof-fix-1381879886956
+	[dedc90b70209] [tip] <rdolgushin/ideasrdoc-russian-woof-fix-1381879886956>
+
+	* Merged in rdolgushin/strelka/rdolgushin/ideasrdoc-russian-woof-
+	fix-1381879886956 (pull request #2)
+
+	IDEAS.rdoc: Russian 'woof' fix
+	[ac7fea5af58f] [github/master]
+
+2013-10-15  Roman Dolgushin  <rd@roman-dolgushin.ru>
+
+	* IDEAS.rdoc:
+	IDEAS.rdoc: Russian 'woof' fix
+	[639105edf399] <rdolgushin/ideasrdoc-russian-woof-fix-1381879886956>
+
+2013-10-15  Michael Granger  <ged@FaerieMUD.org>
+
+	* Manifest.txt, bin/strelka, lib/strelka/app.rb,
+	lib/strelka/app/restresources.rb, lib/strelka/behavior/plugin.rb,
+	lib/strelka/httprequest.rb, spec/constants.rb, spec/helpers.rb,
+	spec/lib/constants.rb, spec/lib/helpers.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/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/authprovider/basic_spec.rb,
+	spec/strelka/authprovider/hostaccess_spec.rb,
+	spec/strelka/authprovider_spec.rb, spec/strelka/cookie_spec.rb,
+	spec/strelka/cookieset_spec.rb, spec/strelka/discovery_spec.rb,
+	spec/strelka/exceptions_spec.rb,
+	spec/strelka/httprequest/acceptparams_spec.rb,
+	spec/strelka/httprequest/auth_spec.rb,
+	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/mixins_spec.rb,
+	spec/strelka/multipartparser_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,
+	spec/strelka/session/db_spec.rb,
+	spec/strelka/session/default_spec.rb, spec/strelka/session_spec.rb,
+	spec/strelka/websocketserver/routing_spec.rb,
+	spec/strelka/websocketserver_spec.rb, spec/strelka_spec.rb:
+	Convert specs to new RSpec syntax.
+	[44fa18409c36]
+
+	* contrib/hoetemplate/.tm_properties,
+	contrib/hoetemplate/data/project/apps/file_name_app,
+	contrib/hoetemplate/lib/file_name.rb.erb:
+	Update Textmate properties in Hoe template
+	[ffc16e8412df]
+
+2013-10-07  Michael Granger  <ged@FaerieMUD.org>
+
+	* .rvm.gems:
+	Update rvm gemset
+	[004066a49de5]
+
+2013-10-06  Michael Granger  <ged@FaerieMUD.org>
+
+	* Gemfile, Rakefile:
+	Don't explicitly depend on RSpec version (use hoe-deveiate's
+	version)
+	[d0020cb5b3b5]
+
+	* examples/Procfile, examples/gen-config.rb:
+	Update for latest versions of Mongrel2 and the mongrel2 gem
+	[bcb0496f6135]
+
+	* lib/strelka/mixins.rb, spec/strelka/mixins_spec.rb:
+	Don't dup IOs or Tempfiles while deep-copying
+	[307d1a75161c]
+
+	* .hgignore, examples/.env:
+	Don't include example .env settings or logs
+	[76d01cc8ee54]
+
+	* Rakefile:
+	Fix Rakefile for latest version of Hoe
+	[ed5ff1b21eb1]
+
+	* .hgignore, Gemfile, Rakefile:
+	Add hoe-bundler for generated Gemfile.
+	[c2180fd0ac4f]
+
+2013-09-20  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/strelka/app.rb:
+	Update for newest version of Configurability.
+	[79b29b4c9079]
+
+	* Manifest.txt:
+	Update manifest
+	[719fbab274b9]
+
+2013-09-10  Michael Granger  <ged@FaerieMUD.org>
+
+	* IDEAS.rdoc, MILESTONES.rdoc, bin/strelka, examples/Procfile,
+	examples/apps/hello-world, examples/apps/ws-chat, examples/apps/ws-
+	echo, lib/strelka.rb, lib/strelka/app.rb,
+	lib/strelka/app/templating.rb, lib/strelka/behavior/plugin.rb,
+	lib/strelka/discovery.rb, lib/strelka/websocketserver.rb,
+	lib/strelka/websocketserver/routing.rb, spec/lib/constants.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/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/discovery_spec.rb,
+	spec/strelka/websocketserver/routing_spec.rb,
+	spec/strelka/websocketserver_spec.rb:
+	Adding a websocket service base class
+	[dc4b69988131]
+
+	* lib/strelka/app.rb, lib/strelka/httpresponse/negotiation.rb,
+	spec/strelka/httpresponse/negotiation_spec.rb:
+	Treat exceptions raised from negotiated content blocks as a failed
+	format
+	[48fb08c7a2a3]
+
+	* spec/strelka/httpresponse/negotiation_spec.rb:
+	Convert httpresponse/negotiation spec to expect syntax
+	[f727ec415c0d]
+
+2013-06-19  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.6.0 for changeset 25c5569e585b
+	[db22abb5e332]
+
+	* .hgsigs:
+	Added signature for changeset a043d61c759c
+	[25c5569e585b] [v0.6.0]
+
 2013-06-12  Michael Granger  <ged@FaerieMUD.org>
 
+	* History.rdoc, lib/strelka.rb:
+	Bump the minor version, update history.
+	[a043d61c759c]
+
 	* Rakefile:
 	Add Mahlon (finally) as an author
-	[d0a7eba63c10] [tip]
+	[d0a7eba63c10]
 
 	* lib/strelka/httprequest.rb, spec/strelka/httprequest_spec.rb:
 	Make HTTPRequest#params always return a Hash
@@ -31,7 +179,7 @@
 	* .rvm.gems, Rakefile, lib/strelka/httprequest.rb,
 	lib/strelka/session/db.rb, spec/strelka/httprequest_spec.rb:
 	Use the safe_yaml gem for loading untrusted request bodies.
-	[ce0387824c10] [github/master]
+	[ce0387824c10]
 
 	* lib/strelka/paramvalidator.rb, spec/strelka/paramvalidator_spec.rb:
 	Fix validator for literal "false" (via JSON)
@@ -2092,8 +2240,8 @@
 	- Require Ruby-Mongrel 0.12+
 	- This is just the initial implementation. Yet to be added:
 	configuration options for enabling/disabling stuff, automatic
-	composite services mapped from association reflections, mass-
-	create option, and lots more I'm forgetting.
+	composite services mapped from association reflections, mass- create
+	option, and lots more I'm forgetting.
 	[23acdb6e9afc]
 
 	* data/strelka/bootstrap-config.rb:
@@ -2411,12 +2559,11 @@
 	spec/strelka/httpresponse/negotiation_spec.rb:
 	Alterations to the plugin system to reflect dogfood discoveries.
 	- Rearranged the lifecycle of the request to all happen inside the
-	try/catch to allow fixup hooks to finish with an error status,
-	too.
+	try/catch to allow fixup hooks to finish with an error status, too.
 	- Moved the negotiation plugin closer to the router so negotation
-	callbacks can return responses that will be further altered by
-	later plugins. Moved the acceptable check into the response fixup
-	hook to accomplish this.
+	callbacks can return responses that will be further altered by later
+	plugins. Moved the acceptable check into the response fixup hook to
+	accomplish this.
 	- Made the response fixup hook only take a response object since
 	responses can now know what their request is.
 	- Made language-negotiation short-circuit whenever there aren't any

data/History.rdoc

@@ -1,3 +1,18 @@
+== v0.7.0 [2013-10-21] Michael Granger <ged@FaerieMUD.org>
+
+- Make response filters always receive a response even if the handler
+  returns a Symbol, e.g., for the templating plugin.
+- Add a note about needed documentation to :templating
+- Change filter plugin order; change run_before/run_after to
+  run_outside/run_inside. Backward-compatibility maintained with an alias.
+- Consider empty string as no value for parameter validation. (fixes #8)
+- IDEAS.rdoc: Russian 'woof' fix (thanks to Roman Dolgushin <rd@roman-dolgushin.ru>)
+- Don't dup IOs or Tempfiles while deep-copying
+- Adding a websocket service base class
+- Treat exceptions raised from negotiated content blocks as a failed
+  format
+
+
 == v0.6.0 [2013-06-12] Michael Granger <ged@FaerieMUD.org>
 
 - Bump dependency on Loggability and Configurability

data/IDEAS.rdoc

@@ -55,8 +55,24 @@ gem sandboxing.
 * caching -- utilities for easy HTTP caching
 
 
-== уток! (woof!)
+== гав! (woof!)
 
 Make a MacOS X tool like Pow! that makes it easy to run Strelka apps with a
 minimum of setup.
 
+
+== WebSocketServer
+
+Planned features:
+
+* DSL plugin for handling various kinds of frames, ala the App routing plugin
+* DSL plugin derived from the frame-based routing plugin that adds routing logic based on a
+  JSON data structure's contents
+* Automatic de-fragmenting of frames, with a plugin that allows customization of fragment-handling.
+* Heartbeat plugin that automatically pings connected clients, and disconnects them if they haven't
+  been seen in a while.
+* Plugin class to facilitate extensions? Not sure how this would work, but it could use
+  the 'deflate' extension as the test case.
+
+
+

data/MILESTONES.rdoc

@@ -4,7 +4,7 @@
 
 === Documentation
 
-[ ] Ensure the README is up to date
+[√] Ensure the README is up to date
 [ ] Update the IDEAS doc
 [ ] Extract the rest of the tutorial part of the manual out into RDoc for the app classes
 [ ] Lay out the framework for the 'cookbook' section of the manual

data/Manifest.txt

@@ -27,6 +27,8 @@ examples/apps/auth-demo2
 examples/apps/hello-world
 examples/apps/sessions-demo
 examples/apps/upload-demo
+examples/apps/ws-chat
+examples/apps/ws-echo
 examples/config.yml
 examples/gen-config.rb
 examples/static/examples.css
@@ -55,6 +57,7 @@ lib/strelka/behavior/plugin.rb
 lib/strelka/constants.rb
 lib/strelka/cookie.rb
 lib/strelka/cookieset.rb
+lib/strelka/discovery.rb
 lib/strelka/exceptions.rb
 lib/strelka/httprequest.rb
 lib/strelka/httprequest/acceptparams.rb
@@ -75,6 +78,9 @@ lib/strelka/session.rb
 lib/strelka/session/db.rb
 lib/strelka/session/default.rb
 lib/strelka/testing.rb
+lib/strelka/websocketserver.rb
+lib/strelka/websocketserver/routing.rb
+spec/constants.rb
 spec/data/error.tmpl
 spec/data/forms/2_images.form
 spec/data/forms/singleupload.form
@@ -87,8 +93,7 @@ spec/data/forms/testform_multivalue.form
 spec/data/forms/testform_truncated_metadata.form
 spec/data/layout.tmpl
 spec/data/main.tmpl
-spec/lib/constants.rb
-spec/lib/helpers.rb
+spec/helpers.rb
 spec/strelka/app/auth_spec.rb
 spec/strelka/app/errors_spec.rb
 spec/strelka/app/filters_spec.rb
@@ -104,6 +109,7 @@ spec/strelka/authprovider/hostaccess_spec.rb
 spec/strelka/authprovider_spec.rb
 spec/strelka/cookie_spec.rb
 spec/strelka/cookieset_spec.rb
+spec/strelka/discovery_spec.rb
 spec/strelka/exceptions_spec.rb
 spec/strelka/httprequest/acceptparams_spec.rb
 spec/strelka/httprequest/auth_spec.rb
@@ -123,4 +129,6 @@ spec/strelka/router_spec.rb
 spec/strelka/session/db_spec.rb
 spec/strelka/session/default_spec.rb
 spec/strelka/session_spec.rb
+spec/strelka/websocketserver/routing_spec.rb
+spec/strelka/websocketserver_spec.rb
 spec/strelka_spec.rb

data/Plugins.rdoc

@@ -58,8 +58,8 @@ applications can use it like so:
 == Load Order
 
 The request is passed through plugins sequentually.  You can control where in
-the chain your plugin belongs, by using the <tt>run_before</tt> and
-<tt>run_after</tt> methods.  Both methods accept a comma separated list of other
+the chain your plugin belongs, by using the <tt>run_outside</tt> and
+<tt>run_inside</tt> methods.  Both methods accept a comma separated list of other
 plugin names.
 
 In this example case, we want the logger to log the request before the other
@@ -71,7 +71,7 @@ core plugins run, so any errors still make it out to the log.
     module Strelka::App::DBLogger
         extend Strelka::Plugin
 
-        run_before :auth,
+        run_outside :auth,
             :filters,
             :negotiation,
             :parameters,
@@ -125,7 +125,7 @@ Here's the complete plugin.
     module Strelka::App::DBLogger
         extend Strelka::Plugin
 
-        run_before :auth,
+        run_outside :auth,
             :filters,
             :negotiation,
             :parameters,

data/README.rdoc

@@ -1,7 +1,7 @@
 = Strelka (Стрелка)
 
 home :: http://deveiate.org/projects/Strelka
-code :: http://repo.deveiate.org/Strelka
+code :: http://bitbucket.org/ged/Strelka
 github :: https://github.com/ged/strelka
 docs :: http://deveiate.org/code/strelka
 
@@ -182,7 +182,7 @@ Support for sending partial responses via the Chunked encoding.
 == Contributing
 
 You can check out the current development source with Mercurial via its
-{project page}[http://repo.deveiate.org/Strelka]. Or if you prefer Git, via 
+{project page}[http://bitbucket.org/ged/Strelka]. Or if you prefer Git, via 
 {its Github mirror}[https://github.com/ged/strelka].
 
 After checking out the source, run:
@@ -195,7 +195,7 @@ and generate the API documentation.
 
 == License
 
-Copyright (c) 2011-2012, Michael Granger
+Copyright (c) 2011-2013, Michael Granger and Mahlon E. Smith
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/Rakefile

@@ -11,6 +11,7 @@ end
 Hoe.plugin :mercurial
 Hoe.plugin :signing
 Hoe.plugin :deveiate
+Hoe.plugin :bundler
 
 Hoe.plugins.delete :rubyforge
 
@@ -27,19 +28,19 @@ hoespec = Hoe.spec 'strelka' do
 	self.dependency 'highline',        '~> 1.6'
 	self.dependency 'inversion',       '~> 0.12'
 	self.dependency 'loggability',     '~> 0.6'
-	self.dependency 'mongrel2',        '~> 0.36'
+	self.dependency 'mongrel2',        '~> 0.40'
 	self.dependency 'pluggability',    '~> 0.2'
 	self.dependency 'sysexits',        '~> 1.1'
 	self.dependency 'trollop',         '~> 2.0'
 	self.dependency 'uuidtools',       '~> 2.1'
 	self.dependency 'safe_yaml',       '~> 0.9'
 
-	self.dependency 'hoe-deveiate',            '~> 0.1',  :developer
-	self.dependency 'rspec',                   '~> 0.14', :developer
+	self.dependency 'hoe-deveiate',            '~> 0.3',  :developer
+	self.dependency 'hoe-bundler',             '~> 1.2',  :developer
 	self.dependency 'simplecov',               '~> 0.7',  :developer
 	self.dependency 'rdoc-generator-fivefish', '~> 0.2',  :developer
 
-	self.spec_extras[:licenses] = ["BSD"]
+	self.license "BSD"
 	self.spec_extras[:rdoc_options] = [
 		'-t', 'Strelka Web Application Toolkit',
 		'-w', '4',

data/bin/strelka

@@ -2,6 +2,8 @@
 # vim: set nosta noet ts=4 sw=4:
 
 require 'strelka'
+require 'strelka/discovery'
+
 require 'trollop'
 require 'highline'
 require 'loggability'
@@ -211,7 +213,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::App.local_data_dirs = Pathname( self.options.datadir )
+			Strelka::Discovery.local_data_dirs = Pathname( self.options.datadir )
 		end
 
 		# Include a 'lib' directory if there is one
@@ -266,7 +268,7 @@ class Strelka::CLICommand
 
 		self.load_additional_requires
 
-		paths = Strelka::App.discover_paths
+		paths = Strelka::Discovery.discover_paths
 		if paths.empty?
 			message "None found."
 		else
@@ -297,14 +299,21 @@ class Strelka::CLICommand
 	def start_command( *args )
 		appname = args.pop
 		gemname = args.pop
-		path, gemname = Strelka::App.find( appname, gemname )
+		path    = nil
+
+		if File.exist?( appname )
+			header "Starting %s." % [ appname ]
+			path = appname
+		else
+			path, gemname = Strelka::Discovery.find( appname, gemname )
 
-		header "Starting the %s app%s" % [
-			appname,
-			gemname == '' ? '' : " from the #{gemname} gem"
-		]
+			header "Starting the %s app%s" % [
+				appname,
+				gemname == '' ? '' : " from the #{gemname} gem"
+			]
+		end
 
-		apps = Strelka::App.load( path )
+		apps = Strelka::Discovery.load( path )
 		Strelka.load_config( self.options.config ) if self.options.config
 		self.log.debug "  loaded: %p" % [ apps ]
 
@@ -328,13 +337,13 @@ class Strelka::CLICommand
 		discovery_name = gemname || ''
 
 		header "Dumping config for %s" % [ gemname || 'local apps' ]
-		discovered_apps = Strelka::App.discover_paths
+		discovered_apps = Strelka::Discovery.discover_paths
 
 		raise ArgumentError, "No apps discovered" unless discovered_apps.key?( discovery_name )
 
 		discovered_apps[ discovery_name ].each do |apppath|
 			message "  loading %s (%s)" % [ apppath, apppath.basename('.rb') ]
-			Strelka::App.load( apppath )
+			Strelka::Discovery.load( apppath )
 		end
 
 		self.load_additional_requires

data/contrib/hoetemplate/data/project/apps/file_name_app

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+#encoding: utf-8
 
 require 'strelka'
 

data/contrib/hoetemplate/lib/file_name.rb.erb

@@ -1,4 +1,5 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
+#encoding: utf-8
 
 # <%= XIF %> (top-level documentation)
 module <%= klass %>
@@ -7,7 +8,7 @@ module <%= klass %>
 	VERS<%# this is just here so Hoe doesn't see this constant %>ION = '0.0.1'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 485638c9ec10 $
+	REVISION = %q$Revision: ffc16e8412df $
 
 end # module <%= klass %>
 

data/examples/apps/hello-world

@@ -26,4 +26,5 @@ end # class HelloWorldApp
 
 
 # Run the app
+Encoding.default_internal = Encoding::UTF_8
 HelloWorldApp.run if __FILE__ == $0

data/examples/apps/ws-chat

@@ -0,0 +1,69 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+require 'strelka/websocketserver'
+
+
+# An example of a Strelka WebSocketServer that echoes back whatever (non-control) frames you send
+# it.
+class WebSocketChatServer < Strelka::WebSocketServer
+	include Mongrel2::WebSocket::Constants
+
+
+	### Set up the user registry.
+	def initialize( * )
+		super
+		@users = {}
+	end
+
+
+	#
+	# Heartbeat plugin
+	#
+	plugin :heartbeat
+
+	heartbeat_rate 5.0
+	idle_timeout 15.0
+
+
+	# Make a new user slot for sockets when they start up.
+	on_handshake do |frame|
+		super
+		@users[ frame.socket_id ] = nil
+	end
+
+
+	# When a text frame comes in (or is assembled from :continuation frames), parse it as JSON
+	# and decide what to do based on its contents.
+	on_text do |frame|
+		
+	end
+
+
+
+	# Handle close frames
+	on_close do |frame|
+
+		username = self.users.delete( frame.socket_id )
+		self.broadcast_notice( "#{username} disconnected." ) if username
+
+		# There will still be a connection slot if this close originated with
+		# the client. In that case, reply with the ACK CLOSE frame
+		self.conn.reply( frame.response(:close) ) if
+			self.connections.delete( [frame.sender_id, frame.conn_id] )
+
+		self.conn.reply_close( frame )
+		return nil
+	end
+
+
+end # class RequestDumper
+
+Loggability.level = $DEBUG||$VERBOSE ? :debug : :info
+Loggability.format_as( :color ) if $stdin.tty?
+
+# Point to the config database, which will cause the handler to use
+# its ID to look up its own socket info.
+Mongrel2::Config.configure( :configdb => 'examples.sqlite' )
+WebSocketEchoServer.run( 'ws-echo' )
+

data/examples/apps/ws-echo

@@ -0,0 +1,61 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+require 'strelka/websocketserver'
+
+
+# An example of a Strelka WebSocketServer that echoes back whatever (non-control) frames you send
+# it.
+class WebSocketEchoServer < Strelka::WebSocketServer
+
+	# Application ID
+	ID = 'ws-echo'
+
+	#
+	# Heartbeat plugin
+	#
+	# plugin :heartbeat
+	#
+	# heartbeat_rate 5.0
+	# idle_timeout 15.0
+
+
+	#
+	# Routing
+	#
+
+	plugin :routing
+
+	# Handle TEXT, BINARY, and CONTINUATION frames by replying with an echo of the
+	# same data. Fragmented frames get echoed back as-is without any reassembly.
+	on_text do |frame|
+		self.log.info "Echoing data frame: %p" % [ frame ]
+
+		# Make the response frame
+		response = frame.response
+		response.fin = frame.fin?
+		IO.copy_stream( frame.payload, response.payload )
+
+		return response
+	end
+	alias_method :handle_binary_frame, :on_text_frame
+	alias_method :handle_continuation_frame, :on_text_frame
+
+
+	# Handle close frames
+	on_close do |frame|
+
+		# There will still be a connection slot if this close originated with
+		# the client. In that case, reply with the ACK CLOSE frame
+		self.conn.reply( frame.response(:close) ) if
+			self.connections.delete( [frame.sender_id, frame.conn_id] )
+
+		self.conn.reply_close( frame )
+		return nil
+	end
+
+
+end # class RequestDumper
+
+Encoding.default_internal = Encoding::UTF_8
+WebSocketEchoServer.run if __FILE__ == $0

data/examples/gen-config.rb

@@ -17,17 +17,17 @@ server 'examples' do
 	name         'Strelka Examples'
 	default_host 'localhost'
 
-	access_log   '/logs/access.log'
-	error_log    '/logs/error.log'
-	chroot       '/var/mongrel2'
-	pid_file     '/run/mongrel2.pid'
+	access_log   'logs/access.log'
+	error_log    'logs/error.log'
+	pid_file     'run/mongrel2.pid'
 
+	chroot       ''
 	bind_addr    '0.0.0.0'
 	port         8113
 
 	host 'localhost' do
 
-		route '/', directory( 'examples/static/', 'examples.html', 'text/html' )
+		route '/', directory( 'static/', 'examples.html', 'text/html' )
 
 		# Handlers
 		route '/hello', handler( 'tcp://127.0.0.1:9900', 'hello-world' )
@@ -45,6 +45,7 @@ setting "zeromq.threads", 1
 
 setting 'limits.content_length', 8096
 setting 'upload.temp_store', 'var/uploads/mongrel2.upload.XXXXXX'
+setting 'server.daemonize', false
 
 mkdir_p 'var/uploads'
 mkdir_p 'run'

data/lib/strelka/app/auth.rb

@@ -234,8 +234,8 @@ module Strelka::App::Auth
 	config_key :auth
 
 	# Plugins API -- Set up load order
-	run_before :routing, :restresources
-	run_after  :templating, :errors, :sessions
+	run_outside :routing, :restresources
+	run_inside  :templating, :errors, :sessions
 
 
 	# The name of the default plugin to use for authentication