mongrel2 0.15.0 → 0.15.1

data/ChangeLog

@@ -1,8 +1,53 @@
+2012-03-01  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/mongrel2/connection.rb:
+	Fix some comments/debug statements in Connection
+	[16a888bc7999] [github/master, tip]
+
+	* lib/mongrel2/config/host.rb:
+	Make sure host deletes cascade to their routes
+	[b0f642f12cec]
+
+	* lib/mongrel2/config/dsl.rb:
+	Init the database outside of the transaction in the "server" DSL
+	method
+	[9ebc726b8fd1]
+
+	* examples/request-dumper.rb:
+	Remove the SAFE test from the request-dumper example
+	[e7fe8c9f32a5]
+
+	* bin/m2sh.rb:
+	Correct the line number of errors in configs loaded from m2sh.rb
+	[7c22054835a0]
+
+	* lib/mongrel2/config.rb:
+	Log SQL to the logger at DEBUG level
+	[06fa58a7eb4a]
+
 2012-02-27  Michael Granger  <ged@FaerieMUD.org>
 
+	* .hgtags:
+	Added tag v0.15.0 for changeset ed540a27e271
+	[dc3dafb80ae0]
+
+	* .hgsigs:
+	Added signature for changeset 43a5d2cb1865
+	[ed540a27e271] [v0.15.0]
+
+	* History.rdoc, lib/mongrel2.rb:
+	Bump the minor version, update history.
+	[43a5d2cb1865]
+
+	* lib/mongrel2/config/server.rb:
+	Fix the Mongrel2::Config::Server.by_uuid dataset method
+
+	Return a dataset instead of the instance.
+	[59a7fc6abae2]
+
 	* .hgtags:
 	Added tag v0.14.0 for changeset 5a2a21415dff
-	[aa9c635b978f] [tip]
+	[aa9c635b978f]
 
 	* .hgsigs:
 	Added signature for changeset e50e20d73e34
@@ -61,7 +106,7 @@
 	- Don't set a Content-type header
 	- Omit the body even if there is one
 	- Set the content-length to 0
-	[cdb39968287a] [github/master]
+	[cdb39968287a]
 
 2012-02-17  Michael Granger  <ged@FaerieMUD.org>
 

data/History.rdoc

@@ -1,3 +1,13 @@
+== v0.15.1 [2012-03-02] Michael Granger <ged@FaerieMUD.org>
+
+- Make sure Mongrel2::Config::Host deletes cascade to their routes
+- Init the database outside of the transaction in the "server" DSL
+  method
+- Remove the SAFE test from the request-dumper example
+- Correct the line number of errors in configs loaded from m2sh.rb
+- Log SQL to the logger at DEBUG level
+
+
 == v0.15.0 [2012-02-27] Michael Granger <ged@FaerieMUD.org>
 
 - Fix the Mongrel2::Config::Server.by_uuid dataset method to return a

data/bin/m2sh.rb

@@ -294,7 +294,7 @@ class Mongrel2::M2SHCommand
 		header "Loading config from #{configfile}"
 		source = File.read( configfile )
 
-		runspace.module_eval( source, configfile, 0 )
+		runspace.module_eval( source, configfile, 1 )
 	end
 	help :load, "Overwrite the config database with the values from the speciifed CONFIGFILE."
 	usage :load, <<-END_USAGE

data/examples/request-dumper.rb

@@ -22,28 +22,23 @@ class RequestDumper < Mongrel2::Handler
 
 	### Handle a request
 	def handle( request )
-		Thread.new do
-			Thread.current.abort_on_exception = true
-			$SAFE = 1
+		template = @template.dup
+		response = request.response
 
-			template = @template.dup
-			response = request.response
+		template.request = request
+		template.title = "Ruby-Mongrel2 Request Dumper"
+		template.safelevel = $SAFE
 
-			template.request = request
-			template.title = "Ruby-Mongrel2 Request Dumper"
-			template.safelevel = $SAFE
+		response.status = 200
+		response.headers.content_type = 'text/html'
+		response.puts( template )
 
-			response.status = 200
-			response.headers.content_type = 'text/html'
-			response.puts( template )
-
-			response
-		end.value
+		response
 	end
 
 end # class RequestDumper
 
-Mongrel2.log.level = $DEBUG ? Logger::DEBUG : Logger::INFO
+Mongrel2.log.level = Logger::DEBUG
 Inversion.log.level = Logger::INFO
 
 # Point to the config database, which will cause the handler to use

data/lib/mongrel2.rb

@@ -14,10 +14,10 @@ module Mongrel2
 	abort "\n\n>>> Mongrel2 requires Ruby 1.9.2 or later. <<<\n\n" if RUBY_VERSION < '1.9.2'
 
 	# Library version constant
-	VERSION = '0.15.0'
+	VERSION = '0.15.1'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 43a5d2cb1865 $
+	REVISION = %q$Revision: e943c9068b73 $
 
 
 	require 'mongrel2/logging'

data/lib/mongrel2/config.rb

@@ -124,6 +124,9 @@ module Mongrel2
 			if self == Mongrel2::Config
 				Mongrel2.log.debug "Resetting database connection for %d config classes to: %p" %
 					[ self.descendents.length, newdb ]
+				newdb.logger = Mongrel2.logger
+				newdb.sql_log_level = :debug
+
 				self.descendents.each {|subclass| subclass.db = newdb }
 			end
 		end

data/lib/mongrel2/config/dsl.rb

@@ -86,10 +86,11 @@ module Mongrel2::Config::DSL
 	def server( uuid, &block )
 		adapter = nil
 
