strelka 0.0.1.pre.229 → 0.0.1.pre.232

data/ChangeLog

@@ -1,8 +1,32 @@
 2012-05-09  Michael Granger  <ged@FaerieMUD.org>
 
+	* bin/strelka:
+	Updates for bin/strelka:
+	- Adding a 'config' subcommand to dump Configurability defaults for
+	discovered apps.
+	- Update for Loggability changes.
+	[f5c63705cd79] [github/master, tip]
+
+	* lib/strelka/app.rb, lib/strelka/app/auth.rb:
+	Adding support for config-discovery
+	[a7352e61d5f5]
+
+	* lib/strelka/app/routing.rb, spec/strelka/app/routing_spec.rb,
+	spec/strelka/router/default_spec.rb:
+	Adding support for regexp-only routes
+	[f74278523338]
+
+	* lib/strelka/httprequest/session.rb,
+	lib/strelka/httpresponse/session.rb, spec/lib/helpers.rb,
+	spec/strelka/app/sessions_spec.rb,
+	spec/strelka/httprequest/session_spec.rb,
+	spec/strelka/httpresponse/session_spec.rb:
+	Prevent unnecessary session loading and saving.
+	[1242808d64a6]
+
 	* lib/strelka/cookieset.rb, spec/strelka/cookieset_spec.rb:
 	Add delegation for some more Set methods to CookieSet
-	[c88faf6871e7] [tip]
+	[c88faf6871e7]
 
 2012-05-08  Michael Granger  <ged@FaerieMUD.org>
 
@@ -26,7 +50,7 @@
 	Provide access to the request during layout template wrapping, so
 	handlers can potentially override the method and attach arbitrary
 	request attributes to the layout.
-	[1fc0cf040a1e] [github/master]
+	[1fc0cf040a1e]
 
 2012-05-07  Michael Granger  <ged@FaerieMUD.org>
 
@@ -345,18 +369,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,
@@ -427,6 +449,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,
@@ -444,24 +482,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/bin/strelka

@@ -4,6 +4,7 @@
 require 'strelka'
 require 'trollop'
 require 'highline'
+require 'loggability'
 
 # Have to do it this way to avoid the vendored 'sysexits' under OSX.
 gem 'sysexits'
@@ -12,11 +13,16 @@ require 'sysexits'
 
 # A tool for setting up and running Strelka apps
 class Strelka::CLICommand
-	extend ::Sysexits
+	extend ::Sysexits,
+	       Loggability
 	include Sysexits,
-	        Strelka::Loggable,
 	        Strelka::Constants
 
+
+	# Write logs to Strelka's logger
+	log_to :strelka
+
+
 	# Make a HighLine color scheme
 	COLOR_SCHEME = HighLine::ColorScheme.new do |scheme|
 		scheme[:header]    = [ :bold, :yellow ]
@@ -48,8 +54,8 @@ class Strelka::CLICommand
 		exit :ok
 
 	rescue => err
-		Strelka.logger.fatal "Oops: %s: %s" % [ err.class.name, err.message ]
-		Strelka.logger.debug { '  ' + err.backtrace.join("\n  ") }
+		self.log.fatal "Oops: %s: %s" % [ err.class.name, err.message ]
+		self.log.debug { '  ' + err.backtrace.join("\n  ") }
 
 		exit :software_error
 	end
@@ -89,7 +95,7 @@ class Strelka::CLICommand
 			progname = File.basename( $0 )
 
 			# Make a list of the log level names and the available commands
-			loglevels = Strelka::Logging::LOG_LEVELS.
+			loglevels = Loggability::LOG_LEVELS.
 				sort_by {|name,lvl| lvl }.
 				collect {|name,lvl| name.to_s }.
 				join( ', ' )
@@ -111,7 +117,7 @@ class Strelka::CLICommand
 				text 'Other Options:'
 				opt :debug, "Turn debugging on. Also sets the --loglevel to 'debug'."
 				opt :loglevel, "Set the logging level. Must be one of: #{loglevels}",
-					:default => Strelka::Logging::LOG_LEVEL_NAMES[ Strelka.logger.level ]
+					:default => Strelka.logger.level.to_s
 			end
 		end
 
@@ -165,15 +171,15 @@ class Strelka::CLICommand
 	### 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 ) if $stderr.tty?
+		Loggability.format_with( :color ) if $stderr.tty?
 		@options = options
 
 		if @options.debug
 			$DEBUG = true
 			$VERBOSE = true
-			Strelka.logger.level = Logger::DEBUG
+			Loggability.level = :debug
 		elsif @options.loglevel
