strelka 0.0.1.pre.279 → 0.0.1.pre.284

data/ChangeLog

@@ -1,3 +1,44 @@
+2012-07-17  Michael Granger  <ged@FaerieMUD.org>
+
+	* bin/strelka, lib/strelka/app/restresources.rb,
+	lib/strelka/httpresponse/negotiation.rb,
+	lib/strelka/paramvalidator.rb, spec/lib/helpers.rb,
+	spec/strelka/app/restresources_spec.rb,
+	spec/strelka/paramvalidator_spec.rb:
+	Clean up some :restresources behavior
+	[153e65a22805] [tip]
+
+2012-07-16  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/strelka/httpresponse.rb, spec/strelka/httpresponse_spec.rb:
+	Bugfix for content-type-less responses
+	[3540a46a9b25]
+
+2012-07-13  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/strelka/httpresponse/negotiation.rb:
+	Add a default stringifier (#to_s) to
+	Strelka::HTTPResponse::Negotiation
+	[4fe7c945616b]
+
+	* lib/strelka/app/restresources.rb:
+	Fix the OPTIONS action in the :restresources plugin
+	[b832003605e0]
+
+	* .rvm.gems, Rakefile:
+	Bump mongrel2 dependency
+	[6149242307af]
+
+2012-07-12  Michael Granger  <ged@FaerieMUD.org>
+
+	* .rvm.gems, Rakefile:
+	Bump the mongrel2 dependency
+	[389401bb6480]
+
+	* lib/strelka/app/restresources.rb:
+	Fix a buggy log message.
+	[75f9be31cb8c]
+
 2012-07-06  Michael Granger  <ged@FaerieMUD.org>
 
 	* .rvm.gems, Rakefile, lib/strelka/app/templating.rb:
@@ -6,7 +47,7 @@
 	- bump Inversion dependency for encoding support
 	- Use the default_internal encoding or UTF-8 if that isn't set as the
 	encoding of templates loaded by the :templating plugin.
-	[4f7bb0f3a8f7] [tip]
+	[4f7bb0f3a8f7]
 
 	* Manifest.txt:
 	Add multipart-form support files to the manifest

data/Rakefile

@@ -28,7 +28,7 @@ hoespec = Hoe.spec 'strelka' do
 	self.dependency 'highline',        '~> 1.6'
 	self.dependency 'inversion',       '~> 0.11'
 	self.dependency 'loggability',     '~> 0.4'
-	self.dependency 'mongrel2',        '~> 0.28'
+	self.dependency 'mongrel2',        '~> 0.29'
 	self.dependency 'pluginfactory',   '~> 1.0'
 	self.dependency 'sysexits',        '~> 1.0'
 	self.dependency 'trollop',         '~> 1.16'

data/bin/strelka

@@ -295,8 +295,8 @@ class Strelka::CLICommand
 		]
 		fork do
 			self.log.debug "  in the child."
-			apps = Strelka::App.load( path )
 			Strelka.load_config( self.options.config ) if self.options.config
+			apps = Strelka::App.load( path )
 			self.log.debug "  loaded: %p" % [ apps ]
 			apps.first.run
 		end

data/lib/strelka/app/restresources.rb

@@ -4,6 +4,7 @@
 
 require 'set'
 require 'sequel'
+require 'sequel/extensions/pretty_table'
 
 require 'strelka' unless defined?( Strelka )
 require 'strelka/app' unless defined?( Strelka::App )
@@ -64,7 +65,8 @@ module Strelka::App::RestResources
 
 	# Class methods to add to classes with REST resources.
 	module ClassMethods # :nodoc:
-		include Sequel::Inflections
+		include Sequel::Inflections,
+		        Strelka::Constants
 
 		# Set of verbs that are valid for a resource, keyed by the resource path
 		@resource_verbs = Hash.new {|h,k| h[k] = Set.new }
@@ -83,13 +85,12 @@ module Strelka::App::RestResources
 		def self::extended( obj )
 			super
 
+			# Enable text tables for text/plain responses
+			Sequel.extension( :pretty_table )
+
 			# Load the plugins this one depends on if they aren't already
 			obj.plugins :routing, :negotiation, :parameters
 
-			# Add validations for the limit and offset parameters
-			obj.param :limit, :integer
-			obj.param :offset, :integer
-
 			# Use the 'exclusive' router instead of the more-flexible
 			# Mongrel2-style default one
 			obj.router :exclusive
