mongrel2 0.45.1 → 0.46.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56244e5c7ad23b9c4453caf6e96cd4f74741b50c
-  data.tar.gz: da2a57b2a838edfb493d9a7bb082f7b1195cd7a5
+  metadata.gz: 49700ba2e7f76c60b009989939796b167fa306a4
+  data.tar.gz: 831cea720fb5b58e5e451a297b5754422c5acd40
 SHA512:
-  metadata.gz: 6c4815d7a74cd4d830332a940b2d212728951e6c69e3fd19504c3e482d84cf8676f50412f77cb945148def0fc992f5781c55c581de72008277f99f688b915176
-  data.tar.gz: a32dad853c1e2ea5ca154731d1f49e7e80cb8b2605d42637b23c69be46e0e1712c1a6bcade4711e1868e7e6d0322e7e613681ab9fa84dd43cccd40c158478397
+  metadata.gz: cc2b3e24804bc1560fa49e85ac2ef464aeccd0c7fc3075e81bb290da92a5459402bc9754fa5bb5bfb8769da5054fa98f29ccc91af9c83fde1b43eaa63a17be8d
+  data.tar.gz: 3491dfd9764efb5256ec50631452661d8058ecfe7e340201d88b73fdfb48a84fc28e1e7e301fea7b629d7c94f0d86c9422ccc072d6e898d62d0c8e7135bfdaa5

data/History.rdoc

@@ -1,3 +1,11 @@
+== v0.46.0 [2016-11-05] Michael Granger <ged@FaerieMUD.org>
+
+Enhancements:
+
+- Pull up config setup/teardown into the spec helper
+- Cache config mimetype table
+
+
 == v0.45.1 [2016-11-03] Michael Granger <ged@FaerieMUD.org>
 
 Bugfixes:

data/lib/mongrel2.rb

@@ -25,10 +25,10 @@ module Mongrel2
 	abort "\n\n>>> Mongrel2 requires Ruby 2.2 or later. <<<\n\n" if RUBY_VERSION < '2.2.0'
 
 	# Library version constant
-	VERSION = '0.45.1'
+	VERSION = '0.46.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 3bf29899020f $
+	REVISION = %q$Revision: a28294965462 $
 
 
 	require 'mongrel2/constants'

data/lib/mongrel2/config.rb

@@ -164,7 +164,11 @@ module Mongrel2
 
 		### Return a Hash of current mimetypes from the config database keyed by extension.
 		def self::mimetypes
-			return Mongrel2::Config::Mimetype.to_hash( :extension, :mimetype )
+			unless @mimetypes
+				@mimetypes = Mongrel2::Config::Mimetype.to_hash( :extension, :mimetype )
+				@mimetypes.freeze
+			end
+			return @mimetypes
 		end
 
 

data/lib/mongrel2/constants.rb

@@ -29,7 +29,6 @@ module Mongrel2::Constants
 	# Maximum number of identifiers that can be included in a broadcast response
 	MAX_BROADCAST_IDENTS = 100
 
-
 	# HTTP status and result constants
 	module HTTP
 		CONTINUE                      = 100
@@ -172,6 +171,5 @@ module Mongrel2::Constants
 
 	end
 
-
 end # module Mongrel2::Constants
 

data/lib/mongrel2/httprequest.rb

@@ -11,12 +11,14 @@ require 'mongrel2/httpresponse'
 class Mongrel2::HTTPRequest < Mongrel2::Request
 	extend Loggability
 
-	# Loggability API -- set up logging under the 'mongrel2' log host
-	log_to :mongrel2
 
 	# HTTP verbs from RFC2616
 	HANDLED_HTTP_METHODS = [ :OPTIONS, :GET, :HEAD, :POST, :PUT, :DELETE, :TRACE, :CONNECT ]
 
+
+	# Loggability API -- set up logging under the 'mongrel2' log host
+	log_to :mongrel2
+
 	# Mongrel2::Request API -- register this class as handling the HTTP verbs
 	register_request_type( self, *HANDLED_HTTP_METHODS )
 

