strelka 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cdd135d0300da315861725d0229e676aab747c5
-  data.tar.gz: 72341e3dee02a2e7579ee284a80735bcf5f724d8
+  metadata.gz: 395204eaca2231acafa0f31e6dd55ec96b51199e
+  data.tar.gz: 3c36c895a536b326353896d69d63e0d177d10224
 SHA512:
-  metadata.gz: 036494b96215b6ea74644e9d95ec691e23d8a580360283b8b2a42eadcbd7e9ce80565283c460f51d5e6b3c9c275ba92d49a88c1a1547c7c5fc92d54720ae46de
-  data.tar.gz: 89f11b69277c934c2eac8b615045381c2e0270192c46f70c4417af734fad05561f5d6416e3ebbc815b52c38eab154851f05e88e8f58945f3a8a30fe349c6d906
+  metadata.gz: fc57d68e1dcbf2ddd207aa60099d8296d217161b7eda72868f4f366ee5340b33f02e03c1c33e9c1b1df0c997591defa10b472f63078e20819ffa715aab0c3cb1
+  data.tar.gz: 64890a20a0effca5816512184a9750f9636809b67192b5697e38ee7b441dcb78e98d313386c954a64b3c5429b1314cfb4039549d996c3137a8dc4bdd1c195b88

data/History.rdoc

@@ -1,3 +1,8 @@
+== v0.3.0 [2013-03-11] Michael Granger <ged@FaerieMUD.org>
+
+- Swap PluginFactory for Pluggability
+
+
 == v0.2.1 [2013-03-01] Michael Granger <ged@FaerieMUD.org>
 
 - Update dependencies

data/Rakefile

@@ -24,10 +24,10 @@ hoespec = Hoe.spec 'strelka' do
 	self.dependency 'configurability', '~> 2.0'
 	self.dependency 'foreman',         '~> 0.61'
 	self.dependency 'highline',        '~> 1.6'
-	self.dependency 'inversion',       '~> 0.11'
+	self.dependency 'inversion',       '~> 0.12'
 	self.dependency 'loggability',     '~> 0.5'
 	self.dependency 'mongrel2',        '~> 0.36'
-	self.dependency 'pluginfactory',   '~> 1.0'
+	self.dependency 'pluggability',    '~> 0.0'
 	self.dependency 'sysexits',        '~> 1.1'
 	self.dependency 'trollop',         '~> 2.0'
 	self.dependency 'uuidtools',       '~> 2.1'

data/lib/strelka.rb

@@ -24,10 +24,10 @@ module Strelka
 	log_as :strelka
 
 	# Library version constant
-	VERSION = '0.2.1'
+	VERSION = '0.3.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: c973cb926a4d $
+	REVISION = %q$Revision: 01ab7adefccf $
 
 	require 'strelka/constants'
 	require 'strelka/exceptions'

data/lib/strelka/app/auth.rb

@@ -207,7 +207,7 @@ require 'strelka/authprovider'
 #        plugins :auth, :errors, :templating
 #
 #        layout 'examples/layout.tmpl'
-#        templates \ 
+#        templates \
 #            form: 'examples/auth-form.tmpl',
 #            success: 'examples/auth-success.tmpl'
 #

data/lib/strelka/app/parameters.rb

@@ -26,6 +26,10 @@ require 'strelka/paramvalidator'
 #       param :id, /\d+/, "The user's numeric ID"
 #       param :mode, /^\s*(?<prefix>[A-Z]{2})-(?<sku>\p{Print}+)/
 #
+#       # ...
+#
+#   end # class UserManager
+#
 # The first item is the parameter _key_, which corresponds to the field 'name' attribute for
 # a form, or the key for JSON or YAML data.
 #
@@ -53,19 +57,17 @@ require 'strelka/paramvalidator'
 #
 # The inclusion of this plugin also allows you to use parameters in your routes:
 #
-#       # :username gets validated and merged into query args; URI parameters
-#       # clobber query params
-#       get '/info/:username' do |req|
-#           req.params.add( :id, /[XRT]\d{4}-\d{8}/ )
-#           req.params.okay?
-#           req.params[:username]
-#           req.params.values_at( :id, :username )
-#           req.params.username
-#
-#           req.params.error_messages
-#       end
+#   # :username gets validated and merged into query args; URI parameters
+#   # clobber query params
+#   get '/info/:username' do |req|
+#       req.params.add( :id, /[XRT]\d{4}-\d{8}/ )
+#       req.params.okay?
+#       req.params[:username]
+#       req.params.values_at( :id, :username )
+#       req.params.username
 #
-#   end # class UserManager
+#       req.params.error_messages
+#   end
 #
 # [:FIXME:] Add more docs.
 module Strelka::App::Parameters
