strelka 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 395204eaca2231acafa0f31e6dd55ec96b51199e
-  data.tar.gz: 3c36c895a536b326353896d69d63e0d177d10224
+  metadata.gz: 58ca9bc4fbcc4953f0b9fb9b15407b726b0a9512
+  data.tar.gz: 946729ae577f2cd5496b3a14542094abb35ec907
 SHA512:
-  metadata.gz: fc57d68e1dcbf2ddd207aa60099d8296d217161b7eda72868f4f366ee5340b33f02e03c1c33e9c1b1df0c997591defa10b472f63078e20819ffa715aab0c3cb1
-  data.tar.gz: 64890a20a0effca5816512184a9750f9636809b67192b5697e38ee7b441dcb78e98d313386c954a64b3c5429b1314cfb4039549d996c3137a8dc4bdd1c195b88
+  metadata.gz: 429cab795c50159c7fdad07e17ecf0da7dbf6d43ef6e5798752d942a371dd592292815393c89563a0f29da887943b576fc7580a3d7ac1b06c091bae56d66bd99
+  data.tar.gz: 27c80311955501589a68d377e90c4c532f3acd3a074c648a4d5ea9eefc9246a6eb8669793c07583146bb9ef3cdd0e689440b8912dd37f82ac703f4a34d5a7b64

checksums.yaml.gz.sig

@@ -1,3 +1 @@
-Hj�M�����a��X@�x����*h�F���cVǎ��8��t�JS��m�.���y>�Gy�u���q=+w�?j>����ILx�s�
-I|%���O&
-d��o�[T�	U膘O(#K)�(��E�A�U�(	|�v>��	2��Fϔ�?d��+7lE����j��	|M��}	!��K<�G�Y{)�}��,fCE!G�+�C�`@FG}��O�S�%�h�Ƀ�nU��>fD�(T�P����|�3�eVU}wJ|������`����f�
+���~&U�ϱ�ʺ��� ��ؿ�G��!$)e���'F��n���z_a���a�4��'��v@ھ��$��ev�\�a:��#'�����j+��*�A��j�M�!�z1ע8�xs�
�ѷILR���\~_'�/�m��1hr<i����S���pfj	�	��'Z���yu�����:ϟe���h�q	��@t
�ԭc���y���hQ��gq���i�v���t)��TK��%~E ��勐>l�-e�

data/ChangeLog

@@ -1,8 +1,73 @@
+2013-03-26  Michael Granger  <ged@FaerieMUD.org>
+
+	* bin/strelka, lib/strelka/app.rb:
+	Pull app finder code from bin/strelka up into a Strelka::App class
+	method.
+	[715de56560f6] [tip]
+
+	* .rvm.gems, Rakefile:
+	Update deps, add fivefish doc option only in development
+	[eb616144eb14]
+
+2013-03-11  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.3.0 for changeset 3583acf73860
+	[beebeb914629]
+
+	* .hgsigs:
+	Added signature for changeset 01ab7adefccf
+	[3583acf73860] [v0.3.0]
+
+	* History.rdoc, lib/strelka.rb:
+	Bump the minor version, update history.
+	[01ab7adefccf]
+
+	* lib/strelka/app/restresources.rb, lib/strelka/httprequest/auth.rb,
+	lib/strelka/httpresponse.rb, lib/strelka/paramvalidator.rb,
+	lib/strelka/router.rb, spec/strelka/app/auth_spec.rb,
+	spec/strelka/app/restresources_spec.rb:
+	Whitespace cleanup
+	[f0f47fdd0fc1]
+
+	* .rvm.gems, Rakefile, lib/strelka/app/auth.rb,
+	lib/strelka/app/parameters.rb, lib/strelka/authprovider.rb,
+	lib/strelka/router.rb, lib/strelka/session.rb,
+	spec/strelka/authprovider_spec.rb, spec/strelka/router_spec.rb,
+	spec/strelka/session_spec.rb:
+	Swap PluginFactory for Pluggability
+	[2b5ec3707092]
+
+2013-03-01  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.2.1 for changeset 3e0b98108f3f
+	[b697fcf0bf33]
+
+	* .hgsigs:
+	Added signature for changeset c973cb926a4d
+	[3e0b98108f3f] [v0.2.1]
+
+	* History.rdoc, lib/strelka.rb:
+	Bump patch version, update history.
+	[c973cb926a4d]
+
+	* Rakefile:
+	Dont include formatter in RDoc options, bump simplecov dependency
+	too.
+	[bf325e88fc06]
+
+	* .rvm.gems, Rakefile, lib/strelka/app/auth.rb,
+	lib/strelka/app/templating.rb:
+	Update dependencies, add Ruby version to the default template
+	variables.
+	[b5f34be87274]
+
 2013-02-27  Mahlon E. Smith  <mahlon@martini.nu>
 
 	* .rvm.gems, Rakefile:
 	Update dependency for configurability.