-			Strelka.logger.level = Strelka::Logging::LOG_LEVELS[ @options.loglevel ]
+			Loggability.level = @options.loglevel
 		end
 
 	end
@@ -311,6 +317,35 @@ class Strelka::CLICommand
 	help :version, "Prints the Ruby-Mongrel2 version."
 
 
+	### The 'config' command
+	def config_command( *args )
+		gemname = args.shift
+		discovery_name = gemname || ''
+
+		header "Dumping config for %s" % [ gemname || 'local apps' ]
+		discovered_apps = Strelka::App.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 )
+
+			message "  dumping config:"
+			$stdout.puts Configurability.default_config.dump
+		end
+	end
+	help :config, "Dump the configuration for GEMNAME (or the local directory if no gem is specified)"
+	usage :config, "[GEMNAME]"
+
+
+	### The 'version' command
+	def version_command( *args )
+		message( "<%= color 'Version:', :header %> " + Mongrel2.version_string(true) )
+	end
+	help :version, "Prints the Ruby-Mongrel2 version."
+
+
 	#
 	# Helper methods
 	#

data/lib/strelka/app/auth.rb

@@ -240,7 +240,6 @@ require 'strelka/authprovider'
 module Strelka::App::Auth
 	extend Strelka::Plugin,
 	       Strelka::MethodUtilities,
-	       Configurability,
 	       Loggability
 	include Strelka::Constants
 

data/lib/strelka/app/routing.rb

@@ -37,12 +37,23 @@ require 'strelka/plugins'
 #
 #       # match any GET request
 #       get do |req|
-#           return req.response << 'Hello, World!'
+#           res = req.response
+#           res.puts 'Hello, World!'
+#           return res
 #       end
 #
 #       # match any GET request whose path starts with '/goodbye'
 #       get '/goodbye' do |req|
-#           return req.response << "Goodbye, cruel World!"
+#           res = req.response
+#           res.puts "Goodbye, cruel World!"
+#           return res
+#       end
+#
+#       # match any GET request whose path ends with '.pdf'
+#       get /\.pdf$/ do |req|
+#           res = req.response
+#           res.body = generate_pdf()
+#           return res
 #       end
 #
 #
@@ -64,12 +75,16 @@ require 'strelka/plugins'
 #
 #       # match a GET request for the exact route only
 #       get do |req|
-#           return req.response << 'Hello, World!'
+#           res = req.response
+#           res.puts 'Hello, World!'
+#           return res
 #       end
 #
 #       # only match a GET request for '/goodbye'
 #       get '/goodbye' do |req|
-#           return req.response << "Goodbye, cruel World!"
+#           res = req.response
+#           res.puts "Goodbye, cruel World!"
+#           return res
 #       end
 #
 #      # Every other request responds with a 404
@@ -187,8 +202,8 @@ module Strelka::App::Routing
 			# Make a method name from the directories and the named captures of the patterns
 			# in the route
 			patternparts.each do |part|
-				if part.is_a?( Regexp )
-					methodparts << '_' + part.names.join( '_' )
+				if part.respond_to?( :names )
+					methodparts << make_route_name( part )
 				else
 					methodparts << part
 				end
@@ -218,6 +233,8 @@ module Strelka::App::Routing
 
 		### Split the given +pattern+ into its path components and
 		def split_route_pattern( pattern )
+			return [pattern] if pattern.is_a?( Regexp )
+
 			pattern.slice!( 0, 1 ) if pattern.start_with?( '/' )
 
 			return pattern.split( '/' ).collect do |component|
@@ -236,6 +253,19 @@ module Strelka::App::Routing
 		end
 
 
+		### Generate a name based on the parts of the given +pattern+.
+		def make_route_name( pattern )
+			name = '_re_'
+			if pattern.names.empty?
+				name << ("%s%#x" % [ pattern.class.name, pattern.object_id * 2 ])
+			else
+				name << pattern.names.join( '_' )
+			end
+
+			return name
+		end
+
+
 		### Inheritance hook -- inheriting classes inherit their parents' routes table.
 		def inherited( subclass )
 			super
@@ -273,6 +303,7 @@ module Strelka::App::Routing
 		self.log.debug "[:routing] Done with routing."
 	end
 
+
 end # module Strelka::App::Routing
 
 

data/lib/strelka/app.rb

@@ -27,9 +27,14 @@ class Strelka::App < Mongrel2::Handler
 	# Configurability API -- use the 'app' section of the config file.
 	config_key :app
 
