strelka 0.15.0 → 0.16.0

data/lib/strelka/app/routing.rb

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 # vim: set nosta noet ts=4 sw=4:
-# encoding: utf-8
+# frozen-string-literal: true
 
 require 'loggability'
 
@@ -235,9 +235,7 @@ module Strelka::App::Routing
 		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|
+			return pattern.split( '/' ).reject( &:empty? ).collect do |component|
 
 				if component.start_with?( ':' )
 					self.log.debug "translating parameter component %p to a regexp" % [component]
@@ -256,10 +254,11 @@ module Strelka::App::Routing
 		### 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 ])
+				name += ("%s%#x" % [ pattern.class.name, pattern.object_id * 2 ])
 			else
-				name << pattern.names.join( '_' )
+				name += pattern.names.join( '_' )
 			end
 
 			return name

data/lib/strelka/app/sessions.rb

@@ -1,4 +1,6 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
+# vim: set nosta noet ts=4 sw=4:
+# frozen_string_literal: true
 
 require 'loggability'
 

data/lib/strelka/app/templating.rb

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 # vim: set nosta noet ts=4 sw=4:
-# encoding: utf-8
+# frozen-string-literal: true
 
 require 'inversion'
 

data/lib/strelka/authprovider.rb

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 # vim: set nosta noet ts=4 sw=4:
-# encoding: utf-8
+# frozen-string-literal: true
 
 require 'pluggability'
 

data/lib/strelka/authprovider/basic.rb

@@ -1,5 +1,6 @@
 # -*- ruby -*-
 # vim: set nosta noet ts=4 sw=4:
+# frozen-string-literal: true
 
 require 'openssl'
 require 'configurability'

data/lib/strelka/authprovider/hostaccess.rb

@@ -1,5 +1,6 @@
 # -*- ruby -*-
 # vim: set nosta noet ts=4 sw=4:
+# frozen-string-literal: true
 
 require 'ipaddr'
 require 'loggability'

data/lib/strelka/behavior/plugin.rb

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 # vim: set nosta noet ts=4 sw=4:
-# encoding: utf-8
+# frozen-string-literal: true
 
 require 'rspec'
 
@@ -22,7 +22,7 @@ require 'strelka/plugins'
 #
 #    end
 
-shared_examples_for "A Strelka Plugin" do
+RSpec.shared_examples_for "A Strelka Plugin" do
 
 	let( :plugin ) do
 		described_class

data/lib/strelka/cli.rb

@@ -1,5 +1,6 @@
 # -*- ruby -*-
-#encoding: utf-8
+# vim: set nosta noet ts=4 sw=4:
+# frozen-string-literal: true
 
 require 'loggability'
 require 'highline'

data/lib/strelka/command/config.rb

@@ -1,5 +1,6 @@
 # -*- ruby -*-
-#encoding: utf-8
+# vim: set nosta noet ts=4 sw=4:
+# frozen-string-literal: true
 
 require 'strelka/cli' unless defined?( Strelka::CLI )
 

data/lib/strelka/command/discover.rb

@@ -1,5 +1,6 @@
 # -*- ruby -*-
-#encoding: utf-8
+# vim: set nosta noet ts=4 sw=4:
+# frozen-string-literal: true
 
 require 'strelka/cli' unless defined?( Strelka::CLI )
 

data/lib/strelka/command/start.rb

@@ -1,5 +1,6 @@
 # -*- ruby -*-
-#encoding: utf-8
+# vim: set nosta noet ts=4 sw=4:
+# frozen-string-literal: true
 
 require 'strelka/cli' unless defined?( Strelka::CLI )
 

data/lib/strelka/constants.rb

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 # vim: set nosta noet ts=4 sw=4:
-# encoding: utf-8
+# frozen-string-literal: true
 
 require 'uri'
 require 'mongrel2/constants'

data/lib/strelka/cookie.rb

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 # vim: set nosta noet ts=4 sw=4:
-# encoding: utf-8
+# frozen-string-literal: true
 
 require 'date'
 require 'time'

data/lib/strelka/cookieset.rb

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 # vim: set nosta noet ts=4 sw=4:
-# encoding: utf-8
+# frozen-string-literal: true
 
 require 'set'
 require 'forwardable'

data/lib/strelka/discovery.rb

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 # vim: set nosta noet ts=4 sw=4:
-# encoding: utf-8
+# frozen-string-literal: true
 
 require 'rubygems'
 require 'strelka' unless defined?( Strelka )

data/lib/strelka/httprequest.rb

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 # vim: set nosta noet ts=4 sw=4:
-# encoding: utf-8
+# frozen-string-literal: true
 
 require 'yajl'
 require 'safe_yaml'
@@ -92,7 +92,7 @@ class Strelka::HTTPRequest < Mongrel2::HTTPRequest
 	###   request.base_uri
 	###   # => #<URI::HTTP:0x007fe34d16b2e0 URL:http://localhost:8080/user>
 	def base_uri
