strelka 0.7.0 → 0.8.0

data/lib/strelka/httprequest/acceptparams.rb

@@ -50,9 +50,9 @@ class Strelka::HTTPRequest
 	# * Mahlon E. Smith <mahlon@martini.nu>
 	#
 	class AcceptParam
-		extend Loggability
-		include Comparable,
-		        Strelka::AbstractClass
+		extend Loggability,
+		       Strelka::AbstractClass
+		include Comparable
 
 
 		# Loggability API -- set up logging under the 'strelka' log host

data/lib/strelka/httprequest/negotiation.rb

@@ -98,6 +98,10 @@ module Strelka::HTTPRequest::Negotiation
 		return self.parse_negotiation_header( :accept, Strelka::HTTPRequest::MediaType ) do
 			Strelka::HTTPRequest::MediaType.new( '*', '*' )
 		end
+	rescue => err
+		self.log.error "%p while parsing the Accept header: %s" % [ err.class, err.message ]
+		self.log.debug "  %s" % [ err.backtrace.join("\n  ") ]
+		finish_with HTTP::BAD_REQUEST, "Malformed Accept header"
 	end
 
 

data/lib/strelka/mixins.rb

@@ -2,6 +2,7 @@
 # vim: set nosta noet ts=4 sw=4:
 # encoding: utf-8
 
+
 require 'tempfile'
 
 require 'strelka' unless defined?( Strelka )
@@ -16,7 +17,7 @@ module Strelka
 	#
 	#   # AbstractClass
 	#   class MyBaseClass
-	#       include Strelka::AbstractClass
+	#       extend Strelka::AbstractClass
 	#
 	#       # Define a method that will raise a NotImplementedError if called
 	#       pure_virtual :api_method
@@ -24,41 +25,39 @@ module Strelka
 	#
 	module AbstractClass
 
-		### Methods to be added to including classes
-		module ClassMethods
-
-			### Define one or more "virtual" methods which will raise
-			### NotImplementedErrors when called via a concrete subclass.
-			def pure_virtual( *syms )
-				syms.each do |sym|
-					define_method( sym ) do |*args|
-						raise ::NotImplementedError,
-							"%p does not provide an implementation of #%s" % [ self.class, sym ],
-							caller(1)
-					end
-				end
-			end
-
-
-			### Turn subclasses' new methods back to public.
-			def inherited( subclass )
-				subclass.module_eval { public_class_method :new }
-				super
-			end
-
-		end # module ClassMethods
+		### Extension callback -- mark the extended object's .new as private
+		def self::extended( mod )
+			super
+			mod.class_eval { private_class_method :new }
+		end
 
 
-		### Inclusion callback
+		### Inclusion callback -- support backward-compatible inclusion.
 		def self::included( mod )
+			mod.extend( self )
 			super
-			if mod.respond_to?( :new )
-				mod.extend( ClassMethods )
-				mod.module_eval { private_class_method :new }
+		end
+
+
+		### Define one or more "virtual" methods which will raise
+		### NotImplementedErrors when called via a concrete subclass.
+		def pure_virtual( *syms )
+			syms.each do |sym|
+				define_method( sym ) do |*args|
+					raise ::NotImplementedError,
+					"%p does not provide an implementation of #%s" % [ self.class, sym ],
+					caller(1)
+				end
 			end
 		end
 
 
+		### Inheritance callback -- Turn subclasses' .new methods back to public.
+		def inherited( subclass )
+			subclass.module_eval { public_class_method :new }
+			super
+		end
+
 	end # module AbstractClass
 
 

data/lib/strelka/multipartparser.rb

@@ -126,9 +126,7 @@ class Strelka::MultipartParser
 			raise Strelka::ParseError, "No initial boundary"
 
 		# Now scan until we see the ending boundary (the one with the trailing '--')
-		begin
-			key, val = self.scan_part
-		end until @buffer.start_with?( '--' )
+		self.scan_part until @buffer.start_with?( '--' )
 
 		self.log.debug "Finished parse. %d fields" % [ self.fields.length ]
 		return self.fields

