strelka 0.5.0 → 0.6.0.pre.409

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6d4fe519bbd4afaacce50262948b7a079041378
-  data.tar.gz: 8c38f999384187837c9b15b9786c60a8099aa4fe
+  metadata.gz: 50a4d91af69f2c2c769b0083c519c0236f507de6
+  data.tar.gz: ea34b00f822a1844b3b71d60c3dd6ab8217d4c23
 SHA512:
-  metadata.gz: 367d122a8c1ca23bb8e49a172e273a5a2b6baba2f0bdae38f576871649ae76637dcd75cf90d3f926852010058c7fab7b9d4ca081da5e056b5d3d1cf91169ff3c
-  data.tar.gz: 7da4ade4e80c6a066e20d20748167f583f2536ae18d078798db28a428742f52c76c57ff527e5dfa400f81a175a3cad9988d96b9658f00c0ff0b74fee54aa051d
+  metadata.gz: 664324eea627f727cef57d61a5b1e8e274a55cb19fdbc1acb7a73ec7b6db70d57247ecb65acf08065b7678d6daf7d1b4607c839b4e5b1f6029884ffa95028dc2
+  data.tar.gz: 328780a90b04272bc1b2bdb57735bcd9b7d06a3ea651e28cee8ed0beb2d283ba719d0e599f3e265e0de7cd2be40176671c43a0d77dfb387daff4a249fae8f6b3

data/ChangeLog

@@ -1,9 +1,113 @@
+2013-06-12  Michael Granger  <ged@FaerieMUD.org>
+
+	* Rakefile:
+	Add Mahlon (finally) as an author
+	[d0a7eba63c10] [tip]
+
+	* lib/strelka/httprequest.rb, spec/strelka/httprequest_spec.rb:
+	Make HTTPRequest#params always return a Hash
+	[ad9220ddef52]
+
+	* .rvm.gems:
+	Bump the safe_yaml version to the latest.
+	[dbac1c7bdd06]
+
+2013-06-07  Michael Granger  <ged@FaerieMUD.org>
+
+	* .rvm.gems, Rakefile:
+	Bump dependency on Loggability and Configurability
+	[9ec05ec558e5]
+
+2013-05-31  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/strelka/app/restresources.rb:
+	Add some planned features to restresources
+	[c068b5d7039e]
+
+	* .rvm.gems:
+	Fix the rspec version in the RMV gemset
+	[da790bc36db7]
+
+	* .rvm.gems, Rakefile, lib/strelka/httprequest.rb,
+	lib/strelka/session/db.rb, spec/strelka/httprequest_spec.rb:
+	Use the safe_yaml gem for loading untrusted request bodies.
+	[ce0387824c10] [github/master]
+
+	* lib/strelka/paramvalidator.rb, spec/strelka/paramvalidator_spec.rb:
+	Fix validator for literal "false" (via JSON)
+	[b59828d371a8]
+
+2013-05-17  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.5.0 for changeset 600f4e4d8f65
+	[762c320af7d0]
+
+	* .hgsigs:
+	Added signature for changeset 80db7acd42dc
+	[600f4e4d8f65] [v0.5.0]
+
+	* History.rdoc, lib/strelka.rb:
+	Bump the minor version and update history.
+	[80db7acd42dc]
+
+	* experiments/codeobjects.rb:
+	Add an experiment
+	[96d7a4bdc444]
+
+	* lib/strelka/paramvalidator.rb, spec/strelka/paramvalidator_spec.rb:
+	Add :datetime builtin validator
+	[54367e5f3cee]
+
+	* lib/strelka/app/restresources.rb:
+	Add checklist for planned features to restresource header
+	[a12acfcd0108]
+
+2013-05-08  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/strelka/paramvalidator.rb, spec/strelka/paramvalidator_spec.rb:
+	Add builtin validators for various checksums.
+	[6d2e2cfbd5f3]
+
+2013-05-02  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/strelka/app/negotiation.rb,
+	lib/strelka/httpresponse/negotiation.rb,
+	spec/strelka/app/negotiation_spec.rb,
+	spec/strelka/httpresponse/negotiation_spec.rb:
+	Wire up custom mediatype handlers to content negotiation. Fixes #5.
+	[6a0e777a42ad]
+
+2013-03-28  Michael Granger  <ged@FaerieMUD.org>
+
+	* .rvm.gems, Rakefile:
+	Bump Pluggability dependency
+	[cae6b252a20b]
+
 2013-03-26  Michael Granger  <ged@FaerieMUD.org>
 