-		rval = self.uri
+		rval = self.uri.dup
 		rval.path = self.headers.pattern
 		rval.query = nil
 		return rval
@@ -107,7 +107,7 @@ class Strelka::HTTPRequest < Mongrel2::HTTPRequest
 	###   request.route
 	###   # => "/user"
 	def route
-		return URI.unescape( self.headers.pattern )
+		return URI.decode_www_form_component( self.headers.pattern )
 	end
 	alias_method :pattern, :route
 
@@ -119,7 +119,7 @@ class Strelka::HTTPRequest < Mongrel2::HTTPRequest
 	###   request.app_path
 	###   # => "/1/profile"
 	def app_path
-		rval = URI.unescape( self.uri.path )
+		rval = URI.decode_www_form_component( self.uri.path )
 		rval.slice!( 0, self.route.bytesize )
 		return rval
 	end

data/lib/strelka/httprequest/acceptparams.rb

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 # vim: set nosta noet ts=4 sw=4:
-# encoding: utf-8
+# frozen-string-literal: true
 
 require 'loggability'
 require 'strelka/mixins'

data/lib/strelka/httprequest/auth.rb

@@ -1,4 +1,6 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
+# vim: set nosta noet ts=4 sw=4:
+# frozen-string-literal: true
 
 require 'strelka/constants'
 require 'strelka/httprequest' unless defined?( Strelka::HTTPRequest )

data/lib/strelka/httprequest/negotiation.rb

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 # vim: set nosta noet ts=4 sw=4:
-# encoding: utf-8
+# frozen-string-literal: true
 
 require 'strelka/constants'
 require 'strelka/httprequest' unless defined?( Strelka::HTTPRequest )

data/lib/strelka/httprequest/session.rb

@@ -1,4 +1,6 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
+# vim: set nosta noet ts=4 sw=4:
+# frozen-string-literal: true
 
 require 'configurability'
 

data/lib/strelka/httpresponse.rb

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 # vim: set nosta noet ts=4 sw=4:
-# encoding: utf-8
+# frozen-string-literal: true
 
 require 'loggability'
 require 'mongrel2/httpresponse'
@@ -117,8 +117,7 @@ class Strelka::HTTPResponse < Mongrel2::HTTPResponse
 		charset = self.find_header_charset
 		self.log.debug "Setting the charset in the content-type header to: %p" % [ charset.name ]
 
-		headers.content_type.slice!( CONTENT_TYPE_CHARSET_RE ) and
-			self.log.debug "  removed old charset parameter."
+		headers.content_type = headers.content_type.sub( CONTENT_TYPE_CHARSET_RE, '' )
 		headers.content_type += "; charset=#{charset.name}" unless
 			charset == Encoding::ASCII_8BIT
 	end

data/lib/strelka/httpresponse/negotiation.rb

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 # vim: set nosta noet ts=4 sw=4:
-# encoding: utf-8
+# frozen-string-literal: true
 
 require 'set'
 require 'yaml'

data/lib/strelka/httpresponse/session.rb

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 # vim: set nosta noet ts=4 sw=4:
-# encoding: utf-8
+# frozen-string-literal: true
 
 require 'strelka/constants'
 require 'strelka/exceptions'

data/lib/strelka/mixins.rb

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 # vim: set nosta noet ts=4 sw=4:
-# encoding: utf-8
+# frozen-string-literal: true
 
 
 require 'tempfile'
@@ -279,19 +279,30 @@ module Strelka
 		### declaring object (e.g., class instance variables and methods if declared
 		### in a Class).
 		def singleton_attr_reader( *symbols )
-			symbols.each do |sym|
-				singleton_class.__send__( :attr_reader, sym )
+			singleton_class.instance_exec( symbols ) do |attrs|
+				attr_reader( *attrs )
 			end
 		end
 
+
+		### Create instance variables and corresponding methods that return
+		### true or false values for each of the specified +symbols+ in the singleton
+		### of the declaring object.
+		def singleton_predicate_reader( *symbols )
+			singleton_class.extend( Strelka::MethodUtilities )
+			singleton_class.attr_predicate( *symbols )
+		end
+
+
 		### Creates methods that allow assignment to the attributes of the singleton
 		### of the declaring object that correspond to the specified +symbols+.
 		def singleton_attr_writer( *symbols )
-			symbols.each do |sym|
-				singleton_class.__send__( :attr_writer, sym )
+			singleton_class.instance_exec( symbols ) do |attrs|
+				attr_writer( *attrs )
 			end
 		end
 
+
 		### Creates readers and writers that allow assignment to the attributes of
 		### the singleton of the declaring object that correspond to the specified
 		### +symbols+.
@@ -301,6 +312,16 @@ module Strelka
 			end
 		end
 