data/lib/strelka/plugins.rb

@@ -228,7 +228,6 @@ module Strelka
 
 					self.log.debug "  copying class instance variable %s (%p)" % [ ivar, copy ]
 
-					# Don't duplicate modules/classes or immediates
 					instance_variable_set( ivar, copy )
 					self.log.debug "  instance variable %p set to %p in %p" %
 						[ ivar, self.instance_variable_get(ivar), self ]
@@ -268,7 +267,7 @@ module Strelka
 					next
 				end
 
-				self.log.info "  including %p." % [ mod ]
+				self.log.info "  including %p in %p." % [ mod, self ]
 				include( mod )
 			end
 

data/lib/strelka/router.rb

@@ -25,8 +25,8 @@ require 'strelka/mixins'
 # #add_route and #route_request methods.
 class Strelka::Router
 	extend Loggability,
-	       Pluggability
-	include Strelka::AbstractClass
+	       Pluggability,
+	       Strelka::AbstractClass
 
 	# Loggability API -- set up logging under the 'strelka' log host
 	log_to :strelka

data/lib/strelka/session.rb

@@ -20,6 +20,7 @@ require 'strelka/mixins'
 #
 # * self.configure
 # * self.get_session_id
+# * self.get_existing_session_id
 # * self.load_session_data
 # * self.save_session_data
 # * self.delete_session_data
@@ -44,8 +45,8 @@ require 'strelka/mixins'
 #
 class Strelka::Session
 	extend Loggability,
-	       Pluggability
-	include Strelka::AbstractClass
+	       Pluggability,
+	       Strelka::AbstractClass
 
 
 	# Loggability API -- set up logging under the 'strelka' log host

data/lib/strelka/session/db.rb

@@ -122,6 +122,7 @@ class Strelka::Session::Db < Strelka::Session::Default
 		return !self.dataset.filter( :session_id => id ).empty?
 	end
 
+
 	### Configure the session class with the given +options+, which should be a
 	### Hash or an object that has a Hash-like interface.
 	###

data/spec/strelka/app/auth_spec.rb

@@ -142,13 +142,13 @@ describe Strelka::App::Auth do
 
 			req = @request_factory.get( '/api/v1/string' )
 			expect( app ).to require_auth_for_request( req )
-			expect( app.request_should_auth?(req) ).to be_true()
+			expect( app.request_should_auth?(req) ).to be_truthy()
 			req = @request_factory.get( '/api/v1/strong' )
-			expect( app.request_should_auth?(req) ).to be_false()
+			expect( app.request_should_auth?(req) ).to be_falsey()
 			req = @request_factory.get( '/api/v1/stri' )
-			expect( app.request_should_auth?(req) ).to be_false()
+			expect( app.request_should_auth?(req) ).to be_falsey()
 			req = @request_factory.get( '/api/v1/string/long' )
-			expect( app.request_should_auth?(req) ).to be_false()
+			expect( app.request_should_auth?(req) ).to be_falsey()
 		end
 
 		it "allows auth criteria to be declared with a regexp" do
@@ -156,17 +156,17 @@ describe Strelka::App::Auth do
 			app = @app.new
 
 			req = @request_factory.get( '/api/v1/stri' )
-			expect( app.request_should_auth?(req) ).to be_true()
+			expect( app.request_should_auth?(req) ).to be_truthy()
 			req = @request_factory.get( '/api/v1/stro' )
-			expect( app.request_should_auth?(req) ).to be_true()
+			expect( app.request_should_auth?(req) ).to be_truthy()
 			req = @request_factory.get( '/api/v1/string' ) # not right-bound
-			expect( app.request_should_auth?(req) ).to be_true()
+			expect( app.request_should_auth?(req) ).to be_truthy()
 			req = @request_factory.get( '/api/v1/string/long' )
-			expect( app.request_should_auth?(req) ).to be_true()
+			expect( app.request_should_auth?(req) ).to be_truthy()
 			req = @request_factory.get( '/api/v1/other/string/long' ) # Not left-bound
