strelka 0.1.0 → 0.2.0

data/lib/strelka/app/routing.rb

@@ -295,7 +295,7 @@ module Strelka::App::Routing
 			# Track which route was chosen for later plugins
 			request.notes[:routing][:route] = route
 			# Bind the action of the route and call it
-			return route[:action].bind( self ).call( request, &block )
+			return super { route[:action].bind( self ).call( request, &block ) }
 		else
 			finish_with HTTP::NOT_FOUND, "The requested resource was not found on this server."
 		end

data/lib/strelka/httprequest.rb

@@ -44,7 +44,7 @@ class Strelka::HTTPRequest < Mongrel2::HTTPRequest
 		@uri     = nil
 		@verb    = self.headers[:method].to_sym
 		@params  = nil
-		@notes   = Hash.new( &method(:autovivify) )
+		@notes   = Hash.new {|h,k| h[k] = {} }
 		@cookies = nil
 	end
 
@@ -174,7 +174,15 @@ class Strelka::HTTPRequest < Mongrel2::HTTPRequest
 	### ?arg1=yes&arg2=no&arg3  #=> {'arg1' => 'yes', 'arg2' => 'no', 'arg3' => nil}
 	def parse_query_args
 		return {} if self.uri.query.nil?
-		return merge_query_args( URI.decode_www_form(self.uri.query) )
+		query_args = begin
+			URI.decode_www_form( self.uri.query )
+		rescue => err
+			self.log.error "%p while parsing query %p: %s" %
+				[ err.class, self.uri.query, err.message ]
+			{}
+		end
+
+		return merge_query_args( query_args )
 	end
 
 

data/lib/strelka/httpresponse.rb

@@ -28,7 +28,7 @@ class Strelka::HTTPResponse < Mongrel2::HTTPResponse
 		@charset   = nil
 		@languages = []
 		@encodings = []
-		@notes     = Hash.new( &method(:autovivify) )
+		@notes     = Hash.new {|h,k| h[k] = {} }
 		@cookies   = nil
 
 		super
@@ -133,7 +133,7 @@ class Strelka::HTTPResponse < Mongrel2::HTTPResponse
 		return ( self.charset ||
 		         self.content_type_charset ||
 		         self.entity_body_charset  ||
-				 Encoding.default_internal ||
+			     Encoding.default_internal ||
 		         Encoding.default_external ||
 		         Encoding::ISO_8859_1 )
 	end

data/lib/strelka/paramvalidator.rb

@@ -2,12 +2,9 @@
 # vim: set nosta noet ts=4 sw=4:
 # encoding: utf-8
 
-#encoding: utf-8
-
 require 'uri'
 require 'forwardable'
 require 'date'
-require 'formvalidator'
 require 'loggability'
 
 require 'strelka/mixins'
@@ -53,7 +50,7 @@ require 'strelka/app' unless defined?( Strelka::App )
 #		return tmpl
 #	end
 #
-class Strelka::ParamValidator < ::FormValidator
+class Strelka::ParamValidator
 	extend Forwardable,
 		   Loggability,
 		   Strelka::MethodUtilities