@@ -100,12 +102,6 @@ module Strelka::App::Parameters
 		end
 
 
-		### Add a 'builtin' constraint type with the specified +name+.
-		def add_param_type( name, &block )
-			
-		end
-
-
 		### Get/set the untainting flag. If set, all parameters which match their constraints
 		### will also be untainted.
 		def untaint_all_constraints( newval=nil )

data/lib/strelka/app/restresources.rb

@@ -51,7 +51,7 @@ require 'strelka/app' unless defined?( Strelka::App )
 # [ ] Means of tailoring responses for requests for which the response
 #     isn't clearly specified in the RFC (DELETE /resource)
 # [ ] Sequel plugin for adding links to serialized representations
-# 
+#
 # == Caveats / Known Problems
 #
 # * Dataset methods declared using the 'subset' declaration don't allow the
@@ -491,7 +491,7 @@ module Strelka::App::RestResources
 
 				route  = "%s/%s" % [ route_prefix, methname ]
 				params = []
-					
+
 				# Add a route placeholder for each parameter of the dataset method
 				meth.parameters.each do |type, param|
 					self.log.debug "    adding parameter placeholder to the route for %s parameter %p" %
@@ -619,7 +619,7 @@ module Strelka::App::RestResources
 	#######
 
 	### Add parameter validations for the given +columns+ of the specified resource object +rsrcobj+
-	### to the specified +req+uest. 
+	### to the specified +req+uest.
 	def add_resource_params( req, rsrcobj, *columns )
 		columns = rsrcobj.allowed_columns || rsrcobj.columns if columns.empty?
 

data/lib/strelka/authprovider.rb

@@ -2,7 +2,7 @@
 # vim: set nosta noet ts=4 sw=4:
 # encoding: utf-8
 
-require 'pluginfactory'
+require 'pluggability'
 
 require 'strelka' unless defined?( Strelka )
 require 'strelka/mixins'
@@ -29,9 +29,9 @@ require 'strelka/mixins'
 #
 class Strelka::AuthProvider
 	extend Loggability,
+	       Pluggability,
 	       Strelka::Delegation
-	include PluginFactory,
-	        Strelka::Constants,
+	include Strelka::Constants,
 	        Strelka::AbstractClass,
 	        Strelka::ResponseHelpers
 
@@ -39,11 +39,8 @@ class Strelka::AuthProvider
 	log_to :strelka
 
 
-	### PluginFactory API -- return the Array of directories to search for concrete
-	### AuthProvider classes.
-	def self::derivative_dirs
-		return ['strelka/authprovider']
-	end
+	# Pluggability API -- Specify the list of prefixes to try when loading plugins
+	plugin_prefixes 'strelka/authprovider'
 
 
 	#################################################################

data/lib/strelka/httprequest/auth.rb

@@ -4,7 +4,7 @@ require 'strelka/constants'
 require 'strelka/httprequest' unless defined?( Strelka::HTTPRequest )
 
 
-# The mixin that adds methods to Strelka::HTTPRequest for 
+# The mixin that adds methods to Strelka::HTTPRequest for
 # authentication/authorization.
 module Strelka::HTTPRequest::Auth
 	include Strelka::Constants

data/lib/strelka/httpresponse.rb

@@ -111,7 +111,7 @@ class Strelka::HTTPResponse < Mongrel2::HTTPResponse
 
 	### Add a charset to the content-type header in +headers+ if possible.
 	def add_content_type_charset( headers )
-		return unless headers.content_type && 
+		return unless headers.content_type &&
 			headers.content_type.start_with?( 'text' )
 
 		charset = self.find_header_charset

data/lib/strelka/paramvalidator.rb

@@ -914,7 +914,7 @@ class Strelka::ParamValidator
 	end
 
 
-	### Return an Array of error messages, one for each field present in the parameters in the last 
+	### Return an Array of error messages, one for each field present in the parameters in the last
 	### validation that didn't have a constraint associated with it.
 	def unknown_param_errors
 		self.log.debug "Fetching unknown param errors for %p." % [ self.unknown ]

data/lib/strelka/router.rb

@@ -3,7 +3,7 @@
 # encoding: utf-8
 
 require 'loggability'
-require 'pluginfactory'
+require 'pluggability'
 
 require 'strelka' unless defined?( Strelka )
 require 'strelka/app' unless defined?( Strelka::App )
@@ -24,18 +24,15 @@ require 'strelka/mixins'
 # <tt>strelka/router/{something}.rb</tt>, and be sure to override the
 # #add_route and #route_request methods.
 class Strelka::Router