-			expect( app.request_should_auth?(req) ).to be_true()
+			expect( app.request_should_auth?(req) ).to be_truthy()
 			req = @request_factory.get( '/api/v1/chatlog' ) # Not left-bound
-			expect( app.request_should_auth?(req) ).to be_false()
+			expect( app.request_should_auth?(req) ).to be_falsey()
 		end
 
 		it "allows auth criteria to be declared with a string and a block" do
@@ -177,15 +177,15 @@ describe Strelka::App::Auth do
 			app = @app.new
 
 			req = @request_factory.get( '/api/v1/string' )
-			expect( app.request_should_auth?(req) ).to be_false()
+			expect( app.request_should_auth?(req) ).to be_falsey()
 			req = @request_factory.post( '/api/v1/string' )
-			expect( app.request_should_auth?(req) ).to be_true()
+			expect( app.request_should_auth?(req) ).to be_truthy()
 			req = @request_factory.put( '/api/v1/string' )
-			expect( app.request_should_auth?(req) ).to be_true()
+			expect( app.request_should_auth?(req) ).to be_truthy()
 			req = @request_factory.delete( '/api/v1/string' )
-			expect( app.request_should_auth?(req) ).to be_true()
+			expect( app.request_should_auth?(req) ).to be_truthy()
 			req = @request_factory.options( '/api/v1/string' )
-			expect( app.request_should_auth?(req) ).to be_true()
+			expect( app.request_should_auth?(req) ).to be_truthy()
 		end
 
 		it "allows auth criteria to be declared with a regexp and a block" do
@@ -196,11 +196,11 @@ describe Strelka::App::Auth do
 			app = @app.new
 
 			req = @request_factory.get( '/api/v1/regexp' )
-			expect( app.request_should_auth?(req) ).to be_false()
+			expect( app.request_should_auth?(req) ).to be_falsey()
 			req = @request_factory.get( '/api/v1/regexp/a_username' )
-			expect( app.request_should_auth?(req) ).to be_true()
+			expect( app.request_should_auth?(req) ).to be_truthy()
 			req = @request_factory.get( '/api/v1/regexp/%20not+a+username' )
-			expect( app.request_should_auth?(req) ).to be_false()
+			expect( app.request_should_auth?(req) ).to be_falsey()
 		end
 
 		it "allows auth criteria to be declared with just a block" do
@@ -218,21 +218,21 @@ describe Strelka::App::Auth do
 			app = @app.new
 
 			req = @request_factory.get( '/api/v1/strong' )
-			expect( app.request_should_auth?(req) ).to be_true()
+			expect( app.request_should_auth?(req) ).to be_truthy()
 			req = @request_factory.get( '/api/v1/marlon_brando' )
-			expect( app.request_should_auth?(req) ).to be_true()
+			expect( app.request_should_auth?(req) ).to be_truthy()
 			req = @request_factory.post( '/api/v1/somewhere' )
-			expect( app.request_should_auth?(req) ).to be_true()
+			expect( app.request_should_auth?(req) ).to be_truthy()
 			req = @request_factory.put( '/api/v1/somewhere' )
 			req.content_type = 'application/x-www-form-urlencoded'
-			expect( app.request_should_auth?(req) ).to be_true()
+			expect( app.request_should_auth?(req) ).to be_truthy()
 
 			req = @request_factory.get( '/api/v1/string' )
-			expect( app.request_should_auth?(req) ).to be_false()
+			expect( app.request_should_auth?(req) ).to be_falsey()
 			req = @request_factory.get( '/api/v1/marlon_brando/2' )
-			expect( app.request_should_auth?(req) ).to be_false()
+			expect( app.request_should_auth?(req) ).to be_falsey()
 			req = @request_factory.put( '/api/v1/somewhere' )
-			expect( app.request_should_auth?(req) ).to be_false()
+			expect( app.request_should_auth?(req) ).to be_falsey()
 
 		end
 