+
+		### Create predicate methods and writers that allow assignment to the attributes
+		### of the singleton of the declaring object that correspond to the specified
+		### +symbols+.
+		def singleton_predicate_accessor( *symbols )
+			singleton_class.extend( Strelka::MethodUtilities )
+			singleton_class.attr_predicate_accessor( *symbols )
+		end
+
+
 		### Creates an alias for the +original+ method named +newname+.
 		def singleton_method_alias( newname, original )
 			singleton_class.__send__( :alias_method, newname, original )

data/lib/strelka/multipartparser.rb

@@ -1,6 +1,6 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
 # vim: set nosta noet ts=4 sw=4:
-# encoding: utf-8
+# frozen-string-literal: true
 
 require 'tmpdir'
 require 'tempfile'
@@ -79,7 +79,7 @@ class Strelka::MultipartParser
 		@io       = io
 		@boundary = boundary
 		@fields   = {}
-		@buffer   = ''
+		@buffer   = String.new( encoding: io.internal_encoding || io.external_encoding )
 
 		# Ensure that the buffer can contain at least a whole boundary,
 		# otherwise we can't scan for it.

data/lib/strelka/paramvalidator.rb

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 # vim: set nosta noet ts=4 sw=4:
-# encoding: utf-8
+# frozen-string-literal: true
 
 require 'uri'
 require 'forwardable'
@@ -208,7 +208,7 @@ class Strelka::ParamValidator
 
 			if self.block
 				location = self.block.source_location
-				desc << " on line %d of %s" % [ location[1], location[0] ]
+				desc += " on line %d of %s" % [ location[1], location[0] ]
 			end
 
 			return desc
@@ -419,8 +419,8 @@ class Strelka::ParamValidator
 			:float		  => /^(?<float>[\-\+]?(?:\d*\.\d+|\d+)(?:e[\-\+]?\d+)?)$/i,
 			:alpha		  => /^(?<alpha>[[:alpha:]]+)$/,
 			:alphanumeric => /^(?<alphanumeric>[[:alnum:]]+)$/,
-			:printable	  => /\A(?<printable>[[:print:][:blank:]\r\n]+)\z/,
-			:string		  => /\A(?<string>[[:print:][:blank:]\r\n]+)\z/,
+			:printable	  => /\A(?<printable>[[:print:][:space:]]+)\z/,
+			:string		  => /\A(?<string>[[:print:][:space:]]+)\z/,
 			:word		  => /^(?<word>[[:word:]]+)$/,
 			:email		  => /^(?<email>#{RFC822_EMAIL_ADDRESS})$/,
 			:hostname	  => /^(?<hostname>#{RFC1738_HOSTNAME})$/,

data/lib/strelka/plugins.rb

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 # vim: set nosta noet ts=4 sw=4:
-# encoding: utf-8
+# frozen-string-literal: true
 
 require 'set'
 require 'tsort'
@@ -80,7 +80,7 @@ module Strelka
 		### Return the name of the receiving plugin
 		def plugin_name
 			name = self.name || "anonymous#{self.object_id}"
-			name.sub!( /.*::/, '' )
+			name = name.sub( /.*::/, '' )
 			return name.downcase.to_sym
 		end
 
@@ -167,7 +167,7 @@ module Strelka
 
 
 		### Load the plugins with the given +names+ and install them.
-		def plugins( *names )
+		def plugins( *names, &block )
 			self.log.info "Adding plugins: %s" % [ names.flatten.map(&:to_s).join(', ') ]
 
 			# Load the associated Plugin Module objects
@@ -187,7 +187,7 @@ module Strelka
 				end
 
 				self.log.debug "  registering %p" % [ name ]
-				self.register_plugin( plugin )
+				self.register_plugin( plugin, &block )
 			end
 		end
 		alias_method :plugin, :plugins
@@ -214,7 +214,7 @@ module Strelka
 		### Register the plugin +mod+ in the receiving class. This adds any
 		### declaratives and class-level data necessary for configuring the
 		### plugin.
-		def register_plugin( mod )
+		def register_plugin( mod, &block )
 			if mod.const_defined?( :ClassMethods )
 				cm_mod = mod.const_get(:ClassMethods)
 				self.log.debug "  adding class methods from %p" % [ cm_mod ]
@@ -233,6 +233,15 @@ module Strelka
 						[ ivar, self.instance_variable_get(ivar), self ]
 				end
 			end
+
+			if block
+				if mod.respond_to?( :configure_block )
+					mod.configure_block( self, &block )
+				else
+					self.log.warn "Blocked passed to %p, which doesn't support block config." %
+						[ mod ]
+				end
+			end
 		end
 
 

data/lib/strelka/router.rb

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 # vim: set nosta noet ts=4 sw=4:
-# encoding: utf-8
+# frozen-string-literal: true
 
 require 'loggability'
 require 'pluggability'

data/lib/strelka/router/default.rb

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 # vim: set nosta noet ts=4 sw=4:
-# encoding: utf-8
+# frozen-string-literal: true
 
 require 'loggability'