-	extend Loggability
-	include PluginFactory,
-	        Strelka::AbstractClass
+	extend Loggability,
+	       Pluggability
+	include Strelka::AbstractClass
 
 	# Loggability API -- set up logging under the 'strelka' log host
 	log_to :strelka
 
-
-	### PluginFactory API -- return the Array of directories to search for plugins.
-	def self::derivative_dirs
-		return ['strelka/router']
-	end
+	# Pluggability API -- Specify the list of prefixes to try when loading plugins
+	plugin_prefixes 'strelka/router'
 
 
 	### Create a new router that will route requests according to the specified
@@ -64,7 +61,7 @@ class Strelka::Router
 	# {RFC 2616}[http://tools.ietf.org/html/rfc2616#section-9] as a Symbol (e.g.,
 	# +:GET+, +:DELETE+). The +path_array+ will be the route path split up by
 	# path separator. The +routing_info+ is a Hash that contains the action
-   	# that will be run when the route matches, routing options, and any other
+	# that will be run when the route matches, routing options, and any other
 	# routing information associated with the route.
 	pure_virtual :add_route
 

data/lib/strelka/session.rb

@@ -2,7 +2,7 @@
 # vim: set nosta noet ts=4 sw=4:
 
 require 'digest/sha1'
-require 'pluginfactory'
+require 'pluggability'
 require 'loggability'
 
 require 'strelka' unless defined?( Strelka )
@@ -43,19 +43,16 @@ require 'strelka/mixins'
 #
 #
 class Strelka::Session
-	extend Loggability
-	include PluginFactory,
-	        Strelka::AbstractClass
+	extend Loggability,
+	       Pluggability
+	include Strelka::AbstractClass
+
 
 	# Loggability API -- set up logging under the 'strelka' log host
 	log_to :strelka
 
-
-	### PluginFactory API -- return the Array of directories to search for concrete
-	### Session classes.
-	def self::derivative_dirs
-		return ['strelka/session']
-	end
+	# Pluggability API -- Specify the list of prefixes to try when loading plugins
+	plugin_prefixes 'strelka/session'
 
 
 	### Configure the session class with the given +options+, which should be a

data/spec/strelka/app/auth_spec.rb

@@ -363,7 +363,7 @@ describe Strelka::App::Auth do
 			@app.no_auth_for( '' ) {|req| req.verb == :GET }
 			@app.require_perms_for %r{.*}, :it_assets_webapp
 			@app.require_perms_for( %r{.*}, :@sysadmin ) {|req, m| req.verb != :GET }
-			
+
 			app = @app.new
 
 			req = @request_factory.get( '/api/v1' )

data/spec/strelka/app/restresources_spec.rb

@@ -309,7 +309,7 @@ describe Strelka::App::RestResources do
 					body.first.should be_a( Hash )
 					body.first['port'].should > 1024
 				end
-								
+
 				it "has a GET route for methods declared in a named dataset module" do
 					req = @request_factory.get( '/api/v1/servers/by_name/Step',
 						 :accept => 'application/json' )

data/spec/strelka/authprovider_spec.rb

@@ -32,7 +32,7 @@ describe Strelka::AuthProvider do
 
 
 	it "looks for plugins under strelka/authprovider" do
-		described_class.derivative_dirs.should include( 'strelka/authprovider' )
+		described_class.plugin_prefixes.should include( 'strelka/authprovider' )
 	end
 
 

data/spec/strelka/router_spec.rb

@@ -33,7 +33,7 @@ describe Strelka::Router do
 
 
 	it "looks for plugins under strelka/router" do
-		Strelka::Router.derivative_dirs.should include( 'strelka/router' )
+		Strelka::Router.plugin_prefixes.should include( 'strelka/router' )
 	end
 
 

data/spec/strelka/session_spec.rb

@@ -32,7 +32,7 @@ describe Strelka::Session do
 
 
 	it "looks for plugins under strelka/session" do
-		described_class.derivative_dirs.should include( 'strelka/session' )
+		described_class.plugin_prefixes.should include( 'strelka/session' )
 	end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strelka
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Michael Granger
@@ -30,7 +30,7 @@ cert_chain:
   6mKCwjpegytE0oifXfF8k75A9105cBnNiMZOe1tXiqYc/exCgWvbggurzDOcRkZu
   /YSusaiDXHKU2O3Akc3htA==
   -----END CERTIFICATE-----
-date: 2013-03-01 00:00:00.000000000 Z
+date: 2013-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configurability
@@ -80,14 +80,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: loggability
   requirement: !ruby/object:Gem::Requirement
@@ -117,19 +117,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.36'
 - !ruby/object:Gem::Dependency
-  name: pluginfactory
+  name: pluggability
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: sysexits
   requirement: !ruby/object:Gem::Requirement