strelka 0.0.1.pre.305 → 0.0.1.pre.308

data/ChangeLog

@@ -1,12 +1,36 @@
+2012-09-21  Michael Granger  <ged@FaerieMUD.org>
+
+	* Manifest.txt, lib/strelka/testing.rb, spec/lib/helpers.rb:
+	Split out some testing helper functions and RSpec matchers.
+
+	Put them into 'strelka/testing' ala 'mongrel2/testing'.
+	[c58b05ad837b] [tip]
+
+	* lib/strelka/constants.rb:
+	Header fix
+	[44a9b3386915]
+
+	* lib/strelka/cookie.rb:
+	Added reference docs to Strelka::Cookie
+	[91dc69268b9b]
+
 2012-09-18  Michael Granger  <ged@FaerieMUD.org>
 
+	* .rvm.gems, Rakefile:
+	Bump mongrel2 dependency.
+	[8d94f8575209]
+
+	* .rvm.gems:
+	Update rvm gems to match gem dependencies
+	[f5ffb135b975]
+
 	* lib/strelka/authprovider/basic.rb,
 	spec/strelka/authprovider/basic_spec.rb:
 	Simplified Strelka::AuthProvider::Basic.
 
 	- removed the pbkdf2_hmac stuff for simplicity
 	- made it easier to use it as a base class for other auth providers.
-	[dbb4523ad258] [tip]
+	[dbb4523ad258]
 
 	* Rakefile:
 	Update dependencies
@@ -34,7 +58,7 @@
 
 	Got most of the default plugins covered at least minimally. Split
 	out the rest of the manual into RDoc pages.
-	[41ef7a20e7cb]
+	[41ef7a20e7cb] [github/master]
 
 2012-08-24  Mahlon E. Smith  <mahlon@martini.nu>
 
@@ -1041,7 +1065,7 @@
 
 	* lib/strelka/app/errors.rb, spec/strelka/app/errors_spec.rb:
 	Add documentation for the Errors plugin, improve test coverage.
-	[ff3ef6e5a7a1]
+	[ff3ef6e5a7a1] [github/master@default]
 
 	* Manifest.txt:
 	Add session files to the manifest

data/Manifest.txt

@@ -72,6 +72,7 @@ lib/strelka/router/exclusive.rb
 lib/strelka/session.rb
 lib/strelka/session/db.rb
 lib/strelka/session/default.rb
+lib/strelka/testing.rb
 spec/data/error.tmpl
 spec/data/forms/2_images.form
 spec/data/forms/singleupload.form

data/lib/strelka/constants.rb

@@ -1,5 +1,6 @@
-#!/usr/bin/ruby
-#encoding: utf-8
+# -*- ruby -*-
+# vim: set nosta noet ts=4 sw=4:
+# encoding: utf-8
 
 require 'mongrel2/constants'
 require 'strelka' unless defined?( Strelka )

data/lib/strelka/cookie.rb

@@ -21,6 +21,10 @@ require 'strelka/mixins'
 #   Copyright (c) 2002 Internet Programming with Ruby writers. All rights
 #   reserved.
 #
+# References:
+#
+# * http://tools.ietf.org/html/rfc6265
+#
 class Strelka::Cookie
 	extend Loggability
 

data/lib/strelka/testing.rb

@@ -0,0 +1,185 @@
+# -*- ruby -*-
+# vim: set nosta noet ts=4 sw=4:
+# encoding: utf-8
+
+require 'rspec'
+require 'rspec/matchers'
+
+# A collection of testing functions and classes for use in Strelka handlers
+# and libraries.
+module Strelka::Testing
+
+	###############
+	module_function
+	###############
+
+	#
+	# Matchers
+	#
+
+	# Route matcher
+	RSpec::Matchers.define( :match_route ) do |routename|
+		match do |route|
+			route[:action] == routename
+		end
+	end
+
+	# Collection .all? matcher
+	RSpec::Matchers.define( :all_be_a ) do |expected|
+		match do |collection|
+			collection.all? {|obj| obj.is_a?(expected) }
+		end
+	end
+
+	# finish_with matcher
+	class FinishWithMatcher
+
+		### Create a new matcher for the specified +status+, +expected_message+, and
+		### +expected_headers+.
+		def initialize( status, expected_message=nil, expected_headers={} )
+
+			# Allow headers, but no message
+			if expected_message.is_a?( Hash )
+				expected_headers = expected_message
+				expected_message = nil
+			end
+
+			@expected_status  = status
+			@expected_message = expected_message
+			@expected_headers = expected_headers || {}
+
+			@failure = nil
+		end
+
+
+		######
+		public
+		######
+
+		##
+		# The data structures expected to be part of the response's status_info.
+		attr_reader :expected_status, :expected_message, :expected_headers
+
+
+		### Also expect a header with the given +name+ and +value+ from the response.
+		def and_header( name, value=nil )
+			if name.is_a?( Hash )
+				self.expected_headers.merge!( name )
+			else
+				self.expected_headers[ name ] = value
+			end
+			return self
+		end
+
+
+		### RSpec matcher API -- call the +given_proc+ and ensure that it behaves in
+		### the expected manner.
+		def matches?( given_proc )
+			result = nil
+			status_info = catch( :finish ) do
+				given_proc.call
+				nil
+			end
+
+			return self.check_finish( status_info ) &&
+			       self.check_status_code( status_info ) &&
+			       self.check_message( status_info ) &&
+			       self.check_headers( status_info )
+		end
+
+
+		### Check the result from calling the proc to ensure it's a status
+		### info Hash, returning true if so, or setting the failure message and
+		### returning false if not.
+		def check_finish( status_info )
+			return true if status_info && status_info.is_a?( Hash )
+			@failure = "an abnormal status"
+			return false
+		end
+
+
+		### Check the result's status code against the expectation, returning true if
+		### it was the same, or setting the failure message and returning false if not.
+		def check_status_code( status_info )
+			return true if status_info[:status] == self.expected_status
+			@failure = "a %d status, but got %d instead" %
+				[ self.expected_status, status_info[:status] ]
+			return false
+		end
+
+
+		### Check the result's status message against the expectation, returning true if
+		### it was present and matched the expectation, or setting the failure message
+		### and returning false if not.
+		def check_message( status_info )
+			msg = self.expected_message or return true
+
+			if msg.respond_to?( :match )
+				return true if msg.match( status_info[:message] )
+				@failure = "a message matching %p, but got: %p" % [ msg, status_info[:message] ]
+				return false
+			else
+				return true if msg == status_info[:message]
+				@failure = "the message %p, but got: %p" % [ msg, status_info[:message] ]
+				return false
+			end
+		end
+
+
+		### Check the result's headers against the expectation, returning true if all
+		### expected headers were present and set to expected values, or setting the failure
+		### message and returning false if not.
+		def check_headers( status_info )
+			headers = self.expected_headers or return true
+			return true if headers.empty?
+
+			status_headers = status_info[:headers]
+			headers.each do |name, value|
+				unless status_value = status_headers[ name ]
+					@failure = "a %s header" % [ name ]
+					return false
+				end
+
+				if value.respond_to?( :match )
+					unless value.match( status_value )
+						@failure = "a %s header matching %p, but got %p" %
+							[ name, value, status_value ]
+						return false
+					end
+				else
+					unless value == status_value
+						@failure = "the %s header %p, but got %p" %
+							[ name, value, status_value ]
+						return false
+					end
+				end
+			end
+
+			return true
+		end
+
+
+		### Return a message suitable for describing when the matcher fails when it should succeed.
+		def failure_message_for_should
+			return "expected response to finish_with %s" % [ @failure ]
+		end
+
+
+		### Return a message suitable for describing when the matcher succeeds when it should fail.
+		def failure_message_for_should_not
+			return "expected response not to finish_with %s" % [ @failure ]
+		end
+
+
+	end # class FinishWithMatcher
+
+
+	### Match a response thrown via the +finish_with+ function.
+	def finish_with( status, message=nil, headers={} )
+		FinishWithMatcher.new( status, message, headers )
+	end
+
+
+end # module Strelka::Testing
+
+

data/spec/lib/helpers.rb

@@ -38,6 +38,7 @@ require 'mongrel2'
 require 'mongrel2/testing'
 
 require 'strelka'
+require 'strelka/testing'
 
 require 'spec/lib/constants'
 
@@ -46,7 +47,8 @@ Loggability.format_with( :color ) if $stdout.tty?
 
 ### RSpec helper functions.
 module Strelka::SpecHelpers
-	include Strelka::TestConstants
+	include Strelka::TestConstants,
+	        Strelka::Testing
 
 	###############
 	module_function
@@ -88,174 +90,6 @@ module Strelka::SpecHelpers
 		return tempdir
 	end
 
-
-	#
-	# Matchers
-	#
-
-	# Route matcher
-	RSpec::Matchers.define( :match_route ) do |routename|
-		match do |route|
-			route[:action] == routename
-		end
-	end
-
-	# Collection .all? matcher
-	RSpec::Matchers.define( :all_be_a ) do |expected|
-		match do |collection|
-			collection.all? {|obj| obj.is_a?(expected) }
-		end
-	end
-
-	# finish_with matcher
-	class FinishWithMatcher
-
-		### Create a new matcher for the specified +status+, +expected_message+, and
-		### +expected_headers+.
-		def initialize( status, expected_message=nil, expected_headers={} )
-
-			# Allow headers, but no message
-			if expected_message.is_a?( Hash )
-				expected_headers = expected_message
-				expected_message = nil
-			end
-
-			@expected_status  = status
-			@expected_message = expected_message
-			@expected_headers = expected_headers || {}
-
-			@failure = nil
-		end
-
-
-		######
-		public
-		######
-
-		##
-		# The data structures expected to be part of the response's status_info.
-		attr_reader :expected_status, :expected_message, :expected_headers
-
-
-		### Also expect a header with the given +name+ and +value+ from the response.
-		def and_header( name, value=nil )
-			if name.is_a?( Hash )
-				self.expected_headers.merge!( name )
-			else
-				self.expected_headers[ name ] = value
-			end
-			return self
-		end
-
-
-		### RSpec matcher API -- call the +given_proc+ and ensure that it behaves in
-		### the expected manner.
-		def matches?( given_proc )
-			result = nil
-			status_info = catch( :finish ) do
-				given_proc.call
-				nil
-			end
-
-			return self.check_finish( status_info ) &&
-			       self.check_status_code( status_info ) &&
-			       self.check_message( status_info ) &&
-			       self.check_headers( status_info )
-		end
-
-
-		### Check the result from calling the proc to ensure it's a status
-		### info Hash, returning true if so, or setting the failure message and
-		### returning false if not.
-		def check_finish( status_info )
-			return true if status_info && status_info.is_a?( Hash )
-			@failure = "an abnormal status"
-			return false
-		end
-
-
-		### Check the result's status code against the expectation, returning true if
-		### it was the same, or setting the failure message and returning false if not.
-		def check_status_code( status_info )
-			return true if status_info[:status] == self.expected_status
-			@failure = "a %d status, but got %d instead" %
-				[ self.expected_status, status_info[:status] ]
-			return false
-		end
-
-
-		### Check the result's status message against the expectation, returning true if
-		### it was present and matched the expectation, or setting the failure message
-		### and returning false if not.
-		def check_message( status_info )
-			msg = self.expected_message or return true
-
-			if msg.respond_to?( :match )
-				return true if msg.match( status_info[:message] )
-				@failure = "a message matching %p, but got: %p" % [ msg, status_info[:message] ]
-				return false
-			else
-				return true if msg == status_info[:message]
-				@failure = "the message %p, but got: %p" % [ msg, status_info[:message] ]
-				return false
-			end
-		end
-
-
-		### Check the result's headers against the expectation, returning true if all
-		### expected headers were present and set to expected values, or setting the failure
-		### message and returning false if not.
-		def check_headers( status_info )
-			headers = self.expected_headers or return true
-			return true if headers.empty?
-
-			status_headers = status_info[:headers]
-			headers.each do |name, value|
-				unless status_value = status_headers[ name ]
-					@failure = "a %s header" % [ name ]
-					return false
-				end
-
-				if value.respond_to?( :match )
-					unless value.match( status_value )
-						@failure = "a %s header matching %p, but got %p" %
-							[ name, value, status_value ]
-						return false
-					end
-				else
-					unless value == status_value
-						@failure = "the %s header %p, but got %p" %
-							[ name, value, status_value ]
-						return false
-					end
-				end
-			end
-
-			return true
-		end
-
-
-		### Return a message suitable for describing when the matcher fails when it should succeed.
-		def failure_message_for_should
-			return "expected response to finish_with %s" % [ @failure ]
-		end
-
-
-		### Return a message suitable for describing when the matcher succeeds when it should fail.
-		def failure_message_for_should_not
-			return "expected response not to finish_with %s" % [ @failure ]
-		end
-
-
-	end # class FinishWithMatcher
-
-
-	### Match a response thrown via the +finish_with+ function.
-	def finish_with( status, message=nil, headers={} )
-		FinishWithMatcher.new( status, message, headers )
-	end
-
-
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strelka
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre.305
+  version: 0.0.1.pre.308
   prerelease: 
 platform: ruby
 authors:
@@ -36,7 +36,7 @@ cert_chain:
   YUhDS0xaZFNLai9SSHVUT3QrZ2JsUmV4OEZBaDhOZUEKY21saFhlNDZwWk5K
   Z1dLYnhaYWg4NWpJang5NWhSOHZPSStOQU01aUg5a09xSzEzRHJ4YWNUS1Bo
   cWo1UGp3RgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2012-09-18 00:00:00.000000000 Z
+date: 2012-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configurability
@@ -427,6 +427,7 @@ files:
 - lib/strelka/session.rb
 - lib/strelka/session/db.rb
 - lib/strelka/session/default.rb
+- lib/strelka/testing.rb
 - spec/data/error.tmpl
 - spec/data/forms/2_images.form
 - spec/data/forms/singleupload.form