mongrel2 0.16.0 → 0.17.0

data/History.rdoc

@@ -1,3 +1,13 @@
+== v0.17.0 [2012-03-18] Michael Granger <ged@FaerieMUD.org>
+
+- Squelch logging of expected SQL errors.
+  Errors are normal during Mongrel2::Config.db= and
+  .database_initialized?, so add a new .without_sql_logging method for
+  temporarily disabling SQL logging, and wrap that around the methods
+  in quesion.
+- Fix documentation for WebSocket#validate_control_frame
+
+
 == v0.16.0 [2012-03-10] Michael Granger <ged@FaerieMUD.org>
 
 - Add WebSocket (RFC6455) support

data/Rakefile

@@ -35,6 +35,7 @@ hoespec = Hoe.spec 'mongrel2' do
 	self.dependency 'zmq',        '~> 2.1.4'
 
 	self.dependency 'configurability', '~> 1.0', :developer
+	self.dependency 'simplecov',       '~> 0.6', :developer
 	self.dependency 'rspec',           '~> 2.8', :developer
 
 	self.spec_extras[:licenses] = ["BSD"]

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.16.0'
+	VERSION = '0.17.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 4fc45a463af8 $
+	REVISION = %q$Revision: 023114cc92af $
 
 
 	require 'mongrel2/logging'

data/lib/mongrel2/config.rb

@@ -120,7 +120,10 @@ module Mongrel2
 		### Reset the database connection that all model objects will use to +newdb+, which should
 		### be a Sequel::Database.
 		def self::db=( newdb )
-			super
+			self.without_sql_logging( newdb ) do
+				super
+			end
+
 			if self == Mongrel2::Config
 				Mongrel2.log.debug "Resetting database connection for %d config classes to: %p" %
 					[ self.descendents.length, newdb ]
@@ -166,7 +169,9 @@ module Mongrel2
 		### Returns +true+ if the config database has been installed. This currently only
 		### checks to see if the 'server' table exists for the sake of speed.
 		def self::database_initialized?
-			return self.db.table_exists?( :server )
+			return self.without_sql_logging do
+				self.db.table_exists?( :server )
+			end
 		end
 
 
@@ -202,6 +207,24 @@ module Mongrel2
 			return Pathname( pathname )
 		end
 
+
+		#########
+		protected
+		#########
+
+		### Execute a block after removing all loggers from the current database handle, then
+		### restore them before returning.
+		def self::without_sql_logging( logged_db=nil )
+			logged_db ||= self.db
+
+			loggers_to_restore = logged_db.loggers.dup
+			logged_db.loggers.clear
+			yield
+		ensure
+			logged_db.loggers.replace( loggers_to_restore )
+		end
+
+
 	end # class Config
 
 

data/lib/mongrel2/websocket.rb

@@ -516,7 +516,7 @@ module Mongrel2::WebSocket
 		end
 
 
-		### Sanity-check control frame +data+, raising a Mongrel2::WebSocket::FrameError
+		### Sanity-check control frame +data+, adding an error message to #errors
 		### if there's a problem.
 		def validate_control_frame
 			return unless self.control?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongrel2
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
   prerelease: 
 platform: ruby
 authors:
@@ -36,11 +36,11 @@ cert_chain:
   YUhDS0xaZFNLai9SSHVUT3QrZ2JsUmV4OEZBaDhOZUEKY21saFhlNDZwWk5K
   Z1dLYnhaYWg4NWpJang5NWhSOHZPSStOQU01aUg5a09xSzEzRHJ4YWNUS1Bo
   cWo1UGp3RgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2012-03-10 00:00:00.000000000 Z
+date: 2012-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70305464835520 !ruby/object:Gem::Requirement
+  requirement: &70107726149280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -48,10 +48,10 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70305464835520
+  version_requirements: *70107726149280
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &70305464833340 !ruby/object:Gem::Requirement
+  requirement: &70107726148340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -59,10 +59,10 @@ dependencies:
         version: '3.31'
   type: :runtime
   prerelease: false
-  version_requirements: *70305464833340
+  version_requirements: *70107726148340
 - !ruby/object:Gem::Dependency
   name: amalgalite
-  requirement: &70305464831960 !ruby/object:Gem::Requirement
+  requirement: &70107726147900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -70,10 +70,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70305464831960
+  version_requirements: *70107726147900
 - !ruby/object:Gem::Dependency
   name: tnetstring
-  requirement: &70305464844480 !ruby/object:Gem::Requirement
+  requirement: &70107726147460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -81,10 +81,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70305464844480
+  version_requirements: *70107726147460
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70305464842260 !ruby/object:Gem::Requirement
+  requirement: &70107726147020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -92,10 +92,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70305464842260
+  version_requirements: *70107726147020
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70305464839740 !ruby/object:Gem::Requirement
+  requirement: &70107726146580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -103,10 +103,10 @@ dependencies:
         version: '1.16'
   type: :runtime
   prerelease: false
-  version_requirements: *70305464839740
+  version_requirements: *70107726146580
 - !ruby/object:Gem::Dependency
   name: sysexits
-  requirement: &70305464852820 !ruby/object:Gem::Requirement
+  requirement: &70107726146140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -114,10 +114,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70305464852820
+  version_requirements: *70107726146140
 - !ruby/object:Gem::Dependency
   name: zmq
-  requirement: &70305464851800 !ruby/object:Gem::Requirement
+  requirement: &70107726145700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -125,10 +125,10 @@ dependencies:
         version: 2.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70305464851800
+  version_requirements: *70107726145700
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
-  requirement: &70305464850060 !ruby/object:Gem::Requirement
+  requirement: &70107726145260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -136,10 +136,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *70305464850060
+  version_requirements: *70107726145260
 - !ruby/object:Gem::Dependency
   name: hoe-highline
-  requirement: &70305464859060 !ruby/object:Gem::Requirement
+  requirement: &70107726144780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -147,10 +147,10 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *70305464859060
+  version_requirements: *70107726144780
 - !ruby/object:Gem::Dependency
   name: configurability
-  requirement: &70305464855380 !ruby/object:Gem::Requirement
+  requirement: &70107726144300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -158,10 +158,21 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70305464855380
+  version_requirements: *70107726144300
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: &70107726143860 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: *70107726143860
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70305464868220 !ruby/object:Gem::Requirement
+  requirement: &70107726143420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -169,10 +180,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70305464868220
+  version_requirements: *70107726143420
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70305464871220 !ruby/object:Gem::Requirement
+  requirement: &70107726142980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -180,18 +191,18 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *70305464871220
+  version_requirements: *70107726142980
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70305464910100 !ruby/object:Gem::Requirement
+  requirement: &70107726142540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '2.16'
   type: :development
   prerelease: false
-  version_requirements: *70305464910100
+  version_requirements: *70107726142540
 description: ! 'Ruby-Mongrel2 is a complete Ruby (1.9-only) connector for
 
   Mongrel2[http://mongrel2.org/].
@@ -210,11 +221,11 @@ executables:
 - m2sh.rb
 extensions: []
 extra_rdoc_files:
-- Manifest.txt
-- examples/README.txt
 - DSL.rdoc
 - History.rdoc
+- Manifest.txt
 - README.rdoc
+- examples/README.txt
 files:
 - .autotest
 - .gemtest