strelka 0.7.0 → 0.8.0

data/spec/strelka/httprequest/session_spec.rb

@@ -107,12 +107,12 @@ describe Strelka::HTTPRequest::Session, "-extended request" do
 			end
 
 			it "knows when its session hasn't been loaded" do
-				expect( @req.session_loaded? ).to be_false()
+				expect( @req.session_loaded? ).to be_falsey()
 			end
 
 			it "knows when its session has been loaded" do
 				@req.session # Load it
-				expect( @req.session_loaded? ).to be_true()
+				expect( @req.session_loaded? ).to be_truthy()
 			end
 
 		end

data/spec/strelka/httprequest_spec.rb

@@ -192,9 +192,11 @@ describe Strelka::HTTPRequest do
 				})
 			end
 
-			it "treats a malformed query string as the lack of a query" do
+			it "responds with a 400 (BAD_REQUEST) for a malformed query string" do
 				req = @request_factory.get( '/directory/path?foo' )
-				expect( req.params ).to eq({})
+				expect {
+					req.params
+				}.to finish_with( HTTP::BAD_REQUEST, /malformed/i )
 			end
 		end
 
@@ -247,7 +249,7 @@ describe Strelka::HTTPRequest do
 
 				expect {
 					@req.params
-				}.to finish_with( HTTP::BAD_REQUEST, /no content type/i )
+				}.to finish_with( HTTP::BAD_REQUEST, /content type/i )
 			end
 		end
 
@@ -302,6 +304,14 @@ describe Strelka::HTTPRequest do
 					'mirror' => 'sequel',
 				})
 			end
+
+			it "responds with a 400 (BAD_REQUEST) for malformed parameters" do
+				@req.body = '<? skrip_kiddie_stuff ?>'
+				expect {
+					@req.params
+				}.to finish_with( HTTP::BAD_REQUEST, /malformed/i )
+			end
+
 		end
 
 		context "a POST request with a 'multipart/form-data' body" do
@@ -350,6 +360,13 @@ describe Strelka::HTTPRequest do
 				expect( @req.params[:foo] ).to eq( data )
 			end
 
+			it "responds with a 400 (BAD_REQUEST) for malformed JSON body" do
+				@req.body = '<? skrip_kiddie_stuff ?>'
+				expect {
+					@req.params
+				}.to finish_with( HTTP::BAD_REQUEST, /malformed/i )
+			end
+
 		end
 
 		context "a POST request with a 'text/x-yaml' body" do
@@ -360,7 +377,7 @@ describe Strelka::HTTPRequest do
 
 			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
+				expect( @req.params[:profile] ).to be_falsey
 			end
 
 			it "has the YAML data as the params if it has a body with YAML in it" do
@@ -403,6 +420,13 @@ describe Strelka::HTTPRequest do
 				expect( @req.params ).to eq( {} )
 			end
 
+			it "responds with a 400 (BAD_REQUEST) for malformed YAML body" do
+				@req.body = "---\npork:\nwoo\nhooooooooo\n\n"
+				expect {
+					@req.params
+				}.to finish_with( HTTP::BAD_REQUEST, /malformed/i )
+			end
+
 		end
 
 	end
@@ -417,18 +441,26 @@ describe Strelka::HTTPRequest do
 
 		it "parses a single cookie into a cookieset with the cookie in it" do
 			@req.header.cookie = 'foom=chuckUfarly'
-			expect( @req.cookies ).to have( 1 ).member
+			expect( @req.cookies.size ).to eq(  1  )
 			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'
 
-			expect( @req.cookies ).to have( 2 ).members
+			expect( @req.cookies.size ).to eq(  2  )
 			expect( @req.cookies['foom'].value ).to eq( 'chuckUfarly' )
 			expect( @req.cookies['glarn'].value ).to eq( 'hotchinfalcheck' )
 		end
 
+		it "responds with a 400 (BAD_REQUEST) response for malformed cookies" do
+			@req.header.cookie = 'pork'
+
+			expect {
+				@req.cookies
+			}.to finish_with( HTTP::BAD_REQUEST, /malformed/i )
+		end
+
 	end
 
 end

data/spec/strelka/httpresponse/session_spec.rb

@@ -122,16 +122,16 @@ describe Strelka::HTTPResponse::Session, "-extended response" do
 
 			it "knows that its session has been loaded if it has one" do
 				@res.session
-				expect( @res.session_loaded? ).to be_true()
+				expect( @res.session_loaded? ).to be_truthy()
 			end
 
 			it "knows that its session has been loaded if its request has one" do
 				@res.request.session