+
 	# Glob for matching Strelka apps relative to a gem's data directory
 	APP_GLOB_PATTERN = '{apps,handlers}/**/*'
 
+	# Default config
+	CONFIG_DEFAULTS = { devmode: false }
+
+
 	# Class instance variables
 	@devmode      = false
 	@default_type = nil

data/spec/strelka/app/routing_spec.rb

@@ -182,6 +182,15 @@ describe Strelka::App::Routing do
 			]
 		end
 
+		it "allows a route to specify a path via a Regex" do
+			@app.class_eval do
+				get /\.pdf$/ do
+				end
+			end
+
+			@app.routes.first[0,2].should == [ :GET, [/\.pdf$/] ]
+		end
+
 
 		it "uses the Strelka::Router::Default as it's router by default" do
 			@app.routerclass.should == :default
@@ -237,7 +246,7 @@ describe Strelka::App::Routing do
 
 				@app.routes.should ==
 					[[ :POST, ['userinfo', /(?<username>[a-z]\w+)/i],
-					   {action: @app.instance_method(:POST_userinfo__username), options: {}} ]]
+					   {action: @app.instance_method(:POST_userinfo__re_username), options: {}} ]]
 			end
 
 			it "unbinds parameter patterns bound with ^ and $ for the route" do
@@ -249,7 +258,7 @@ describe Strelka::App::Routing do
 
 				@app.routes.should ==
 					[[ :POST, ['userinfo', /(?<username>[a-z]\w+)/i],
-					   {action: @app.instance_method(:POST_userinfo__username), options: {}} ]]
+					   {action: @app.instance_method(:POST_userinfo__re_username), options: {}} ]]
 			end
 
 			it "unbinds parameter patterns bound with \\A and \\z for the route" do
@@ -261,7 +270,7 @@ describe Strelka::App::Routing do
 
 				@app.routes.should ==
 					[[ :POST, ['userinfo', /(?<username>[a-z]\w+)/i],
-					   {action: @app.instance_method(:POST_userinfo__username), options: {}} ]]
+					   {action: @app.instance_method(:POST_userinfo__re_username), options: {}} ]]
 			end
 
 			it "unbinds parameter patterns bound with \\Z for the route" do
@@ -273,7 +282,7 @@ describe Strelka::App::Routing do
 
 				@app.routes.should ==
 					[[ :POST, ['userinfo', /(?<username>[a-z]\w+)/i],
-					  {action: @app.instance_method(:POST_userinfo__username), options: {}} ]]
+					  {action: @app.instance_method(:POST_userinfo__re_username), options: {}} ]]
 			end
 
 			it "merges parameters from the route path into the request's param validator" do

data/spec/strelka/router/default_spec.rb

@@ -227,5 +227,29 @@ describe Strelka::Router::Default do
 
 	end
 
+	context "a router with routes for: 'foo', then '/(?<filename>\p{Print}*)\.pdf$/'" do
+
+		before( :each ) do
+			@router.add_route( :GET, ['foo'], route(:foo) )
+			@router.add_route( :GET, [/(?<filename>\p{Print}*)\.pdf$/], route(:as_pdf) )
+		end
+
+		it "routes /user/foo/1 to the foo action" do
+			req = @request_factory.get( '/user/foo/1' )
+			@router.route_request( req ).should match_route( :foo )
+		end
+
+		it "routes /foo.pdf to the regexp action" do
+			req = @request_factory.get( '/user/foo.pdf' )
+			@router.route_request( req ).should match_route( :as_pdf )
+		end
+
+		it "routes /zanzibar.pdf to the regexp action" do
+			req = @request_factory.get( '/user/zanzibar.pdf' )
+			@router.route_request( req ).should match_route( :as_pdf )
+		end
+
+	end
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strelka
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre.229
+  version: 0.0.1.pre.232
   prerelease: 
 platform: ruby
 authors:

metadata.gz.sig

@@ -1,3 +1,4 @@
-=aoS5�Ɋ�)P/��!�H����аb\������G:R$x�7V���݃1
-땪o�oA)���L0��0�zQ[M{�B�
-i�+�\��M����>	�ht&;����1��s=�{k�S-��1���]��_h�u��)�C#N�7@b�a ��<��xb���3��q*��\�k�Rp��;��,�!��ĸéL�eH
+���وe{�
+��ΎZB.�oܾ�k���R���	p�
+�P7�/9]����0c�����k��J�&�!F
+�:�7 $��r���J��
��Pۉ���@�lߊ)}T�\���J