@@ -120,12 +121,20 @@ module Strelka::App::RestResources
 			self.log.debug "Adding REST resource for %p" % [ rsrcobj ]
 			options = self.service_options.merge( options )
 
+			# Add a parameter for the primary key
+			pkey = rsrcobj.primary_key
+			pkey_schema = rsrcobj.db_schema[ pkey.to_sym ] or
+				raise ArgumentError,
+					"cannot generate services for %p: resource has no schema" % [ rsrcobj ]
+			self.param( pkey, pkey_schema[:type] ) unless
+				self.paramvalidator.param_names.include?( pkey.to_s )
+
 			# Figure out what the resource name is, and make the route from it
 			name = options[:name] || rsrcobj.implicit_table_name
 			route = [ options[:prefix], name ].compact.join( '/' )
 
-			# Set up parameters
-			self.add_parameters( rsrcobj, options )
+			# Ensure validated parameters are untainted
+			self.untaint_all_constraints
 
 			# Make and install handler methods
 			self.log.debug "  adding readers"
@@ -150,17 +159,6 @@ module Strelka::App::RestResources
 		end
 
 
-		### Add parameter declarations for parameters related to +rsrcobj+.
-		def add_parameters( rsrcobj, options )
-			self.log.debug "Declaring validations for columns from %p" % [ rsrcobj ]
-			self.untaint_all_constraints
-			rsrcobj.db_schema.each do |col, config|
-				self.log.debug "  %s (%p)" % [ col, config[:type] ]
-				param col, config[:type]
-			end
-		end
-
-
 		### Add a handler method for discovery for the specified +rsrcobj+.
 		### OPTIONS /resources
 		def add_options_handler( route, rsrcobj, options )
@@ -168,14 +166,29 @@ module Strelka::App::RestResources
 			self.log.debug "Adding OPTIONS handler for %s (%p)" % [ route, rsrcobj ]
 			self.add_route( :OPTIONS, route, options ) do |req|
 				self.log.debug "OPTIONS handler!"
-				verbs = self.class.resource_verbs[ route ].sort
 				res = req.response
 
+				# Gather up metadata describing the resource
+				verbs = self.class.resource_verbs[ route ].sort
+				columns = rsrcobj.allowed_columns || rsrcobj.columns
+				attributes = columns.each_with_object({}) do |col, hash|
+					hash[ col ] = rsrcobj.db_schema[ col ][:type]
+				end
+
 				self.log.debug "  making a reply with Allowed: %s" % [ verbs.join(', ') ]
 				res.header.allowed = verbs.join(', ')
-				res.content_type = 'text/plain'
-				res.body = ''
-				res.status = HTTP::OK
+				res.for( :json, :yaml ) do |req|
+					{
+						'methods' => verbs,
+						'attributes' => attributes,
+					}
+				end
+				res.for( :text ) do
+					"Methods: #{verbs.join(', ')}\n" +
+					"Attributes: \n" +
+					attributes.map {|name,type| "  "}
+				end
+
 
 				return res
 			end
@@ -184,9 +197,8 @@ module Strelka::App::RestResources
 		end
 
 
-		### Add a handler method for reading a single instance of the specified +rsrcobj+, which should be a
-		### Sequel::Model class or a ducktype-alike.
-		### GET /resources/{id}
+		### Add a handler method for reading a single instance of the specified +rsrcobj+, which
+		### should be a Sequel::Model class or a ducktype-alike. GET /resources/{id}
 		def add_read_handler( route_prefix, rsrcobj, options )
 			pkey = rsrcobj.primary_key
 			route = "#{route_prefix}/:#{pkey}"
@@ -202,6 +214,7 @@ module Strelka::App::RestResources
 
 				res = req.response
 				res.for( :json, :yaml ) { resource }
+				res.for( :text ) { Sequel::PrettyTable.string(resource) }
 
 				return res
 			end
@@ -210,19 +223,36 @@ module Strelka::App::RestResources
 		end
 
 
-		### Add a handler method for reading a collection of the specified +rsrcobj+, which should be a
-		### Sequel::Model class or a ducktype-alike.
+		### Add a handler method for reading a collection of the specified +rsrcobj+, which should
+		### be a Sequel::Model class or a ducktype-alike.
 		### GET /resources
 		def add_collection_read_handler( route, rsrcobj, options )