-	[8e7f432be135] [github/master, tip]
+	[8e7f432be135] [github/master]
 
 2013-02-27  Michael Granger  <ged@FaerieMUD.org>
 

data/History.rdoc

@@ -1,3 +1,12 @@
+== v0.4.0 [2013-03-26] Michael Granger <ged@FaerieMUD.org>
+
+- Handle Strelka::App subclass inheritance, add Strelka::App syntactic
+  sugar.
+- Pull app finder code from bin/strelka up into a Strelka::App class
+  method.
+- Update deps, add fivefish doc option only in development
+
+
 == v0.3.0 [2013-03-11] Michael Granger <ged@FaerieMUD.org>
 
 - Swap PluginFactory for Pluggability

data/Rakefile

@@ -22,7 +22,7 @@ hoespec = Hoe.spec 'strelka' do
 	self.developer 'Michael Granger', 'ged@FaerieMUD.org'
 
 	self.dependency 'configurability', '~> 2.0'
-	self.dependency 'foreman',         '~> 0.61'
+	self.dependency 'foreman',         '~> 0.62'
 	self.dependency 'highline',        '~> 1.6'
 	self.dependency 'inversion',       '~> 0.12'
 	self.dependency 'loggability',     '~> 0.5'
@@ -32,14 +32,19 @@ hoespec = Hoe.spec 'strelka' do
 	self.dependency 'trollop',         '~> 2.0'
 	self.dependency 'uuidtools',       '~> 2.1'
 
-	self.dependency 'hoe-deveiate',    '~> 0.1', :developer
-	self.dependency 'simplecov',       '~> 0.7', :developer
+	self.dependency 'hoe-deveiate',            '~> 0.1', :developer
+	self.dependency 'simplecov',               '~> 0.7', :developer
+	self.dependency 'rdoc-generator-fivefish', '~> 0.2', :developer
 
 	self.spec_extras[:licenses] = ["BSD"]
 	self.spec_extras[:rdoc_options] = [
 		'-t', 'Strelka Web Application Toolkit',
 		'-w', '4',
 	]
+
+	# Use the Fivefish formatter if run in development
+	self.spec_extras[:rdoc_options] += [ '-f', 'fivefish' ] if File.directory?( '.hg' )
+
 	self.require_ruby_version( '>=1.9.3' )
 	self.hg_sign_tags = true if self.respond_to?( :hg_sign_tags= )
 	self.check_history_on_release = true if self.respond_to?( :check_history_on_release= )
@@ -47,6 +52,8 @@ hoespec = Hoe.spec 'strelka' do
 	self.rdoc_locations << "deveiate:/usr/local/www/public/code/#{remote_rdoc_dir}"
 end
 
+
+
 ENV['VERSION'] ||= hoespec.spec.version.to_s
 
 # Ensure the specs pass before checking in

data/bin/strelka

@@ -295,7 +295,9 @@ class Strelka::CLICommand
 
 	### The 'start' command
 	def start_command( *args )
-		path, appname, gemname = self.find_specified_app( *args )
+		appname = args.pop
+		gemname = args.pop
+		path, gemname = Strelka::App.find( appname, gemname )
 
 		header "Starting the %s app%s" % [
 			appname,
@@ -355,48 +357,6 @@ class Strelka::CLICommand
 	# Helper methods
 	#
 
-	### 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
-
-		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 ]
-
-		return path, appname, gemname
-	end
-
-
 	### Load any requires added to the command via the '-r' option.
 	def load_additional_requires
 		return unless self.options.requires

data/lib/strelka.rb

@@ -24,10 +24,10 @@ module Strelka
 	log_as :strelka
 
 	# Library version constant
-	VERSION = '0.3.0'
+	VERSION = '0.4.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 01ab7adefccf $
+	REVISION = %q$Revision: 49ae27e4588e $
 
 	require 'strelka/constants'
 	require 'strelka/exceptions'