@@ -241,13 +241,13 @@ describe Strelka::App::Auth do
 			app = @app.new
 
 			req = @request_factory.get( '/api/v1/string' )
-			expect( app.request_should_auth?(req) ).to be_false()
+			expect( app.request_should_auth?(req) ).to be_falsey()
 			req = @request_factory.get( '/api/v1/strong' )
-			expect( app.request_should_auth?(req) ).to be_true()
+			expect( app.request_should_auth?(req) ).to be_truthy()
 			req = @request_factory.get( '/api/v1/stri' )
-			expect( app.request_should_auth?(req) ).to be_true()
+			expect( app.request_should_auth?(req) ).to be_truthy()
 			req = @request_factory.get( '/api/v1/string/long' )
-			expect( app.request_should_auth?(req) ).to be_true()
+			expect( app.request_should_auth?(req) ).to be_truthy()
 		end
 
 		it "allows negative auth criteria to be declared with a regexp" do
@@ -255,17 +255,17 @@ describe Strelka::App::Auth do
 			app = @app.new
 
 			req = @request_factory.get( '/api/v1/stri' )
-			expect( app.request_should_auth?(req) ).to be_false()
+			expect( app.request_should_auth?(req) ).to be_falsey()
 			req = @request_factory.get( '/api/v1/stro' )
-			expect( app.request_should_auth?(req) ).to be_false()
+			expect( app.request_should_auth?(req) ).to be_falsey()
 			req = @request_factory.get( '/api/v1/string' ) # not right-bound
-			expect( app.request_should_auth?(req) ).to be_false()
+			expect( app.request_should_auth?(req) ).to be_falsey()
 			req = @request_factory.get( '/api/v1/string/long' )
-			expect( app.request_should_auth?(req) ).to be_false()
+			expect( app.request_should_auth?(req) ).to be_falsey()
 			req = @request_factory.get( '/api/v1/other/string/long' ) # Not left-bound
-			expect( app.request_should_auth?(req) ).to be_false()
+			expect( app.request_should_auth?(req) ).to be_falsey()
 			req = @request_factory.get( '/api/v1/chat' )
-			expect( app.request_should_auth?(req) ).to be_true()
+			expect( app.request_should_auth?(req) ).to be_truthy()
 		end
 
 		it "allows negative auth criteria to be declared with a string and a block" do
@@ -274,17 +274,17 @@ describe Strelka::App::Auth do
 			app = @app.new
 
 			req = @request_factory.get( '/api/v1/string' )
-			expect( app.request_should_auth?(req) ).to be_false()
+			expect( app.request_should_auth?(req) ).to be_falsey()
 			req = @request_factory.get( '/api/v1/strong' )
-			expect( app.request_should_auth?(req) ).to be_true()
+			expect( app.request_should_auth?(req) ).to be_truthy()
 			req = @request_factory.post( '/api/v1/string' )
-			expect( app.request_should_auth?(req) ).to be_true()
+			expect( app.request_should_auth?(req) ).to be_truthy()
 			req = @request_factory.put( '/api/v1/string' )
-			expect( app.request_should_auth?(req) ).to be_true()
+			expect( app.request_should_auth?(req) ).to be_truthy()
 			req = @request_factory.delete( '/api/v1/string' )
-			expect( app.request_should_auth?(req) ).to be_true()
+			expect( app.request_should_auth?(req) ).to be_truthy()
 			req = @request_factory.options( '/api/v1/string' )
-			expect( app.request_should_auth?(req) ).to be_true()
+			expect( app.request_should_auth?(req) ).to be_truthy()
 		end
 
 		it "allows negative auth criteria to be declared with a regexp and a block" do
@@ -295,13 +295,13 @@ describe Strelka::App::Auth do
 			app = @app.new
 
 			req = @request_factory.get( '/api/v1/regexp' )
-			expect( app.request_should_auth?(req) ).to be_true()
+			expect( app.request_should_auth?(req) ).to be_truthy()
 			req = @request_factory.get( '/api/v1/regexp/a_username' )