-			self.log.debug "Creating handler for reading collections of %p: GET %s" % [ rsrcobj, route ]
+			self.log.debug "Creating handler for reading collections of %p: GET %s" %
+				[ rsrcobj, route ]
+
+			# Make a column regexp for validating the order field
+			colunion = Regexp.union( (rsrcobj.allowed_columns || rsrcobj.columns).map(&:to_s) )
+			colre = /^(?<column>#{colunion})$/
+
 			self.add_route( :GET, route, options ) do |req|
+				# Add validations for limit, offset, and order parameters
+				req.params.add :limit, :integer
+				req.params.add :offset, :integer
+				req.params.add :order, colre
+
 				finish_with( HTTP::BAD_REQUEST, req.params.error_messages.join("\n") ) unless
 					req.params.okay?
 
-				limit, offset = req.params.values_at( :limit, :offset )
+				limit, offset, order = req.params.values_at( :limit, :offset, :order )
 				res = req.response
 
 				dataset = rsrcobj.dataset
+				if order
+					order = Array( order ).map( &:to_sym )
+					self.log.debug "Ordering result set by %p" % [ order ]
+					dataset = dataset.order( *order )
+				end
+
 				if limit
 					self.log.debug "Limiting result set to %p records" % [ limit ]
 					dataset = dataset.limit( limit, offset )
@@ -230,6 +260,7 @@ module Strelka::App::RestResources
 
 				self.log.debug "Returning collection: %s" % [ dataset.sql ]
 				res.for( :json, :yaml ) { dataset.all }
+				res.for( :text ) { Sequel::PrettyTable.string(dataset) }
 
 				return res
 			end
@@ -241,9 +272,11 @@ module Strelka::App::RestResources
 		### Add a handler method for creating a new instance of +rsrcobj+.
 		### POST /resources
 		def add_collection_create_handler( route, rsrcobj, options )
-			self.log.debug "Creating handler for creating %p resources: POST %s" % [ rsrcobj, route ]
+			self.log.debug "Creating handler for creating %p resources: POST %s" %
+				[ rsrcobj, route ]
 
 			self.add_route( :POST, route, options ) do |req|
+				add_resource_params( req, rsrcobj )
 				finish_with( HTTP::BAD_REQUEST, req.params.error_messages.join(", ") ) unless
 					req.params.okay?
 
@@ -279,8 +312,10 @@ module Strelka::App::RestResources
 			pkey = rsrcobj.primary_key
 			route = "#{route_prefix}/:#{pkey}"
 
-			self.log.debug "Creating handler for creating %p resources: POST %s" % [ rsrcobj, route ]
+			self.log.debug "Creating handler for creating %p resources: POST %s" %
+				[ rsrcobj, route ]
 			self.add_route( :PUT, route, options ) do |req|
+				add_resource_params( req, rsrcobj )
 				finish_with( HTTP::BAD_REQUEST, req.params.error_messages.join(", ") ) unless
 					req.params.okay?
 
@@ -312,9 +347,11 @@ module Strelka::App::RestResources
 		### PUT /resources
 		def add_collection_update_handler( route, rsrcobj, options )
 			pkey = rsrcobj.primary_key
-			self.log.debug "Creating handler for updating every %p resources: PUT %s" % [ rsrcobj, route ]
+			self.log.debug "Creating handler for updating every %p resources: PUT %s" %
+				[ rsrcobj, route ]
 
 			self.add_route( :PUT, route, options ) do |req|
+				add_resource_params( req, rsrcobj )
 				finish_with( HTTP::BAD_REQUEST, req.params.error_messages.join(", ") ) unless
 					req.params.okay?
 
@@ -341,8 +378,8 @@ module Strelka::App::RestResources
 		end
 
 
-		### Add a handler method for deleting an instance of +rsrcobj+ with +route_prefix+ as the base
-		### URI path.
+		### Add a handler method for deleting an instance of +rsrcobj+ with +route_prefix+ as the
+		### base URI path.
 		### DELETE /resources/{id}
 		def add_delete_handler( route_prefix, rsrcobj, options )
 			pkey = rsrcobj.primary_key
@@ -442,8 +479,13 @@ module Strelka::App::RestResources
 		def add_dataset_read_handler( path, rsrcobj, dsname, param, options )
 			self.log.debug "Adding dataset method read handler: %s" % [ path ]
 
+			config = rsrcobj.db_schema[ param ] or
+				raise ArgumentError, "no such column %p for %p" % [ col, rsrcobj ]
+			param( param, config[:type] )
+
 			self.add_route( :GET, path, options ) do |req|
-				self.log.debug "Resource dataset GET request for dataset %s on %p" % [ dsname, rsrcobj ]
+				self.log.debug "Resource dataset GET request for dataset %s on %p" %
+					[ dsname, rsrcobj ]
 				finish_with( HTTP::BAD_REQUEST, req.params.error_messages.join("\n") ) unless
 					req.params.okay?
 
@@ -464,6 +506,7 @@ module Strelka::App::RestResources
 				# :TODO: Handle other mediatypes
 				self.log.debug "  returning collection: %s" % [ dataset.sql ]
 				res.for( :json, :yaml ) { dataset.all }
+				res.for( :text ) { Sequel::PrettyTable.string(dataset) }
 
 				return res
 			end
@@ -473,10 +516,18 @@ module Strelka::App::RestResources
 		### Add a GET route for the specified +association+ of the +rsrcobj+ at the given
 		### +path+.
 		def add_composite_read_handler( path, rsrcobj, association, options )
-			pkey = rsrcobj.primary_key
 			self.log.debug "Adding composite read handler for association: %s" % [ association ]
 
+			pkey = rsrcobj.primary_key
+			colunion = Regexp.union( (rsrcobj.allowed_columns || rsrcobj.columns).map(&:to_s) )
+			colre = /^(?<column>#{colunion})$/
+
 			self.add_route( :GET, path, options ) do |req|
+
+				# Add validations for limit, offset, and order parameters
+				req.params.add :limit, :integer
+				req.params.add :offset, :integer
+				req.params.add :order, colre
 				finish_with( HTTP::BAD_REQUEST, req.params.error_messages.join("\n") ) unless
 					req.params.okay?
 
@@ -486,24 +537,31 @@ module Strelka::App::RestResources
 
 				# Look up the resource, and if it exists, use it to fetch its associated
 				# objects
-				rsrcobj.db.transaction do
-					resource = rsrcobj[ id ] or
-						finish_with( HTTP::NOT_FOUND, "No such %s [%p]" % [rsrcobj.table_name, id] )
-
-					# Apply limit and offset parameters if they exist
-					limit, offset = req.params.values_at( :limit, :offset )
-					dataset = resource.send( "#{association}_dataset" )
-					if limit
-						self.log.debug "Limiting result set to %p records" % [ limit ]
-						dataset = dataset.limit( limit, offset )
-					end
+				resource = rsrcobj[ id ] or
+					finish_with( HTTP::NOT_FOUND, "No such %s [%p]" % [rsrcobj.table_name, id] )
+
+				limit, offset, order = req.params.values_at( :limit, :offset, :order )
+				dataset = resource.send( "#{association}_dataset" )
+
+				# Apply the order parameter if it exists
+				if order
+					order = Array( order ).map( &:to_sym )
+					self.log.debug "Ordering result set by %p" % [ order ]
+					dataset = dataset.order( *order )
+				end
 
-					# Fetch and return the records as JSON or YAML
-					# :TODO: Handle other mediatypes
-					self.log.debug "Returning collection: %s" % [ dataset.sql ]
-					res.for( :json, :yaml ) { dataset.all }
+				# Apply limit and offset parameters if they exist
+				if limit
+					self.log.debug "Limiting result set to %p records" % [ limit ]
+					dataset = dataset.limit( limit, offset )
 				end
 
+				# Fetch and return the records as JSON or YAML
+				# :TODO: Handle other mediatypes
+				self.log.debug "Returning collection: %s" % [ dataset.sql ]
+				res.for( :json, :yaml ) { dataset.all }
+				res.for( :text ) { Sequel::PrettyTable.string(dataset) }
+
 				return res
 			end
 		end
@@ -518,4 +576,22 @@ module Strelka::App::RestResources
 		super
 	end
 
+
+	#######
+	private
+	#######
+
+	### Add parameter validations for the given +columns+ of the specified resource object +rsrcobj+
+	### to the specified +req+uest. 
+	def add_resource_params( req, rsrcobj, *columns )
+		columns = rsrcobj.allowed_columns || rsrcobj.columns if columns.empty?
+
+		columns.each do |col|
+			config = rsrcobj.db_schema[ col ] or
+				raise ArgumentError, "no such column %p for %p" % [ col, rsrcobj ]
+			req.params.add( col, config[:type] ) unless req.params.param_names.include?( col.to_s )
+		end
+
+	end
+
 end # module Strelka::App::RestResources

data/lib/strelka/httpresponse.rb

@@ -111,7 +111,8 @@ 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.start_with?( 'text' )
+		return unless headers.content_type && 
+			headers.content_type.start_with?( 'text' )
 
 		charset = self.find_header_charset
 		self.log.debug "Setting the charset in the content-type header to: %p" % [ charset.name ]

data/lib/strelka/httpresponse/negotiation.rb

@@ -49,6 +49,7 @@ module Strelka::HTTPResponse::Negotiation
 	STRINGIFIERS = {
 		'application/x-yaml' => YAML.method( :dump ),
 		'application/json'   => Yajl.method( :dump ),
+		'text/plain'         => Proc.new {|obj| obj.to_s },
 	}
 
 	# Transcoding to Unicode is likely enough to work to warrant auto-transcoding. These
@@ -333,7 +334,7 @@ module Strelka::HTTPResponse::Negotiation
 
 		new_body = callback.call( mimetype ) or return false
 
-		self.log.debug "  successfully transformed! Setting up response."
+		self.log.debug "  successfully transformed: %p! Setting up response." % [ new_body ]
 		new_body = STRINGIFIERS[ mimetype ].call( new_body ) if
 			STRINGIFIERS.key?( mimetype ) && !new_body.is_a?( String )
 

data/lib/strelka/paramvalidator.rb

@@ -279,12 +279,18 @@ class Strelka::ParamValidator < ::FormValidator
 	### a constraint, a description, and one or more flags.
 	def add( name, *args, &block )
 		name = name.to_s
-		raise ArgumentError,
-			"parameter %p is already defined; perhaps you meant to use #override?" % [name] if
-			self.param_names.include?( name )
+		constraint = self.make_param_validator( name, args, &block )
+
+		# No-op if there's already a parameter with the same name and constraint
+		if self.param_names.include?( name )
+			return if self.profile[:constraints][ name ] == constraint
+			raise ArgumentError,
+				"parameter %p is already defined as a '%s'; perhaps you meant to use #override?" %
+					[ name, self.profile[:constraints][name] ]
+		end
 
 		self.log.debug "Adding parameter '%s' to profile" % [ name ]
-		self.set_param( name, *args, &block )
+		self.set_param( name, constraint, *args, &block )
 	end
 
 
@@ -296,8 +302,30 @@ class Strelka::ParamValidator < ::FormValidator
 			"no parameter %p defined; perhaps you meant to use #add?" % [name] unless
 			self.param_names.include?( name )
 
+		constraint = self.make_param_validator( name, args, &block )
 		self.log.debug "Overriding parameter '%s' in profile" % [ name ]
-		self.set_param( name, *args, &block )
+		self.set_param( name, constraint, *args, &block )
+	end
+
+
+	### Extract a validator from the given +args+ and return it.
+	def make_param_validator( name, args, &block )
+		self.log.debug "Finding param validator out of: %s, %p, %p" % [ name, args, block ]
+		args.unshift( block ) if block
+
+		# Custom validator -- either a callback or a regex
+		if args.first.is_a?( Regexp ) || args.first.respond_to?( :call )
+			return args.shift
+
+		# Builtin match validator, either explicit or implied by the name
+		else
+			return args.shift if args.first.is_a?( Symbol ) && !FLAGS.include?( args.first )
+
+			raise ArgumentError, "no builtin %p validator" % [ name ] unless
+				self.respond_to?( "match_#{name}" )
+			return name
+		end
+
 	end
 
 
@@ -376,23 +404,8 @@ class Strelka::ParamValidator < ::FormValidator
 
 	### Set the parameter +name+ in the profile to validate using the given +args+,
 	### which are the same as the ones passed to #add and #override.
-	def set_param( name, *args, &block )
-		args.unshift( block ) if block
-
-		# Custom validator -- either a callback or a regex
-		if args.first.is_a?( Regexp ) ||
-			args.first.respond_to?( :call )
-			self.profile[:constraints][ name ] = args.shift
-
-		# Builtin match validator, either explicit or implied by the name
-		else
-			constraint = args.shift if args.first.is_a?( Symbol ) && !FLAGS.include?( args.first )
-			constraint ||= name
-
-			raise ArgumentError, "no builtin %p validator" % [ constraint ] unless
-				self.respond_to?( "match_#{constraint}" )
-			self.profile[:constraints][ name ] = constraint
-		end
+	def set_param( name, validator, *args, &block )
+		self.profile[:constraints][ name ] = validator
 
 		self.profile[:descriptions][ name ] = args.shift if args.first.is_a?( String )
 
@@ -407,7 +420,7 @@ class Strelka::ParamValidator < ::FormValidator
 		if args.include?( :untaint )
 			self.profile[:untaint_constraint_fields] |= [ name ]
 		else
-			self.profile[:untaint_constraint_fields].delete( :name )
+			self.profile[:untaint_constraint_fields].delete( name )
 		end
 
 		self.revalidate if self.validated?

data/spec/lib/helpers.rb

@@ -41,6 +41,8 @@ require 'strelka'
 
 require 'spec/lib/constants'
 
+Loggability.format_with( :color ) if $stdout.tty?
+
 
 ### RSpec helper functions.
 module Strelka::SpecHelpers

data/spec/strelka/app/restresources_spec.rb

@@ -28,7 +28,7 @@ describe Strelka::App::RestResources do
 	include Mongrel2::Config::DSL
 
 	before( :all ) do
-		setup_logging( :fatal )
+		setup_logging()
 		setup_config_db()
 
 		@request_factory = Mongrel2::RequestFactory.new( route: '/api/v1' )
@@ -42,7 +42,7 @@ describe Strelka::App::RestResources do
 	it_should_behave_like( "A Strelka::App Plugin" )
 
 
-	describe "an including App" do
+	describe "included in an App" do
 
 		before( :each ) do
 			@app = Class.new( Strelka::App ) do
@@ -54,7 +54,7 @@ describe Strelka::App::RestResources do
 		end
 
 
-		it "knows what resources are mounted where" do
+		it "keeps track of what resources are mounted where" do
 			@app.resource_verbs.should be_a( Hash )
 			@app.resource_verbs.should be_empty()
 		end
@@ -70,7 +70,7 @@ describe Strelka::App::RestResources do
 				end
 			end
 
-			it "knows about the mounted resource" do
+			it "keeps track of what resources are mounted where" do
 				@app.resource_verbs.should have( 1 ).member
 				@app.resource_verbs.should include( 'servers' )
 				@app.resource_verbs[ 'servers' ].
@@ -107,7 +107,7 @@ describe Strelka::App::RestResources do
 				end
 			end
 
-			it "knows about the mounted resource" do
+			it "keeps track of what resources are mounted where" do
 				@app.resource_verbs.should have( 1 ).member
 				@app.resource_verbs.should include( 'servers' )
 				@app.resource_verbs[ 'servers' ].
@@ -136,17 +136,20 @@ describe Strelka::App::RestResources do
 		end
 
 
-		describe "route behaviors" do
+		describe "auto-generates routes:" do
 
 			before( :each ) do
 				# Create two servers in the config db to test with
 				server 'test-server' do
+					name "Test"
 					host 'main'
 					host 'monitor'
 					host 'adminpanel'
 					host 'api'
 				end
-				server 'step-server'
+				server 'step-server' do
+					name 'Step'
+				end
 
 				@app.class_eval do
 					resource Mongrel2::Config::Server
@@ -158,7 +161,8 @@ describe Strelka::App::RestResources do
 				Mongrel2::Config.subclasses.each {|klass| klass.truncate }
 			end
 
-			context "OPTIONS routes" do
+
+			context "OPTIONS route" do
 
 				it "responds to a top-level OPTIONS request with a resource description (JSON Schema?)"
 
@@ -173,7 +177,7 @@ describe Strelka::App::RestResources do
 			end # OPTIONS routes
 
 
-			context "GET routes" do
+			context "GET route" do
 				it "has a GET route to fetch the resource collection" do
 					req = @request_factory.get( '/api/v1/servers', 'Accept' => 'application/json' )
 					res = @app.new.handle( req )
@@ -209,6 +213,31 @@ describe Strelka::App::RestResources do
 					body[0]['uuid'].should == 'step-server'
 				end
 
+				it "supports ordering the result by a single column" do
+					req = @request_factory.get( '/api/v1/servers?order=name', 'Accept' => 'application/json' )
+					res = @app.new.handle( req )
+
+					res.status.should == HTTP::OK
+					res.content_type.should == 'application/json'
+					body = Yajl.load( res.body )
+
+					body.should have( 2 ).members
+					body[0]['name'].should == 'Step'
+				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' )
+					res = @app.new.handle( req )
+
+					res.status.should == HTTP::OK
+					res.content_type.should == 'application/json'
+					body = Yajl.load( res.body )
+
+					body.should have( 2 ).members
+					body[0]['name'].should == 'Test'
+				end
+
 				it "has a GET route to fetch a single resource by its ID" do
 					req = @request_factory.get( '/api/v1/servers/1', 'Accept' => 'application/json' )
 					res = @app.new.handle( req )
@@ -282,7 +311,7 @@ describe Strelka::App::RestResources do
 			end # GET routes
 
 
-			context "POST routes" do
+			context "POST route" do
 
 				before( :each ) do
 					@server_values = {
@@ -330,7 +359,7 @@ describe Strelka::App::RestResources do
 			end # POST routes
 
 
-			context "PUT routes" do
+			context "PUT route" do
 
 				before( :each ) do
 					@posted_values = {
@@ -368,7 +397,7 @@ describe Strelka::App::RestResources do
 			end # PUT routes
 
 
-			context "DELETE routes" do
+			context "DELETE route" do
 
 				it "has a DELETE route to delete single instances in the resource collection" do
 					req = @request_factory.delete( '/api/v1/servers/1' )
@@ -395,7 +424,7 @@ describe Strelka::App::RestResources do
 		end # route behaviors
 
 
-		describe "supports inheritance" do
+		describe "supports inheritance:" do
 
 			subject do
 				@app.resource( Mongrel2::Config::Server )

data/spec/strelka/httpresponse_spec.rb

@@ -94,6 +94,10 @@ describe Strelka::HTTPResponse do
 		@res.header_data.should_not =~ /charset/i
 	end
 
+	it "doesn't try to add an encoding to a response that doesn't have a content type" do
+		@res.content_type = nil
+		@res.header_data.should_not =~ /charset/
+	end
 
 	it "adds a Content-encoding header if there is one encoding" do
 		@res.encodings << 'gzip'

data/spec/strelka/paramvalidator_spec.rb

@@ -57,14 +57,19 @@ describe Strelka::ParamValidator do
 			@validator.param_names.should include( 'a_field' )
 		end
 
-		it "doesn't allow a constraint to be added twice" do
+		it "ignores identical duplicate constraints to be added twice" do
+			@validator.add( :a_field, :string )
 			@validator.add( :a_field, :string )
-			expect {
-				@validator.add( :a_field, :string )
-			}.to raise_error( /parameter "a_field" is already defined/i )
 			@validator.param_names.should include( 'a_field' )
 		end
 
+		it "throws an error if a constraint is re-added with different values" do
+			@validator.add( :a_field, :string )
+			expect {
+				@validator.add( :a_field, :integer )
+			}.to raise_error( /parameter "a_field" is already defined as a 'string'/i )
+		end
+
 		it "allows an existing constraint to be overridden" do
 			@validator.add( :a_field, :string )
 			@validator.override( :a_field, :integer )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strelka
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre.279
+  version: 0.0.1.pre.284
   prerelease: 
 platform: ruby
 authors:
@@ -36,7 +36,7 @@ cert_chain:
   YUhDS0xaZFNLai9SSHVUT3QrZ2JsUmV4OEZBaDhOZUEKY21saFhlNDZwWk5K
   Z1dLYnhaYWg4NWpJang5NWhSOHZPSStOQU01aUg5a09xSzEzRHJ4YWNUS1Bo
   cWo1UGp3RgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2012-07-12 00:00:00.000000000 Z
+date: 2012-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configurability
@@ -141,7 +141,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.28'
+        version: '0.29'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -149,7 +149,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.28'
+        version: '0.29'
 - !ruby/object:Gem::Dependency
   name: pluginfactory
   requirement: !ruby/object:Gem::Requirement