+		Mongrel2.log.info "Ensuring db is set up..."
+		Mongrel2::Config.init_database
+
 		Mongrel2.log.info "Entering transaction for server %p" % [ uuid ]
 		Mongrel2::Config.db.transaction do
-			Mongrel2.log.info "  ensuring db is set up..."
-			Mongrel2::Config.init_database
 
 			# Set up the options hash with the UUID and reasonable defaults
 			# for everything else

data/lib/mongrel2/config/host.rb

@@ -16,6 +16,13 @@ class Mongrel2::Config::Host < Mongrel2::Config( :host )
 	one_to_many :routes
 	many_to_one :server
 
+
+	### Clean up the host's routes when it's destroyed.
+	def before_destroy
+		self.routes.each( &:destroy )
+	end
+
+
 	### DSL methods for the Server context besides those automatically-generated from its
 	### columns.
 	module DSLMethods

data/lib/mongrel2/connection.rb

@@ -110,11 +110,12 @@ class Mongrel2::Connection
 	### Fetch the next request from the server as a Mongrel2::Request object.
 	def receive
 		raw_req = self.recv
+		self.log.debug "Receive: parsing raw request: %d bytes" % [ raw_req.bytesize ]
 		return Mongrel2::Request.parse( raw_req )
 	end
 
 
-	### Write a raw +data+ to the given connection ID (+conn_id+) at the given +sender_id+.
+	### Write raw +data+ to the given connection ID (+conn_id+) at the given +sender_id+.
 	def send( sender_id, conn_id, data )
 		self.check_closed
         header = "%s %d:%s," % [ sender_id, conn_id.to_s.length, conn_id ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongrel2
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1
   prerelease: 
 platform: ruby
 authors:
@@ -36,11 +36,11 @@ cert_chain:
   YUhDS0xaZFNLai9SSHVUT3QrZ2JsUmV4OEZBaDhOZUEKY21saFhlNDZwWk5K
   Z1dLYnhaYWg4NWpJang5NWhSOHZPSStOQU01aUg5a09xSzEzRHJ4YWNUS1Bo
   cWo1UGp3RgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2012-02-27 00:00:00.000000000 Z
+date: 2012-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70183892949060 !ruby/object:Gem::Requirement
+  requirement: &70344063433420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -48,10 +48,10 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70183892949060
+  version_requirements: *70344063433420
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &70183892948300 !ruby/object:Gem::Requirement
+  requirement: &70344063432920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -59,10 +59,10 @@ dependencies:
         version: '3.31'
   type: :runtime
   prerelease: false
-  version_requirements: *70183892948300
+  version_requirements: *70344063432920
 - !ruby/object:Gem::Dependency
   name: amalgalite
-  requirement: &70183892947260 !ruby/object:Gem::Requirement
+  requirement: &70344063448860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -70,10 +70,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70183892947260
+  version_requirements: *70344063448860
 - !ruby/object:Gem::Dependency
   name: tnetstring
-  requirement: &70183892946540 !ruby/object:Gem::Requirement
+  requirement: &70344063448440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -81,10 +81,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70183892946540
+  version_requirements: *70344063448440
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70183892945340 !ruby/object:Gem::Requirement
+  requirement: &70344063448020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -92,10 +92,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70183892945340
+  version_requirements: *70344063448020
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70183897140160 !ruby/object:Gem::Requirement
+  requirement: &70344063447600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -103,10 +103,10 @@ dependencies:
         version: '1.16'
   type: :runtime
   prerelease: false
-  version_requirements: *70183897140160
+  version_requirements: *70344063447600
 - !ruby/object:Gem::Dependency
   name: sysexits
-  requirement: &70183897139300 !ruby/object:Gem::Requirement
+  requirement: &70344063447180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -114,10 +114,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70183897139300
+  version_requirements: *70344063447180
 - !ruby/object:Gem::Dependency
   name: zmq
-  requirement: &70183897137840 !ruby/object:Gem::Requirement
+  requirement: &70344063446760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -125,10 +125,10 @@ dependencies:
         version: 2.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70183897137840
+  version_requirements: *70344063446760
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
-  requirement: &70183897136860 !ruby/object:Gem::Requirement
+  requirement: &70344063446340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -136,10 +136,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *70183897136860
+  version_requirements: *70344063446340
 - !ruby/object:Gem::Dependency
   name: hoe-highline
-  requirement: &70183897136040 !ruby/object:Gem::Requirement
+  requirement: &70344063445860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -147,10 +147,10 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *70183897136040
+  version_requirements: *70344063445860
 - !ruby/object:Gem::Dependency
   name: configurability
-  requirement: &70183897135140 !ruby/object:Gem::Requirement
+  requirement: &70344063445400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -158,10 +158,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70183897135140
+  version_requirements: *70344063445400
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70183897134280 !ruby/object:Gem::Requirement
+  requirement: &70344063444980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -169,10 +169,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70183897134280
+  version_requirements: *70344063444980
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70183897133440 !ruby/object:Gem::Requirement
+  requirement: &70344063444560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -180,10 +180,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *70183897133440
+  version_requirements: *70344063444560
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70183897156460 !ruby/object:Gem::Requirement
+  requirement: &70344063444080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -191,7 +191,7 @@ dependencies:
         version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: *70183897156460
+  version_requirements: *70344063444080
 description: ! "Ruby-Mongrel2 is a complete Ruby (1.9-only) connector for \nMongrel2[http://mongrel2.org/].\n\nThis
   library includes configuration-database ORM classes, a Ruby\nimplementation of the
   'm2sh' tool, a configuration DSL for generating config\ndatabases in pure Ruby,