-			expect( app.request_should_auth?(req) ).to be_true()
+			expect( app.request_should_auth?(req) ).to be_truthy()
 			req = @request_factory.get( '/api/v1/regexp/%20not+a+username' )
-			expect( app.request_should_auth?(req) ).to be_true()
+			expect( app.request_should_auth?(req) ).to be_truthy()
 			req = @request_factory.get( '/api/v1/regexp/guest' )
-			expect( app.request_should_auth?(req) ).to be_false()
+			expect( app.request_should_auth?(req) ).to be_falsey()
 		end
 
 		it "allows negative auth criteria to be declared with just a block" do
@@ -314,11 +314,11 @@ describe Strelka::App::Auth do
 			app = @app.new
 
 			req = @request_factory.get( '/api/v1/foom' )
-			expect( app.request_should_auth?(req) ).to be_true()
+			expect( app.request_should_auth?(req) ).to be_truthy()
 			req = @request_factory.post( '/api/v1/foom', :accept => 'text/plain, text/html; q=0.5' )
-			expect( app.request_should_auth?(req) ).to be_true()
+			expect( app.request_should_auth?(req) ).to be_truthy()
 			req = @request_factory.get( '/api/v1/foom', :accept => 'text/plain, text/html; q=0.5' )
-			expect( app.request_should_auth?(req) ).to be_false()
+			expect( app.request_should_auth?(req) ).to be_falsey()
 
 		end
 

data/spec/strelka/app/filters_spec.rb

@@ -94,11 +94,11 @@ describe Strelka::App::Filters do
 
 
 			it "has a single request filter" do
-				expect( @app.request_filters ).to have(1).member
+				expect( @app.request_filters.size ).to eq( 1 )
 			end
 
 			it "has a single response filter" do
-				expect( @app.response_filters ).to have(1).member
+				expect( @app.response_filters.size ).to eq( 1 )
 			end
 
 			it "passes both the request and the response through it" do
@@ -106,8 +106,8 @@ describe Strelka::App::Filters do
 
 				res = @app.new.handle( req )
 
-				expect( req.notes[:saw][:request] ).to be_true()
-				expect( res.notes[:saw][:response] ).to be_true()
+				expect( req.notes[:saw][:request] ).to be_truthy()
+				expect( res.notes[:saw][:response] ).to be_truthy()
 			end
 
 		end
@@ -132,7 +132,7 @@ describe Strelka::App::Filters do
 
 
 			it "has a single request filter" do
-				expect( @app.request_filters ).to have(1).member
+				expect( @app.request_filters.size ).to eq( 1 )
 			end
 
 			it "has no response filters" do
@@ -144,7 +144,7 @@ describe Strelka::App::Filters do
 
 				res = @app.new.handle( req )
 
-				expect( req.notes[:saw][:request] ).to be_true()
+				expect( req.notes[:saw][:request] ).to be_truthy()
 				expect( res.notes[:saw][:response] ).to be_nil()
 			end
 
@@ -174,7 +174,7 @@ describe Strelka::App::Filters do
 			end
 
 			it "has no response filters" do
-				expect( @app.response_filters ).to have(1).member
+				expect( @app.response_filters.size ).to eq( 1 )
 			end
 
 			it "passes just the response through it" do
@@ -183,7 +183,7 @@ describe Strelka::App::Filters do
 				res = @app.new.handle( req )
 
 				expect( req.notes[:saw][:request] ).to be_nil()
-				expect( res.notes[:saw][:response] ).to be_true()
+				expect( res.notes[:saw][:response] ).to be_truthy()
 			end
 
 		end

data/spec/strelka/app/parameters_spec.rb

@@ -139,7 +139,7 @@ describe Strelka::App::Parameters do
 					untaint_all_constraints true
 				end
 
-				expect( @app.untaint_all_constraints ).to be_true()
+				expect( @app.untaint_all_constraints ).to be_truthy()
 				req = @request_factory.get( '/user/search?username=shereshnaheth'.taint )
 				@app.new.handle( req )