+	* .hgtags:
+	Added tag v0.4.0 for changeset bf131e4f535c
+	[84261d71f9ac]
+
+	* .hgsigs:
+	Added signature for changeset 49ae27e4588e
+	[bf131e4f535c] [v0.4.0]
+
+	* History.rdoc, lib/strelka.rb:
+	Bump minor version, update history.
+	[49ae27e4588e]
+
+	* lib/strelka.rb, lib/strelka/app.rb, spec/strelka/app_spec.rb,
+	spec/strelka_spec.rb:
+	Handle Strelka::App subclass inheritance, add Strelka::App syntactic
+	sugar.
+	[e43f773141e5]
+
 	* bin/strelka, lib/strelka/app.rb:
 	Pull app finder code from bin/strelka up into a Strelka::App class
 	method.
-	[715de56560f6] [tip]
+	[715de56560f6]
 
 	* .rvm.gems, Rakefile:
 	Update deps, add fivefish doc option only in development
@@ -67,7 +171,7 @@
 
 	* .rvm.gems, Rakefile:
 	Update dependency for configurability.
-	[8e7f432be135] [github/master]
+	[8e7f432be135]
 
 2013-02-27  Michael Granger  <ged@FaerieMUD.org>
 

data/History.rdoc

@@ -1,3 +1,14 @@
+== v0.6.0 [2013-06-12] Michael Granger <ged@FaerieMUD.org>
+
+- Bump dependency on Loggability and Configurability
+- Add some planned features to restresources
+- Fix the rspec version in the RMV gemset
+- Use the safe_yaml gem for loading untrusted request bodies.
+- Fix validator for literal "false" (via JSON)
+- Change HTTPRequest#params to consistently return a Hash, regardless of
+  whether or not the request body is one.
+
+
 == v0.5.0 [2013-05-17] Michael Granger <ged@FaerieMUD.org>
 
 - Add :datetime builtin validator

data/Rakefile

@@ -19,22 +19,25 @@ hoespec = Hoe.spec 'strelka' do
 	self.history_file = 'History.rdoc'
 	self.extra_rdoc_files = FileList[ '*.rdoc' ]
 
+	self.developer 'Mahlon E. Smith', 'mahlon@martini.nu'
 	self.developer 'Michael Granger', 'ged@FaerieMUD.org'
 
 	self.dependency 'configurability', '~> 2.0'
 	self.dependency 'foreman',         '~> 0.62'
 	self.dependency 'highline',        '~> 1.6'
 	self.dependency 'inversion',       '~> 0.12'
-	self.dependency 'loggability',     '~> 0.5'
+	self.dependency 'loggability',     '~> 0.6'
 	self.dependency 'mongrel2',        '~> 0.36'
 	self.dependency 'pluggability',    '~> 0.2'
 	self.dependency 'sysexits',        '~> 1.1'
 	self.dependency 'trollop',         '~> 2.0'
 	self.dependency 'uuidtools',       '~> 2.1'
+	self.dependency 'safe_yaml',       '~> 0.9'
 