-				expect( @res.session_loaded? ).to be_true()
+				expect( @res.session_loaded? ).to be_truthy()
 			end
 
 			it "knows that its session hasn't been loaded if neither its request not itself has one" do
-				expect( @res.session_loaded? ).to be_false()
+				expect( @res.session_loaded? ).to be_falsey()
 			end
 
 			it "saves the session via itself if it was loaded" do

data/spec/strelka/mixins_spec.rb

@@ -19,8 +19,8 @@ describe Strelka, "mixins" do
 	describe Strelka::AbstractClass do
 
 		context "mixed into a class" do
-			it "will cause the including class to hide its ::new method" do
-				testclass = Class.new { include Strelka::AbstractClass }
+			it "will cause the extended class to hide its ::new method" do
+				testclass = Class.new { extend Strelka::AbstractClass }
 
 				expect {
 					testclass.new
@@ -34,7 +34,7 @@ describe Strelka, "mixins" do
 
 			before(:each) do
 				testclass = Class.new {
-					include Strelka::AbstractClass
+					extend Strelka::AbstractClass
 					pure_virtual :test_method
 				}
 				subclass = Class.new( testclass )

data/spec/strelka/multipartparser_spec.rb

@@ -77,7 +77,7 @@ describe Strelka::MultipartParser do
 
 		params = parser.parse
 
-		expect( params ).to have( 5 ).keys
+		expect( params.size ).to eq(  5  )
 		expect( params.keys ).to include( 'x-livejournal-entry' )
 		expect( params['velour-fog'] ).to match( /Sweet, sweet canday/i )
 	end
@@ -121,7 +121,7 @@ describe Strelka::MultipartParser do
 		params = parser.parse
 
 		expect( params['pork'] ).to be_an_instance_of( Array )
-		expect( params['pork'] ).to have( 2 ).members
+		expect( params['pork'].size ).to eq(  2  )
 		expect( params['pork'] ).to include( 'zoot' )
 		expect( params['pork'] ).to include( 'fornk' )
 

data/spec/strelka/paramvalidator_spec.rb

@@ -55,7 +55,7 @@ describe Strelka::ParamValidator do
 			@validator.validate( 'blorp' => 'true' )
 			expect( @validator[ :blorp ] ).to be_nil
 			@validator.add( :blorp, :boolean )
-			expect( @validator[ :blorp ] ).to be_true
+			expect( @validator[ :blorp ] ).to be_truthy
 		end
 
 		it "ignores identical duplicate constraints" do
@@ -148,7 +148,7 @@ describe Strelka::ParamValidator do
 			@validator.validate( 'number' => tainted_one )
 
 			expect( @validator[:number] ).to eq( "1" )
-			expect( @validator[:number].tainted? ).to be_false()
+			expect( @validator[:number].tainted? ).to be_falsey()
 		end
 
 		it "knows the names of fields that were required but missing from the parameters" do
@@ -158,7 +158,7 @@ describe Strelka::ParamValidator do
 			expect( @validator ).to have_errors()
 			expect( @validator ).to_not be_okay()
 
-			expect( @validator.missing ).to have(1).members
+			expect( @validator.missing.size ).to eq( 1 )
 			expect( @validator.missing ).to eq( ['id'] )
 		end
 
@@ -171,7 +171,7 @@ describe Strelka::ParamValidator do
 
 			expect( @validator.invalid ).to be_empty
 
-			expect( @validator.missing ).to have(1).members
+			expect( @validator.missing.size ).to eq( 1 )
 			expect( @validator.missing ).to eq( ['id'] )
 		end
 
@@ -182,7 +182,7 @@ describe Strelka::ParamValidator do
 			expect( @validator ).to have_errors()
 			expect( @validator ).to_not be_okay()
 
-			expect( @validator.invalid ).to have(1).keys
+			expect( @validator.invalid.size ).to eq( 1 )
 			expect( @validator.invalid.keys ).to eq( ['number'] )
 		end
 
@@ -205,7 +205,7 @@ describe Strelka::ParamValidator do
 			expect( @validator ).to have_errors()
 			expect( @validator ).to_not be_okay()
 
-			expect( @validator.error_fields ).to have(2).members
+			expect( @validator.error_fields.size ).to eq( 2 )
 			expect( @validator.error_fields ).to include('number')
 			expect( @validator.error_fields ).to include('id')
 		end
@@ -250,7 +250,7 @@ describe Strelka::ParamValidator do
 			@validator.add( :id, /^(\w{20})$/, :required )
 			@validator.validate( 'number' => 'rhinoceros', 'unknown' => "1" )
 
-			expect( @validator.error_messages ).to have(2).members
+			expect( @validator.error_messages.size ).to eq( 2 )
 			expect( @validator.error_messages ).to include("Missing value for 'Id'")
 			expect( @validator.error_messages ).to include("Invalid value for 'Number'")
 		end
@@ -260,7 +260,7 @@ describe Strelka::ParamValidator do
 			@validator.add( :id, /^(\w{20})$/, :required )
 			@validator.validate( 'number' => 'rhinoceros', 'unknown' => "1" )
 
-			expect( @validator.error_messages(true) ).to have(3).members
+			expect( @validator.error_messages(true).size ).to eq( 3 )
 			expect( @validator.error_messages(true) ).to include("Missing value for 'Id'")
 			expect( @validator.error_messages(true) ).to include("Invalid value for 'Number'")
 			expect( @validator.error_messages(true) ).to include("Unknown parameter 'Unknown'")
@@ -271,7 +271,7 @@ describe Strelka::ParamValidator do
 			@validator.add( :id, /^(\w{20})$/, "Test Name", :required )
 			@validator.validate( 'number' => 'rhinoceros', 'unknown' => "1" )
 
-			expect( @validator.error_messages ).to have(2).members
+			expect( @validator.error_messages.size ).to eq( 2 )
 			expect( @validator.error_messages ).to include("Missing value for 'Test Name'")
 			expect( @validator.error_messages ).to include("Invalid value for 'Numeral'")
 		end
@@ -286,8 +286,8 @@ describe Strelka::ParamValidator do
 			}
 			@validator.validate( 'number' => 'rhinoceros', 'unknown' => "1" )
 