@@ -379,6 +376,40 @@ class Strelka::ParamValidator < ::FormValidator
 			hostname = /\A(#{domainlabel}\.)*#{toplabel}\z/
 		end
 
+		# Validation regexp for JSON
+		# Converted to oniguruma syntax from the PCRE example at:
+		#   http://stackoverflow.com/questions/2583472/regex-to-validate-json
+		JSON_VALIDATOR_RE = begin
+			pair     = ''
+
+			json     = /^
+				(?<json> \s* (?:
+					# number
+					(?: 0 | -? [1-9]\d* (?:\.\d+)? (?:[eE][+-]?\d+)? )
+					 |
+					# boolean
+					(?: true | false | null )
+					 |
+					# string
+					"(?: [^"\\[:cntrl:]]* | \\["\\bfnrt\/] | \\u\p{XDigit}{4} )*"
+					 |
+					# array
+					\[ (?: \g<json> (?: , \g<json> )* )? \s* \]
+					 |
+					# object
+					\{
+						(?:
+							# first pair
+							\s* "(?: [^"\\]* | \\["\\bfnrt\/] | \\u\p{XDigit}{4} )*" \s* : \g<json>
+							# following pairs
+						    (?: , \s* "(?: [^"\\]* | \\["\\bfnrt\/] | \\u\p{XDigit}{4} )*" \s* : \g<json> )*
+						)?
+						\s*
+					\}
+				) \s* )
+			\z/ux
+		end
+
 		# The Hash of builtin constraints that are validated against a regular
 		# expression.
 		# :TODO: Document that these are the built-in constraints that can be used in a route
@@ -396,18 +427,40 @@ class Strelka::ParamValidator < ::FormValidator
 			:uri		  => /^(?<uri>#{URI::URI_REF})$/,
 			:uuid		  => /^(?<uuid>[[:xdigit:]]{8}(?:-[[:xdigit:]]{4}){3}-[[:xdigit:]]{12})$/i,
 			:date         => /.*\d.*/,
+			:json         => JSON_VALIDATOR_RE,
 		}
 
 		# Field values which result in a valid ‘true’ value for :boolean constraints
 		TRUE_VALUES = %w[t true y yes 1]
 
 
+		#
+		# Class methods
+		#
+
+		##
+		# Hash of named constraint patterns
+		singleton_attr_reader :constraint_patterns
+		@constraint_patterns = BUILTIN_CONSTRAINT_PATTERNS.dup
+
+
 		### Return true if name is the name of a built-in constraint.
 		def self::valid?( name )
 			return BUILTIN_CONSTRAINT_PATTERNS.key?( name.to_sym )
 		end
 
 
+		### Reset the named patterns to the defaults. Mostly used for testing.
+		def self::reset_constraint_patterns
+			@constraint_patterns.replace( BUILTIN_CONSTRAINT_PATTERNS )
+		end
+
+
+
+		#
+		# Instance methods
+		#
+
 		### Create a new BuiltinConstraint using the pattern named name for the specified field.
 		def initialize( field, name, *options, &block )
 			name ||= field
@@ -434,7 +487,7 @@ class Strelka::ParamValidator < ::FormValidator
 				return custom_block
 			else
 				post_processor = "post_process_%s" % [ @pattern_name ]
-				return nil unless self.respond_to?( post_processor )
+				return nil unless self.respond_to?( post_processor, true )
 				return self.method( post_processor )
 			end
 		end
@@ -710,12 +763,13 @@ class Strelka::ParamValidator < ::FormValidator
 	end
 
 
-	## Fetch the constraint/s that apply to the parameter named name as a Regexp, if possible.
+	## Fetch the constraint/s that apply to the parameter named +name+ as a Regexp, if possible.
 	def constraint_regexp_for( name )
 		self.log.debug "  searching for a constraint for %p" % [ name ]
 
 		# Fetch the constraint's regexp
-		constraint = self.constraints[ name.to_sym ]
+		constraint = self.constraints[ name.to_sym ] or
+			raise NameError, "no such parameter %p" % [ name ]
 		raise ScriptError,
 			"can't route on a parameter with a %p" % [ constraint.class ] unless
 			constraint.respond_to?( :pattern )
@@ -758,6 +812,7 @@ class Strelka::ParamValidator < ::FormValidator
 	### Index fetch operator; fetch the validated (and possible parsed) value for
 	### form field +key+.
 	def []( key )
+		self.validate unless self.validated?
 		return @valid[ key.to_sym ]
 	end
 
@@ -766,7 +821,7 @@ class Strelka::ParamValidator < ::FormValidator
 	### to the specified +val+.
 	def []=( key, val )
 		@parsed_params = nil
-		return @valid[ key.to_sym ] = val
+		@valid[ key.to_sym ] = val
 	end
 
 

data/spec/strelka/app/auth_spec.rb

@@ -234,7 +234,6 @@ describe Strelka::App::Auth do
 
 		end
 
-
 		it "allows negative auth criteria to be declared with a string" do
 			@app.no_auth_for( '/string' )
 			app = @app.new
@@ -268,10 +267,7 @@ describe Strelka::App::Auth do
 		end
 
 		it "allows negative auth criteria to be declared with a string and a block" do
-			@app.no_auth_for( 'string' ) do |req|
-				Strelka.log.debug "Checking request verb: %p" % [ req.verb ]
-				req.verb == :GET
-			end
+			@app.no_auth_for( 'string' ) {|req| req.verb == :GET }
 
 			app = @app.new
 
@@ -309,8 +305,8 @@ describe Strelka::App::Auth do
 		it "allows negative auth criteria to be declared with just a block" do
 			@app.no_auth_for do |req|
 				req.app_path == '/foom' &&
-				req.verb == :GET &&
-				req.headers.accept.include?( 'text/plain' )
+					req.verb == :GET &&
+					req.headers.accept.include?( 'text/plain' )
 			end
 
 			app = @app.new
@@ -351,10 +347,9 @@ describe Strelka::App::Auth do
 		end
 
 		it "allows perms criteria to be declared with a string and a block" do
-			@app.require_perms_for( '/string' ) do |req|
-				perms = [:stringperm, :otherperm]
-				perms << :rawdata if req.headers.accept && req.headers.accept =~ /json/i
-				perms
+			@app.require_perms_for( '/string', :stringperm, :otherperm )
+			@app.require_perms_for( '/string', :rawdata ) do |req|
+				req.headers.accept && req.headers.accept =~ /json/i
 			end
 			app = @app.new
 
@@ -364,34 +359,60 @@ describe Strelka::App::Auth do
 			app.required_perms_for( req ).should == []
 		end
 
+		it "allows multiple perms criteria for the same path" 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' )
+			app.required_perms_for( req ).should == [ :it_assets_webapp ]
+			req = @request_factory.post( '/api/v1' )
+			app.required_perms_for( req ).should == [ :it_assets_webapp, :@sysadmin ]
+			req = @request_factory.get( '/api/v1/users' )
+			app.required_perms_for( req ).should == [ :it_assets_webapp ]
+			req = @request_factory.post( '/api/v1/users' )
+			app.required_perms_for( req ).should == [ :it_assets_webapp, :@sysadmin ]
+		end
+
 		it "allows perms criteria to be declared with a regexp and a block" do
-			@app.require_perms_for( %r{^/admin(/(?<username>\w+))?} ) do |req, match|
-				perms = [:admin]
-				perms << match[:username].to_sym if match[:username]
-				perms
+			userclass = Class.new do
+				def self::[]( username )
+					self.new(username)
+				end
+				def initialize( username ); @username = username; end
+				def is_admin?
+					@username == 'madeline'
+				end
+			end
+			@app.require_perms_for( %r{^/user}, :admin )
+			@app.require_perms_for( %r{^/user(/(?<username>\w+))?}, :superuser ) do |req, match|
+				user = userclass[ match[:username] ]
+				user.is_admin?
 			end
 			app = @app.new
 
-			req = @request_factory.get( '/api/v1/admin' )
+			req = @request_factory.get( '/api/v1/user' )
 			app.required_perms_for( req ).should == [ :admin ]
-			req = @request_factory.get( '/api/v1/admin/jzero' )
-			app.required_perms_for( req ).should == [ :admin, :jzero ]
-			req = @request_factory.get( '/api/v1/users' )
-			app.required_perms_for( req ).should == []
+			req = @request_factory.get( '/api/v1/user/jzero' )
+			app.required_perms_for( req ).should == [ :admin ]
+			req = @request_factory.get( '/api/v1/user/madeline' )
+			app.required_perms_for( req ).should == [ :admin, :superuser ]
 		end
 
-		it "allows perms criteria to be declared with just a block" do
+		it "allows perms the same as the appid to be declared with just a block" do
 			@app.require_perms_for do |req|
-				req.app_path.scan( %r{/(\w+)} ).flatten.map( &:to_sym )
+				req.verb != :GET
 			end
 			app = @app.new
 
-			req = @request_factory.get( '/api/v1/admin' )
-			app.required_perms_for( req ).should == [ :admin ]
-			req = @request_factory.get( '/api/v1/admin/jzero' )
-			app.required_perms_for( req ).should == [ :admin, :jzero ]
-			req = @request_factory.get( '/api/v1/users' )
-			app.required_perms_for( req ).should == [ :users ]
+			req = @request_factory.get( '/api/v1/accounts' )
+			app.required_perms_for( req ).should == []
+			req = @request_factory.post( '/api/v1/accounts', '' )
+			app.required_perms_for( req ).should == [ :auth_test ]
+			req = @request_factory.put( '/api/v1/accounts/1', '' )
+			app.required_perms_for( req ).should == [ :auth_test ]
 		end
 
 		it "allows negative perms criteria to be declared with a string" do
@@ -434,11 +455,7 @@ describe Strelka::App::Auth do
 			@app.no_perms_for( %r{^/collection/(?<collname>[^/]+)} ) do |req, match|
 				public_collections = %w[degasse ione champhion]
 				collname = match[:collname]
-				if public_collections.include?( collname )
-					true
-				else
-					false
-				end
+				public_collections.include?( collname )
 			end
 			app = @app.new
 

data/spec/strelka/app/filters_spec.rb

@@ -155,7 +155,7 @@ describe Strelka::App::Filters do
 				res = @app.new.handle( req )
 
 				req.notes[:saw][:request].should be_true()
-				res.notes[:saw][:response].should be_empty()
+				res.notes[:saw][:response].should be_nil()
 			end
 
 		end
@@ -194,7 +194,7 @@ describe Strelka::App::Filters do
 
 				res = @app.new.handle( req )
 
-				req.notes[:saw][:request].should be_empty()
+				req.notes[:saw][:request].should be_nil()
 				res.notes[:saw][:response].should be_true()
 			end
 

data/spec/strelka/app/parameters_spec.rb

@@ -64,7 +64,7 @@ describe Strelka::App::Parameters do
 			@app.paramvalidator.should be_a( Strelka::ParamValidator )
 		end
 
-		it "can declare a parameter with a validation pattern" do
+		it "can declare a parameter with a regular-expression constraint" do
 			@app.class_eval do
 				param :username, /\w+/i
 			end
@@ -72,6 +72,35 @@ describe Strelka::App::Parameters do
 			@app.paramvalidator.param_names.should == [ 'username' ]
 		end
 
+		it "can declare a parameter with a builtin constraint" do
+			@app.class_eval do
+				param :comment_body, :printable
+			end
+
+			@app.paramvalidator.param_names.should == [ 'comment_body' ]
+		end
+
+		it "can declare a parameter with a Proc constraint" do
+			@app.class_eval do
+				param :start_time do |val|
+					Time.parse( val ) rescue nil
+				end
+			end
+
+			@app.paramvalidator.param_names.should == [ 'start_time' ]
+		end
+
+
+		it "can declare a parameter with a block constraint" do
+			@app.class_eval do
+				param :created_at do |val|
+					Time.parse(val) rescue nil
+				end
+			end
+
+			@app.paramvalidator.param_names.should == [ 'created_at' ]
+		end
+
 
 		it "inherits parameters from its superclass" do
 			@app.class_eval do

data/spec/strelka/app/restresources_spec.rb

@@ -32,6 +32,15 @@ describe Strelka::App::RestResources do
 		setup_config_db()
 
 		@request_factory = Mongrel2::RequestFactory.new( route: '/api/v1' )
+
+		# Add some dataset methods via various alternative methods to ensure they show up too
+		name_selection = Module.new do
+			def by_name( name )
+				return self.filter( name: name )
+			end
+		end
+		Mongrel2::Config::Server.subset( :with_ephemeral_ports ) { port > 1024 }
+		Mongrel2::Config::Server.dataset_module( name_selection )
 	end
 
 	after( :all ) do
@@ -139,6 +148,8 @@ describe Strelka::App::RestResources do
 		describe "auto-generates routes:" do
 
 			before( :each ) do
+				Mongrel2::Config.subclasses.each {|klass| klass.truncate }
+
 				# Create two servers in the config db to test with
 				server 'test-server' do
 					name "Test"
@@ -146,6 +157,7 @@ describe Strelka::App::RestResources do
 					host 'monitor'
 					host 'adminpanel'
 					host 'api'
+					port 80
 				end
 				server 'step-server' do
 					name 'Step'
@@ -190,7 +202,8 @@ describe Strelka::App::RestResources do
 				end
 
 				it "supports limiting the result set when fetching the resource collection" do
-					req = @request_factory.get( '/api/v1/servers?limit=1', 'Accept' => 'application/json' )
+					req = @request_factory.get( '/api/v1/servers?limit=1',
+						'Accept' => 'application/json' )
 					res = @app.new.handle( req )
 
 					res.status.should == HTTP::OK
@@ -202,7 +215,8 @@ describe Strelka::App::RestResources do
 				end
 
 				it "supports paging the result set when fetching the resource collection" do
-					req = @request_factory.get( '/api/v1/servers?limit=1;offset=1', 'Accept' => 'application/json' )
+					req = @request_factory.get( '/api/v1/servers?limit=1;offset=1',
+						'Accept' => 'application/json' )
 					res = @app.new.handle( req )
 
 					res.status.should == HTTP::OK
@@ -214,7 +228,8 @@ describe Strelka::App::RestResources do
 				end
 
 				it "supports ordering the result by a single column" do
-					req = @request_factory.get( '/api/v1/servers?order=name', 'Accept' => 'application/json' )
+					req = @request_factory.get( '/api/v1/servers?order=name',
+						'Accept' => 'application/json' )
 					res = @app.new.handle( req )
 
 					res.status.should == HTTP::OK
@@ -226,8 +241,8 @@ describe Strelka::App::RestResources do
 				end
 
 				it "supports ordering the result by multiple columns" do
-					pending "fixing the multi-value paramvalidator bug"
-					req = @request_factory.get( '/api/v1/servers?order=id;order=name', 'Accept' => 'application/json' )
+					req = @request_factory.get( '/api/v1/servers?order=id;order=name',
+						 'Accept' => 'application/json' )
 					res = @app.new.handle( req )
 
 					res.status.should == HTTP::OK
@@ -268,7 +283,8 @@ describe Strelka::App::RestResources do
 				end
 
 				it "has a GET route for fetching the resource via one of its dataset methods" do
-					req = @request_factory.get( '/api/v1/servers/by_uuid/test-server', :accept => 'application/json' )
+					req = @request_factory.get( '/api/v1/servers/by_uuid/test-server',
+						 :accept => 'application/json' )
 					res = @app.new.handle( req )
 
 					res.status.should == HTTP::OK
@@ -280,6 +296,35 @@ describe Strelka::App::RestResources do
 					body.first['uuid'].should == 'test-server'
 				end
 
+				it "has a GET route for fetching the resource via a subset" do
+					req = @request_factory.get( '/api/v1/servers/with_ephemeral_ports',
+						:accept => 'application/json' )
+					res = @app.new.handle( req )
+
+					res.status.should == HTTP::OK
+					body = Yajl.load( res.body )
+
+					body.should be_an( Array )
+					body.should have( 1 ).member
+					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' )
+					res = @app.new.handle( req )
+
+					res.status.should == HTTP::OK
+					body = Yajl.load( res.body )
+
+					body.should be_an( Array )
+					body.should have( 1 ).member
+					body.first.should be_a( Hash )
+					body.first['name'].should == 'Step'
+				end
+
+
 				it "has a GET route for fetching the resource's associated objects" do
 					req = @request_factory.get( '/api/v1/servers/1/hosts' )
 					res = @app.new.handle( req )