-	self.dependency 'hoe-deveiate',            '~> 0.1', :developer
-	self.dependency 'simplecov',               '~> 0.7', :developer
-	self.dependency 'rdoc-generator-fivefish', '~> 0.2', :developer
+	self.dependency 'hoe-deveiate',            '~> 0.1',  :developer
+	self.dependency 'rspec',                   '~> 0.14', :developer
+	self.dependency 'simplecov',               '~> 0.7',  :developer
+	self.dependency 'rdoc-generator-fivefish', '~> 0.2',  :developer
 
 	self.spec_extras[:licenses] = ["BSD"]
 	self.spec_extras[:rdoc_options] = [

data/lib/strelka.rb

@@ -24,10 +24,10 @@ module Strelka
 	log_as :strelka
 
 	# Library version constant
-	VERSION = '0.5.0'
+	VERSION = '0.6.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 80db7acd42dc $
+	REVISION = %q$Revision: a043d61c759c $
 
 	require 'strelka/constants'
 	require 'strelka/exceptions'

data/lib/strelka/app/restresources.rb

@@ -47,6 +47,8 @@ require 'strelka/app' unless defined?( Strelka::App )
 #
 # [√] Composite resources generated from associations
 # [ ] Honor If-unmodified-since and If-match headers
+# [ ] Support the 'fields' parameter for GET /collection
+# [ ] Support reverse-ordering (via '-fieldname'?)
 # [ ] Caching support (ETag, If-modified-since)
 # [ ] Means of tailoring responses for requests for which the response
 #     isn't clearly specified in the RFC (DELETE /resource)

data/lib/strelka/httprequest.rb

@@ -3,7 +3,7 @@
 # encoding: utf-8
 
 require 'yajl'
-require 'yaml'
+require 'safe_yaml'
 require 'uri'
 require 'loggability'
 
@@ -127,24 +127,32 @@ class Strelka::HTTPRequest < Mongrel2::HTTPRequest
 
 	### Parse the request parameters and return them as a Hash. For GET requests, these are
 	### taken from the query arguments.  For requests that commonly
-	### contain an entity-body, try and parse that.
+	### contain an entity-body, this method will attempt to parse that.
 	###
 	###   # For a handler with a route of '/user', for the request:
 	###   # "GET /user/1/profile?checkbox=1&checkbox=2&text=foo HTTP/1.1"
 	###   # r.params
 	###   # => {"checkbox"=>["1", "2"], "text"=>"foo"}
+	###
+	### If the request body is not a Hash, an empty Hash with the body's value as the default
+	### value will be returned instead.
 	def params
 		unless @params
+			value = nil
+
 			case self.verb
 			when :GET, :HEAD
-				@params = self.parse_query_args
+				value = self.parse_query_args
 			when :POST, :PUT
-				@params = self.parse_form_data
+				value = self.parse_form_data
 			when :TRACE
 				self.log.debug "No parameters for a TRACE request."
 			else
-				@params = self.parse_form_data if self.content_type
+				value = self.parse_form_data if self.content_type
 			end
+
+			value = Hash.new( value ) unless value.is_a?( Hash )
+			@params = value
 		end
 
 		return @params
@@ -203,7 +211,7 @@ class Strelka::HTTPRequest < Mongrel2::HTTPRequest
 		when 'application/json', 'text/javascript'
 			return Yajl.load( self.body )
 		when 'text/x-yaml', 'application/x-yaml'
-			return YAML.load( self.body )
+			return YAML.load( self.body, safe: true )
 		when 'multipart/form-data'
 			boundary = self.content_type[ /\bboundary=(\S+)/, 1 ] or
 				raise Strelka::ParseError, "no boundary found for form data: %p" %

data/lib/strelka/paramvalidator.rb

@@ -728,6 +728,8 @@ class Strelka::ParamValidator
 		params = stringify_keys( params )
 		@fields = deep_copy( params )
 
+		self.log.debug "Starting validation with fields: %p" % [ @fields ]
+
 		# Use the constraints list to extract all the parameters that have corresponding
 		# constraints
 		self.constraints.each do |field, constraint|
@@ -751,7 +753,7 @@ class Strelka::ParamValidator
 	### the given +value+, and add the field to the appropriate field list based on the
 	### result.
 	def apply_constraint( constraint, value )
-		if value
+		if !value.nil?
 			result = constraint.apply( value, self.untaint_all? )
 
 			if !result.nil?
@@ -807,9 +809,11 @@ class Strelka::ParamValidator
 	def valid
 		self.validate unless self.validated?
 
+		self.log.debug "Building valid fields hash from raw data: %p" % [ @valid ]
 		unless @parsed_params
 			@parsed_params = {}
 			for key, value in @valid
+				self.log.debug "  adding %s: %p" % [ key, value ]
 				value = [ value ] if key.to_s.end_with?( '[]' )
 				if key.to_s.include?( '[' )
 					build_deep_hash( value, @parsed_params, get_levels(key.to_s) )

data/lib/strelka/session/db.rb

@@ -87,7 +87,11 @@ class Strelka::Session::Db < Strelka::Session::Default
 	### Load a session instance from storage using the given +session_id+.
 	def self::load( session_id )
 		session_row = self.dataset.filter( :session_id => session_id ).first
-		session = session_row.nil? ? {} : YAML.load( session_row[:session] )
+		session = if session_row.nil?
+				{}
+			else
+				YAML.load( session_row[:session], safe: false )
+			end
 		return new( session_id, session )
 	end
 

data/spec/strelka/httprequest_spec.rb

@@ -38,43 +38,43 @@ describe Strelka::HTTPRequest do
 		end
 
 		it "knows what the request's parsed URI is" do
-			@req.uri.should be_a( URI )
-			@req.uri.to_s.should == 'http://localhost:8080/directory/userinfo/ged'
+			expect( @req.uri ).to be_a( URI )
+			expect( @req.uri.to_s ).to eq( 'http://localhost:8080/directory/userinfo/ged' )
 		end
 
 		it "knows what the request's parsed URI is when it's an HTTPS request" do
 			@req.headers.url_scheme = 'https'
-			@req.uri.should be_a( URI )
-			@req.uri.to_s.should == 'https://localhost:8080/directory/userinfo/ged'
+			expect( @req.uri ).to be_a( URI )
+			expect( @req.uri.to_s ).to eq( 'https://localhost:8080/directory/userinfo/ged' )
 		end
 
 		it "doesn't error when run under earlier versions of Mongrel that didn't set the " +
 		   "url-scheme header" do
 			@req.headers.url_scheme = nil
-			@req.uri.should be_a( URI )
-			@req.uri.to_s.should == 'http://localhost:8080/directory/userinfo/ged'
+			expect( @req.uri ).to be_a( URI )
+			expect( @req.uri.to_s ).to eq( 'http://localhost:8080/directory/userinfo/ged' )
 		end
 
 		it "knows what Mongrel2 route it followed" do
-			@req.pattern.should == '/directory'
+			expect( @req.pattern ).to eq( '/directory' )
 		end
 
 		it "knows what the URI of the route handling the request is" do
-			@req.base_uri.should be_a( URI )
-			@req.base_uri.to_s.should == 'http://localhost:8080/directory'
+			expect( @req.base_uri ).to be_a( URI )
+			expect( @req.base_uri.to_s ).to eq( 'http://localhost:8080/directory' )
 		end
 
 		it "knows what the path of the request past its route is" do
-			@req.app_path.should == '/userinfo/ged'
+			expect( @req.app_path ).to eq( '/userinfo/ged' )
 		end
 
 		it "knows what HTTP verb the request used" do
-			@req.verb.should == :GET
+			expect( @req.verb ).to eq(:GET)
 		end
 
 		it "can get and set notes for communication between plugins" do
-			@req.notes.should be_a( Hash )
-			@req.notes[:routing].should be_a( Hash )
+			expect( @req.notes ).to be_a( Hash )
+			expect( @req.notes[:routing] ).to be_a( Hash )
 		end
 
 		it "can redirect the request to a different URI" do
@@ -97,21 +97,21 @@ describe Strelka::HTTPRequest do
 		end
 
 		it "knows what the request's parsed URI is" do
-			@req.uri.should be_a( URI )
-			@req.uri.to_s.should == 'http://localhost:8080/directory/user%20info/ged%00'
+			expect( @req.uri ).to be_a( URI )
+			expect( @req.uri.to_s ).to eq( 'http://localhost:8080/directory/user%20info/ged%00' )
 		end
 
 		it "knows what Mongrel2 route it followed" do
-			@req.pattern.should == "/directory"
+			expect( @req.pattern ).to eq('/directory')
 		end
 
 		it "knows what the URI of the route handling the request is" do
-			@req.base_uri.should be_a( URI )
-			@req.base_uri.to_s.should == 'http://localhost:8080/directory'
+			expect( @req.base_uri ).to be_a( URI )
+			expect( @req.base_uri.to_s ).to eq( 'http://localhost:8080/directory' )
 		end
 
 		it "knows what the path of the request past its route is" do
-			@req.app_path.should == "/user info/ged\0"
+			expect( @req.app_path ).to eq("/user info/ged\0")
 		end
 
 	end
@@ -124,26 +124,26 @@ describe Strelka::HTTPRequest do
 		end
 
 		it "knows what the request's parsed URI is" do
-			@req.uri.should be_a( URI )
-			@req.uri.to_s.should == 'http://localhost:8080/directory/userinfo/ged?limit=10;offset=20'
+			expect( @req.uri ).to be_a( URI )
+			expect( @req.uri.to_s ).to eq( 'http://localhost:8080/directory/userinfo/ged?limit=10;offset=20' )
 		end
 
 		it "knows what Mongrel2 route it followed" do
-			@req.pattern.should == '/directory'
+			expect( @req.pattern ).to eq( '/directory' )
 		end
 
 		it "knows what the URI of the route handling the request is" do
-			@req.base_uri.should be_a( URI )
-			@req.base_uri.to_s.should == 'http://localhost:8080/directory'
+			expect( @req.base_uri ).to be_a( URI )
+			expect( @req.base_uri.to_s ).to eq( 'http://localhost:8080/directory' )
 		end
 
 		it "knows what the path of the request past its route is" do
-			@req.app_path.should == '/userinfo/ged'
-			@req.app_path.should == '/userinfo/ged' # make sure the slice is non-destructive
+			expect( @req.app_path ).to eq( '/userinfo/ged' )
+			expect( @req.app_path ).to eq( '/userinfo/ged' ) # make sure the slice is non-destructive
 		end
 
 		it "knows what HTTP verb the request used" do
-			@req.verb.should == :GET
+			expect( @req.verb ).to eq(:GET)
 		end
 
 	end
@@ -154,53 +154,53 @@ describe Strelka::HTTPRequest do
 		context "a GET request" do
 			it "has an empty params Hash if the request doesn't have a query string " do
 				req = @request_factory.get( '/directory/path' )
-				req.params.should == {}
+				expect( req.params ).to eq({})
 			end
 
 			it "has a params Hash with the key/value pair in it if the query string has " +
 			   "one key/value pair" do
 				req = @request_factory.get( '/directory/path?foo=bar' )
-				req.params.should == {'foo' => 'bar'}
+				expect( req.params ).to eq({'foo' => 'bar'})
 			end
 
 			it "has a params Hash with the key/value pairs in it if the query string has " +
 			   "two pairs seperated with a an ampersand" do
 				req = @request_factory.get( '/directory/path?foo=bar&chunky=pork' )
-				req.params.should == {
+				expect( req.params ).to eq({
 					'foo'    => 'bar',
 					'chunky' => 'pork',
-				}
+				})
 			end
 
 			it "has a params Hash with the key/value pairs in it if the query string has " +
 			   "two pairs with a semi-colon separator" do
 				req = @request_factory.get( '/directory/path?potato=gun;legume=bazooka' )
-				req.params.should == {
+				expect( req.params ).to  eq({
 					'potato' => 'gun',
 					'legume' => 'bazooka',
-				}
+				})
 			end
 
 			it "has a params Hash with an Array of values if the query string has two values " +
 			   "for the same key" do
 				req = @request_factory.get( '/directory/path?foo=bar&foo=baz' )
-				req.params.should == {
+				expect( req.params ).to eq({
 					'foo'    => ['bar', 'baz'],
-				}
+				})
 			end
 
 			it "has a params Hash with one Array of values and a scalar value if the query " +
 			   "string has three values and two keys" do
 				req = @request_factory.get( '/directory/path?foo=bar&foo=pork;mirror=sequel' )
-				req.params.should == {
+				expect( req.params ).to eq({
 					'foo'    => ['bar', 'pork'],
 					'mirror' => 'sequel',
-				}
+				})
 			end
 
 			it "treats a malformed query string as the lack of a query" do
 				req = @request_factory.get( '/directory/path?foo' )
-				req.params.should == {}
+				expect( req.params ).to eq({})
 			end
 		end
 
@@ -211,8 +211,8 @@ describe Strelka::HTTPRequest do
 			end
 
 
-			it "Doesn't respond with a 400 (BAD_REQUEST)" do
-				@req.params.should be_nil
+			it "params are all nil" do
+				expect( @req.params[:foo] ).to be_nil
 			end
 		end
 
@@ -231,7 +231,7 @@ describe Strelka::HTTPRequest do
 					%{I really don't like this path.\r\n} +
 					%{----a_boundary--\r\n}
 
-				@req.params.should == {'reason' => "I really don't like this path."}
+				expect( @req.params ).to eq({'reason' => "I really don't like this path."})
 			end
 
 		end
@@ -267,46 +267,46 @@ describe Strelka::HTTPRequest do
 
 			it "returns an empty Hash for an empty body" do
 				@req.body = ''
-				@req.params.should == {}
+				expect( @req.params['foo'] ).to be_nil
 			end
 
 			it "has a params Hash with the key/value pair in it if the form data has " +
 			   "one key/value pair" do
 				@req.body = 'foo=bar'
-				@req.params.should == {'foo' => 'bar'}
+				expect( @req.params ).to eq({'foo' => 'bar'})
 			end
 
 			it "has a params Hash with the key/value pairs in it if the form data has " +
 			   "two pairs seperated with a an ampersand" do
 				@req.body = 'foo=bar&chunky=pork'
-				@req.params.should == {
+				expect( @req.params ).to eq({
 					'foo'    => 'bar',
 					'chunky' => 'pork',
-				}
+				})
 			end
 
 			it "has a params Hash with the key/value pairs in it if the form data has " +
 			   "two pairs with a semi-colon separator" do
 				@req.body = 'potato=gun;legume=bazooka'
-				@req.params.should == {
+				expect( @req.params ).to eq({
 					'potato' => 'gun',
 					'legume' => 'bazooka',
-				}
+				})
 			end
 
 			it "has a params Hash with an Array of values if the form data has two values " +
 			   "for the same key" do
 				@req.body = 'foo=bar&foo=baz'
-				@req.params.should == { 'foo' => ['bar', 'baz'] }
+				expect( @req.params ).to eq({ 'foo' => ['bar', 'baz'] })
 			end
 
 			it "has a params Hash with one Array of values and a scalar value if the form " +
 			   "data has three values and two keys" do
 				@req.body = 'foo=bar&foo=pork;mirror=sequel'
-				@req.params.should == {
+				expect( @req.params ).to eq({
 					'foo'    => ['bar', 'pork'],
 					'mirror' => 'sequel',
-				}
+				})
 			end
 		end
 
@@ -324,7 +324,7 @@ describe Strelka::HTTPRequest do
 					%{An Impossible Task\r\n} +
 					%{----a_boundary--\r\n}
 
-				@req.params.should == {'title' => 'An Impossible Task'}
+				expect( @req.params ).to eq({'title' => 'An Impossible Task'})
 			end
 
 		end
@@ -336,18 +336,77 @@ describe Strelka::HTTPRequest do
 					'Content-type' => 'application/json' )
 			end
 
-			it "returns nil for an empty body" do
+			it "returns a default params hash for an empty body" do
 				@req.body = ''
-				@req.params.should be_nil()
+				expect( @req.params[:foo] ).to be_nil
 			end
 
-			it "has the JSON data as the params if it has a body with JSON object in it" do
+			it "has the JSON data as the params if it has a body with a JSON object in it" do
 				data = {
 					'animal' => 'ducky',
 					'adjectives' => ['fluffy', 'puddle-ey'],
 				}
 				@req.body = Yajl.dump( data )
-				@req.params.should == data
+				expect( @req.params ).to eq( data )
+			end
+
+			it "has the array as the default param value if the body has a JSON array in it" do
+				data = %w[an array of stuff]
+				@req.body = Yajl.dump( data )
+				expect( @req.params[:foo] ).to eq( data )
+			end
+
+		end
+
+		context "a POST request with a 'text/x-yaml' body" do
+			before( :each ) do
+				@req = @request_factory.post( '/directory/path', '',
+					'Content-type' => 'text/x-yaml' )
+			end
+
+			it "returns a params hash in which all values are nil for an empty body" do
+				@req.body = ''
+				expect( @req.params[:profile] ).to be_false
+			end
+
+			it "has the YAML data as the params if it has a body with YAML in it" do
+				data = {
+					'animal' => 'ducky',
+					'adjectives' => ['fluffy', 'puddle-ey'],
+				}
+				@req.body = data.to_yaml
+				expect( @req.params ).to eq( data )
+			end
+
+			it "doesn't deserialize Symbols from the YAML body" do
+				data = {
+					animal: 'horsie',
+					adjectives: ['cuddly', 'stompery'],
+				}
+				@req.body = data.to_yaml
+
+				expect( @req.params.keys ).not_to include( :animal, :adjectives )
+			end
+
+			it "doesn't deserialize unsafe objects" do
+				obj = OpenStruct.new
+				obj.foo = 'stuff'
+				obj.bar = 'some other stuff'
+				@req.body = obj.to_yaml
+
+				expect( @req.params ).not_to be_a( OpenStruct )
+				expect( @req.params ).to eq({
+					"table" => {
+						":foo" => "stuff",
+						":bar" => "some other stuff"
+					},
+					"modifiable"=>true
+				})
+			end
+
+			it "handles null entity bodies by returning an empty Hash" do
+				@req.body = ''
+				expect( @req.params ).to eq( {} )
 			end
 
 		end
@@ -364,16 +423,16 @@ describe Strelka::HTTPRequest do
 
 		it "parses a single cookie into a cookieset with the cookie in it" do
 			@req.header.cookie = 'foom=chuckUfarly'
-			@req.cookies.should have( 1 ).member
-			@req.cookies['foom'].value.should == 'chuckUfarly'
+			expect( @req.cookies ).to have( 1 ).member
+			expect( @req.cookies['foom'].value ).to eq( 'chuckUfarly' )
 		end
 
 		it "parses multiple cookies into a cookieset with multiple cookies in it" do
 			@req.header.cookie = 'foom=chuckUfarly; glarn=hotchinfalcheck'
 
-			@req.cookies.should have( 2 ).members
-			@req.cookies['foom'].value.should == 'chuckUfarly'
-			@req.cookies['glarn'].value.should == 'hotchinfalcheck'
+			expect( @req.cookies ).to have( 2 ).members
+			expect( @req.cookies['foom'].value ).to eq( 'chuckUfarly' )
+			expect( @req.cookies['glarn'].value ).to eq( 'hotchinfalcheck' )
 		end
 
 	end

data/spec/strelka/paramvalidator_spec.rb

@@ -508,7 +508,7 @@ describe Strelka::ParamValidator do
 				@validator[:enabled].should be_true()
 			end
 
-			it "accepts the value 'false'" do
+			it "accepts the string 'false'" do
 				@validator.validate( 'enabled' => 'false' )
 
 				@validator.should be_okay()
@@ -517,6 +517,15 @@ describe Strelka::ParamValidator do
 				@validator[:enabled].should be_false()
 			end
 
+			it "accepts the literal false value" do
+				@validator.validate( 'enabled' => false )
+
+				@validator.should be_okay()
+				@validator.should_not have_errors()
+
+				@validator[:enabled].should be_false()
+			end
+
 			it "accepts the value 'f'" do
 				@validator.validate( 'enabled' => 'f' )
 
@@ -562,6 +571,12 @@ describe Strelka::ParamValidator do
 				@validator[:enabled].should be_nil()
 			end
 
+			it "includes literal false values in the hash of valid data" do
+				@validator.validate( 'enabled' => false )
+
+				@validator.valid.should include( enabled: false )
+			end
+
 		end
 
 		describe ":integer constraints" do
@@ -596,6 +611,16 @@ describe Strelka::ParamValidator do
 				@validator[:count].should == -407
 			end
 
+			it "accepts literal integers" do
+				@validator.add( :count, :integer )
+				@validator.validate( 'count' => 118 )
+
+				@validator.should be_okay()
+				@validator.should_not have_errors()
+
+				@validator[:count].should == 118
+			end
+
 			it "rejects non-integers" do
 				@validator.add( :count, :integer )
 				@validator.validate( 'count' => '11.1' )

metadata

@@ -1,9 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: strelka
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0.pre.409
 platform: ruby
 authors:
+- Mahlon E. Smith
 - Michael Granger
 autorequire: 
 bindir: bin
@@ -30,7 +31,7 @@ cert_chain:
   6mKCwjpegytE0oifXfF8k75A9105cBnNiMZOe1tXiqYc/exCgWvbggurzDOcRkZu
   /YSusaiDXHKU2O3Akc3htA==
   -----END CERTIFICATE-----
-date: 2013-05-17 00:00:00.000000000 Z
+date: 2013-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configurability
@@ -94,14 +95,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: mongrel2
   requirement: !ruby/object:Gem::Requirement
@@ -172,6 +173,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: safe_yaml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
   requirement: !ruby/object:Gem::Requirement
@@ -228,6 +243,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -279,6 +308,7 @@ description: |-
   one of the first canine space travelers to orbit the Earth and return alive.
   Her name means "little arrow".
 email:
+- mahlon@martini.nu
 - ged@FaerieMUD.org
 executables:
 - strelka