-			expect( @validator.descriptions ).to have( 2 ).members
-			expect( @validator.error_messages ).to have( 2 ).members
+			expect( @validator.descriptions.size ).to eq(  2  )
+			expect( @validator.error_messages.size ).to eq(  2  )
 			expect( @validator.error_messages ).to include("Missing value for 'Test Name'")
 			expect( @validator.error_messages ).to include("Invalid value for 'Numeral'")
 		end
@@ -486,7 +486,7 @@ describe Strelka::ParamValidator do
 				expect( @validator ).to be_okay()
 				expect( @validator ).to_not have_errors()
 
-				expect( @validator[:enabled] ).to be_true()
+				expect( @validator[:enabled] ).to be_truthy()
 			end
 
 			it "accepts the value 't'" do
@@ -495,7 +495,7 @@ describe Strelka::ParamValidator do
 				expect( @validator ).to be_okay()
 				expect( @validator ).to_not have_errors()
 
-				expect( @validator[:enabled] ).to be_true()
+				expect( @validator[:enabled] ).to be_truthy()
 			end
 
 			it "accepts the value 'yes'" do
@@ -504,7 +504,7 @@ describe Strelka::ParamValidator do
 				expect( @validator ).to be_okay()
 				expect( @validator ).to_not have_errors()
 
-				expect( @validator[:enabled] ).to be_true()
+				expect( @validator[:enabled] ).to be_truthy()
 			end
 
 			it "accepts the value 'y'" do
@@ -513,7 +513,7 @@ describe Strelka::ParamValidator do
 				expect( @validator ).to be_okay()
 				expect( @validator ).to_not have_errors()
 
-				expect( @validator[:enabled] ).to be_true()
+				expect( @validator[:enabled] ).to be_truthy()
 			end
 
 			it "accepts the value '1'" do
@@ -522,7 +522,7 @@ describe Strelka::ParamValidator do
 				expect( @validator ).to be_okay()
 				expect( @validator ).to_not have_errors()
 
-				expect( @validator[:enabled] ).to be_true()
+				expect( @validator[:enabled] ).to be_truthy()
 			end
 
 			it "accepts the string 'false'" do
@@ -531,7 +531,7 @@ describe Strelka::ParamValidator do
 				expect( @validator ).to be_okay()
 				expect( @validator ).to_not have_errors()
 
-				expect( @validator[:enabled] ).to be_false()
+				expect( @validator[:enabled] ).to be_falsey()
 			end
 
 			it "accepts the literal false value" do
@@ -540,7 +540,7 @@ describe Strelka::ParamValidator do
 				expect( @validator ).to be_okay()
 				expect( @validator ).to_not have_errors()
 
-				expect( @validator[:enabled] ).to be_false()
+				expect( @validator[:enabled] ).to be_falsey()
 			end
 
 			it "accepts the value 'f'" do