data/lib/mongrel2/request.rb

@@ -52,7 +52,6 @@ class Mongrel2::Request
 	end
 
 
-
 	### Register the specified +subclass+ as the class to instantiate when the +METHOD+
 	### header is one of the specified +req_methods+. This method exists for frameworks
 	### which wish to provide their own Request types.

data/lib/mongrel2/testing.rb

@@ -15,6 +15,46 @@ module Mongrel2
 	# A collection of helper functions that are generally useful
 	# for testing Mongrel2::Handlers.
 	module SpecHelpers
+
+		### Inclusion callback -- install some hooks
+		def self::included( context )
+
+			context.before( :all ) do
+				setup_config_db
+			end
+
+			context.around( :each ) do |example|
+				if (( setting = example.metadata[:db] ))
+					if setting == :no_transaction || setting == :without_transaction
+						Loggability[ Mongrel2 ].debug "  running without a transaction"
+						example.run
+					else
+						Loggability[ Mongrel2 ].debug "  running with a transaction"
+						Mongrel2::Config.db.transaction( rollback: :always ) do
+							example.run
+						end
+					end
+				else
+					example.run
+				end
+			end
+
+			super
+		end
+
+
+		### Set up a Mongrel2 configuration database in memory.
+		def setup_config_db
+			Mongrel2::Config.db ||= Mongrel2::Config.in_memory_db
+			Mongrel2::Config.init_database!
+		end
+
+
+		### Truncate all the tables in the current config DB.
+		def clean_config_db
+			Mongrel2::Config.db.tables.collect {|t| Mongrel2::Config.db[t] }.each( &:truncate )
+		end
+
 	end # module SpecHelpers
 
 

data/spec/helpers.rb

@@ -42,20 +42,6 @@ module Mongrel2::SpecHelpers
 	end
 
 
-	### Set up a Mongrel2 configuration database in memory.
-	def setup_config_db
-		Mongrel2::Config.db ||= Mongrel2::Config.in_memory_db
-		Mongrel2::Config.init_database
-		clean_config_db()
-	end
-
-
-	### Wipe out any existing db data.
-	def clean_config_db
-		Mongrel2::Config.db.tables.collect {|t| Mongrel2::Config.db[t] }.each( &:truncate )
-	end
-
-
 	### Normalize and fill in missing members for the given +opts+.
 	def normalize_headers( opts, defaults=TEST_HEADERS )
 		headers = defaults.merge( opts[:headers] || {} )
@@ -171,6 +157,7 @@ module Mongrel2::SpecHelpers
 		return data.encode( 'binary' )
 	end
 
+
 	### Make a Mongrel2 handshake request for a WebSocket route.
 	def make_websocket_handshake( opts={} )
 		opts = TEST_WEBSOCKET_REQUEST_OPTS.merge( opts )
@@ -192,6 +179,7 @@ module Mongrel2::SpecHelpers
 		return data.encode( 'binary' )
 	end
 
+
 	### Make a Mongrel2 frame for a WebSocket route.
 	def make_websocket_frame( opts={} )
 		opts = TEST_WEBSOCKET_REQUEST_OPTS.merge( opts )
@@ -216,8 +204,6 @@ module Mongrel2::SpecHelpers
 end
 
 
-abort "You need a version of RSpec >= 2.6.0" unless defined?( RSpec )
-
 if defined?( ::Amalgalite )
 	$stderr.puts ">>> Using Amalgalite #{Amalgalite::VERSION} for DB access."
 else

data/spec/mongrel2/config/directory_spec.rb

@@ -11,11 +11,7 @@ require 'mongrel2/config'
 ###	C O N T E X T S
 #####################################################################
 