@@ -62,5 +62,19 @@ module Strelka
 		self.config.install
 	end
 
+
+	### Look up the application class of +appname+, optionally limiting it to the gem
+	### named +gemname+. Returns the first matching class, or raises an exception if no
+	### app class was found.
+	def self::App( appname, gemname=nil )
+		path, _ = Strelka::App.find( appname, gemname )
+		raise LoadError, "Can't find the %s app." % [ appname ] unless path
+
+		apps = Strelka::App.load( path ) or
+			raise ScriptError "Loading %s didn't define a Strelka::App class." % [ path ]
+
+		return apps.first
+	end
+
 end # module Strelka
 

data/lib/strelka/app.rb

@@ -13,7 +13,6 @@ require 'strelka/plugins'
 
 
 # The Strelka HTTP application base class.
-#
 class Strelka::App < Mongrel2::Handler
 	extend Loggability,
 	       Configurability,
@@ -100,7 +99,8 @@ class Strelka::App < Mongrel2::Handler
 	### classes correspond to which files.
 	def self::inherited( subclass )
 		super
-		@subclasses[ @loading_file ] << subclass if self == Strelka::App
+		self.log.debug "Adding %p to the subclasses hash." % [ subclass ]
+		Strelka::App.subclasses[ @loading_file ] << subclass #if self == Strelka::App
 	end
 
 
@@ -206,6 +206,46 @@ class Strelka::App < Mongrel2::Handler
 	end
 
 
+	### Find the first app with the given +appname+ and return the path to its file and the name of
+	### the gem it's from. If the optional +gemname+ is given, only consider apps from that gem.
+	### Raises a RuntimeError if no app with the given +appname+ was found.
+	def self::find( appname, gemname=nil )
+		discovered_apps = self.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
+
+		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 ]
+
+		return path, gemname
+	end
+
+
 	### Load the specified +file+, and return any Strelka::App subclasses that are loaded
 	### as a result.
 	def self::load( file )

data/spec/strelka/app_spec.rb

@@ -68,7 +68,7 @@ describe Strelka::App do
 
 	it "has a method for loading app class/es from a file" do
 		app_file = 'an_app.rb'
-		app_path = Pathname( 'an_app.rb' ).expand_path
+		app_path = Pathname( app_file ).expand_path
 		app_class = nil
 
 		Kernel.should_receive( :load ).with( app_path.to_s ).and_return do
@@ -386,6 +386,7 @@ describe Strelka::App do
 		res.should be_nil()
 	end
 
+
 	describe "process name" do
 
 		before( :all ) do

data/spec/strelka_spec.rb

@@ -12,6 +12,15 @@ require 'strelka'
 
 describe Strelka do
 
+	before( :all ) do
+		setup_logging()
+	end
+
+	after( :all ) do
+		reset_logging()
+	end
+
+
 	describe "version methods" do
 		it "returns a version string if asked" do
 			described_class.version_string.should =~ /\w+ [\d.]+/
@@ -23,5 +32,16 @@ describe Strelka do
 		end
 	end
 
+	it "provides syntactic sugar for looking up an app class by name" do
+		mox_app = nil
+		Pathname.stub( :glob ).with( 'data/*/{apps,handlers}/**/*' ).
+			and_return([ Pathname('data/mox/apps/moxthefox') ])
+		Kernel.stub( :load ).with( File.expand_path 'data/mox/apps/moxthefox' ).and_return do
+			mox_app = Class.new( Strelka::App )
+		end
+
+		described_class::App( 'moxthefox' ).should == mox_app
+	end
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strelka
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Michael Granger
@@ -30,7 +30,7 @@ cert_chain:
   6mKCwjpegytE0oifXfF8k75A9105cBnNiMZOe1tXiqYc/exCgWvbggurzDOcRkZu
   /YSusaiDXHKU2O3Akc3htA==
   -----END CERTIFICATE-----
-date: 2013-03-12 00:00:00.000000000 Z
+date: 2013-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configurability
@@ -52,14 +52,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.61'
+        version: '0.62'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.61'
+        version: '0.62'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -242,6 +242,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: rdoc-generator-fivefish
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
@@ -415,6 +429,8 @@ rdoc_options:
 - Strelka Web Application Toolkit
 - -w
 - '4'
+- -f
+- fivefish
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -429,7 +445,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: strelka
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Strelka is a framework for creating and deploying Mongrel2[http://mongrel2.org/]