@@ -549,7 +549,7 @@ describe Strelka::ParamValidator do
 				expect( @validator ).to be_okay()
 				expect( @validator ).to_not have_errors()
 
-				expect( @validator[:enabled] ).to be_false()
+				expect( @validator[:enabled] ).to be_falsey()
 			end
 
 			it "accepts the value 'no'" do
@@ -558,7 +558,7 @@ describe Strelka::ParamValidator do
 				expect( @validator ).to be_okay()
 				expect( @validator ).to_not have_errors()
 
-				expect( @validator[:enabled] ).to be_false()
+				expect( @validator[:enabled] ).to be_falsey()
 			end
 
 			it "accepts the value 'n'" do
@@ -567,7 +567,7 @@ describe Strelka::ParamValidator do
 				expect( @validator ).to be_okay()
 				expect( @validator ).to_not have_errors()
 
-				expect( @validator[:enabled] ).to be_false()
+				expect( @validator[:enabled] ).to be_falsey()
 			end
 
 			it "accepts the value '0'" do
@@ -576,7 +576,7 @@ describe Strelka::ParamValidator do
 				expect( @validator ).to be_okay()
 				expect( @validator ).to_not have_errors()
 
-				expect( @validator[:enabled] ).to be_false()
+				expect( @validator[:enabled] ).to be_falsey()
 			end
 
 			it "rejects non-boolean parameters" do

data/spec/strelka/plugins_spec.rb

@@ -264,7 +264,7 @@ describe "Strelka plugin system" do
 				route_some_stuff
 			end
 
-			expect( subclass.routed ).to be_true()
+			expect( subclass.routed ).to be_truthy()
 		end
 
 	end

data/spec/strelka/session/default_spec.rb

@@ -90,7 +90,7 @@ describe Strelka::Session::Default do
 
 		session.save( response )
 
-		expect( described_class.sessions ).to eq( { session_id => session_data } )
+		expect( described_class.sessions ).to include( { session_id => session_data } )
 		expect( response.header_data ).to match( /Set-Cookie: #{@cookie_name}=#{session_id}/i )
 	end
 
@@ -139,8 +139,8 @@ describe Strelka::Session::Default do
 			subject.testkey = true
 			subject.namespace = nil
 
-			expect( subject.meat[ :testkey ] ).to be_true
-			expect( subject.greet[ :testkey ] ).to be_true
+			expect( subject.meat[ :testkey ] ).to be_truthy
+			expect( subject.greet[ :testkey ] ).to be_truthy
 			expect( subject.pork[ :testkey ] ).to be_nil
 		end
 	end
@@ -170,7 +170,7 @@ describe Strelka::Session::Default do
 		it "accesses values via a struct-like interface" do
 			subject.testkey = true
 
-			expect( subject.testkey ).to be_true
+			expect( subject.testkey ).to be_truthy
 			expect( subject.i_do_not_exist ).to be_nil
 		end
 	end

data/spec/strelka/websocketserver/routing_spec.rb

@@ -64,7 +64,7 @@ describe Strelka::WebSocketServer::Routing do
 			@app.class_eval do
 				on_nick() {}
 			end
-			expect( @app.op_callbacks ).to have( 1 ).member
+			expect( @app.op_callbacks.size ).to eq(  1  )
 			expect( @app.op_callbacks[ :nick ] ).to be_a( UnboundMethod )
 		end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strelka
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Mahlon E. Smith
@@ -31,7 +31,7 @@ cert_chain:
   6mKCwjpegytE0oifXfF8k75A9105cBnNiMZOe1tXiqYc/exCgWvbggurzDOcRkZu
   /YSusaiDXHKU2O3Akc3htA==
   -----END CERTIFICATE-----
-date: 2013-11-08 00:00:00.000000000 Z
+date: 2014-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configurability
@@ -39,14 +39,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: foreman
   requirement: !ruby/object:Gem::Requirement
@@ -95,42 +95,42 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: mongrel2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.40'
+        version: '0.41'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.40'
+        version: '0.41'
 - !ruby/object:Gem::Dependency
   name: pluggability
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: sysexits
   requirement: !ruby/object:Gem::Requirement
@@ -179,14 +179,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
   requirement: !ruby/object:Gem::Requirement
@@ -257,6 +257,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.99.0.beta1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.99.0.beta1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -291,14 +305,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.8'
 description: |-
   Strelka is a framework for creating and deploying
   Mongrel2[http://mongrel2.org/] web applications in Ruby.
@@ -483,7 +497,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: strelka
-rubygems_version: 2.1.10
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Strelka is a framework for creating and deploying Mongrel2[http://mongrel2.org/]