-describe Mongrel2::Config::Directory do
-
-	before( :all ) do
-		setup_config_db()
-	end
+describe Mongrel2::Config::Directory, :db do
 
 	before( :each ) do
 		@dir = Mongrel2::Config::Directory.new(

data/spec/mongrel2/config/dsl_spec.rb

@@ -11,18 +11,10 @@ require 'mongrel2/config'
 ###	C O N T E X T S
 #####################################################################
 
-describe Mongrel2::Config::DSL do
+describe Mongrel2::Config::DSL, :db do
 
 	include described_class
 
-	before( :all ) do
-		setup_config_db()
-	end
-
-	before( :each ) do
-		clean_config_db()
-	end
-
 
 	describe 'servers' do
 		it "can generate a default server config using the 'server' declarative" do

data/spec/mongrel2/config/handler_spec.rb

@@ -11,11 +11,7 @@ require 'mongrel2/config'
 ###	C O N T E X T S
 #####################################################################
 
-describe Mongrel2::Config::Handler do
-
-	before( :all ) do
-		setup_config_db()
-	end
+describe Mongrel2::Config::Handler, :db do
 
 	before( :each ) do
 		Mongrel2::Config::Handler.truncate

data/spec/mongrel2/config/log_spec.rb

@@ -13,12 +13,7 @@ require 'mongrel2/config'
 ###	C O N T E X T S
 #####################################################################
 
-describe Mongrel2::Config::Log do
-
-	before( :all ) do
-		setup_config_db()
-	end
-
+describe Mongrel2::Config::Log, :db do
 
 	it "has a convenience method for writing to the commit log" do
 		what  = 'load etc/mongrel2.conf'

data/spec/mongrel2/config/route_spec.rb

@@ -11,11 +11,7 @@ require 'mongrel2/config'
 ###	C O N T E X T S
 #####################################################################
 
-describe Mongrel2::Config::Route do
-
-	before( :all ) do
-		setup_config_db()
-	end
+describe Mongrel2::Config::Route, :db do
 
 	before( :each ) do
 		@route = Mongrel2::Config::Route.new( :path => '' )

data/spec/mongrel2/config/server_spec.rb

@@ -11,11 +11,7 @@ require 'mongrel2/config'
 ###	C O N T E X T S
 #####################################################################
 
-describe Mongrel2::Config::Server do
-
-	before( :all ) do
-		setup_config_db()
-	end
+describe Mongrel2::Config::Server, :db do
 
 	before( :each ) do
 		@server = Mongrel2::Config::Server.new(

data/spec/mongrel2/handler_spec.rb

@@ -11,7 +11,7 @@ require 'mongrel2/handler'
 ###	C O N T E X T S
 #####################################################################
 
-describe Mongrel2::Handler do
+describe Mongrel2::Handler, :db do
 
 	# Make a handler class for testing that only ever handles one request, and
 	# keeps track of any requests it handles and their responses.
@@ -34,11 +34,6 @@ describe Mongrel2::Handler do
 	end # class OneShotHandler
 
 
-	before( :all ) do
-		setup_config_db()
-	end
-
-
 	# Ensure 0MQ never actually gets called
 	before( :each ) do
 		@ctx = double( '0mq context', close: nil )

data/spec/mongrel2/request_spec.rb

@@ -16,10 +16,9 @@ require 'mongrel2/request'
 ###	C O N T E X T S
 #####################################################################
 
-describe Mongrel2::Request do
+describe Mongrel2::Request, :db do
 
 	before( :all ) do
-		setup_config_db()
 
 		# Set up a test server config so the request can find the server's chroot
 		server 'specs' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongrel2
 version: !ruby/object:Gem::Version
-  version: 0.45.1
+  version: 0.46.0
 platform: ruby
 authors:
 - Michael Granger
@@ -35,7 +35,7 @@ cert_chain:
   w8aNA5re5+Rt/Vvjxj5AcEnZnZiz5x959NaddQocX32Z1unHw44pzRNUur1GInfW
   p4vpx2kUSFSAGjtCbDGTNV2AH8w9OU4xEmNz8c5lyoA=
   -----END CERTIFICATE-----
-date: 2016-11-04 00:00:00.000000000 Z
+date: 2016-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel