mongrel2 0.17.0 → 0.18.0

data/History.rdoc

@@ -1,3 +1,11 @@
+== v0.18.0 [2012-03-28] Michael Granger <ged@FaerieMUD.org>
+
+- Make the 'handler' DSL directive replace any existing handler with
+  its send_ident.
+- Add a validation to ensure that handler configs have unique send/recv
+  specs and IDs.
+
+
 == v0.17.0 [2012-03-18] Michael Granger <ged@FaerieMUD.org>
 
 - Squelch logging of expected SQL errors.

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.17.0'
+	VERSION = '0.18.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 023114cc92af $
+	REVISION = %q$Revision: 1d4e3af69f25 $
 
 
 	require 'mongrel2/logging'

data/lib/mongrel2/config/handler.rb

@@ -8,7 +8,7 @@ class Mongrel2::Config::Handler < Mongrel2::Config( :handler )
 
 	### As of Mongrel2/1.7.5:
 	# CREATE TABLE handler (id INTEGER PRIMARY KEY,
-	#     send_spec TEXT, 
+	#     send_spec TEXT,
 	#     send_ident TEXT,
 	#     recv_spec TEXT,
 	#     recv_ident TEXT,
@@ -31,7 +31,7 @@ class Mongrel2::Config::Handler < Mongrel2::Config( :handler )
 
 	##
 	# :method: by_send_ident( uuid )
-	# 
+	#
 	# Look up a Handler by its send_ident, which should be a +uuid+ or similar String.
 	def_dataset_method( :by_send_ident ) do |ident|
 		filter( :send_ident => ident )
@@ -43,6 +43,7 @@ class Mongrel2::Config::Handler < Mongrel2::Config( :handler )
 		self.validate_idents
 		self.validate_specs
 		self.validate_protocol
+		self.validate_uniqueness
 	end
 
 
@@ -103,6 +104,11 @@ class Mongrel2::Config::Handler < Mongrel2::Config( :handler )
 	end
 
 
+	### Ensure that handlers are unique.
+	def validate_uniqueness
+		self.validates_unique( :send_ident, :send_spec, :recv_spec )
+	end
+
 
 	#######
 	private

data/lib/mongrel2/config/host.rb

@@ -85,6 +85,12 @@ class Mongrel2::Config::Host < Mongrel2::Config( :host )
 				:recv_ident => recv_ident
 			)
 
+			existing = Mongrel2::Config::Handler.filter( :send_ident => send_ident )
+			unless existing.select( :id ).empty?
+				Mongrel2.log.debug "Dropping existing %p handler." % [ send_ident ]
+				existing.delete
+			end
+
 			Mongrel2.log.debug "Creating handler with options: %p" % [ options ]
 			return Mongrel2::Config::Handler.create( options )
 		end

data/spec/mongrel2/config/handler_spec.rb

@@ -114,5 +114,14 @@ describe Mongrel2::Config::Handler do
 		@handler.errors.full_messages.first.should =~ /invalid/i
 	end
 
+	it "isn't valid if its send_spec isn't unique" do
+		dup = @handler.dup
+		@handler.save
+
+		expect {
+			dup.save
+		}.to raise_error( Sequel::ValidationFailed, /is already taken/ )
+	end
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongrel2
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
   prerelease: 
 platform: ruby
 authors:
@@ -36,11 +36,11 @@ cert_chain:
   YUhDS0xaZFNLai9SSHVUT3QrZ2JsUmV4OEZBaDhOZUEKY21saFhlNDZwWk5K
   Z1dLYnhaYWg4NWpJang5NWhSOHZPSStOQU01aUg5a09xSzEzRHJ4YWNUS1Bo
   cWo1UGp3RgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2012-03-18 00:00:00.000000000 Z
+date: 2012-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70107726149280 !ruby/object:Gem::Requirement
+  requirement: &70218596769940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -48,10 +48,10 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70107726149280
+  version_requirements: *70218596769940
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &70107726148340 !ruby/object:Gem::Requirement
+  requirement: &70218596783860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -59,10 +59,10 @@ dependencies:
         version: '3.31'
   type: :runtime
   prerelease: false
-  version_requirements: *70107726148340
+  version_requirements: *70218596783860
 - !ruby/object:Gem::Dependency
   name: amalgalite
-  requirement: &70107726147900 !ruby/object:Gem::Requirement
+  requirement: &70218596781900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -70,10 +70,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70107726147900
+  version_requirements: *70218596781900
 - !ruby/object:Gem::Dependency
   name: tnetstring
-  requirement: &70107726147460 !ruby/object:Gem::Requirement
+  requirement: &70218596779800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -81,10 +81,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70107726147460
+  version_requirements: *70218596779800
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70107726147020 !ruby/object:Gem::Requirement
+  requirement: &70218596793520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -92,10 +92,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70107726147020
+  version_requirements: *70218596793520
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70107726146580 !ruby/object:Gem::Requirement
+  requirement: &70218596792320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -103,10 +103,10 @@ dependencies:
         version: '1.16'
   type: :runtime
   prerelease: false
-  version_requirements: *70107726146580
+  version_requirements: *70218596792320
 - !ruby/object:Gem::Dependency
   name: sysexits
-  requirement: &70107726146140 !ruby/object:Gem::Requirement
+  requirement: &70218596790980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -114,10 +114,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70107726146140
+  version_requirements: *70218596790980
 - !ruby/object:Gem::Dependency
   name: zmq
-  requirement: &70107726145700 !ruby/object:Gem::Requirement
+  requirement: &70218596790100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -125,10 +125,10 @@ dependencies:
         version: 2.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70107726145700
+  version_requirements: *70218596790100
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
-  requirement: &70107726145260 !ruby/object:Gem::Requirement
+  requirement: &70218596788920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -136,10 +136,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *70107726145260
+  version_requirements: *70218596788920
 - !ruby/object:Gem::Dependency
   name: hoe-highline
-  requirement: &70107726144780 !ruby/object:Gem::Requirement
+  requirement: &70218596786520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -147,10 +147,10 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *70107726144780
+  version_requirements: *70218596786520
 - !ruby/object:Gem::Dependency
   name: configurability
-  requirement: &70107726144300 !ruby/object:Gem::Requirement
+  requirement: &70218596801420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -158,10 +158,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70107726144300
+  version_requirements: *70218596801420
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70107726143860 !ruby/object:Gem::Requirement
+  requirement: &70218596799960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -169,10 +169,10 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70107726143860
+  version_requirements: *70218596799960
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70107726143420 !ruby/object:Gem::Requirement
+  requirement: &70218596798800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -180,10 +180,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70107726143420
+  version_requirements: *70218596798800
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70107726142980 !ruby/object:Gem::Requirement
+  requirement: &70218596797920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -191,10 +191,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *70107726142980
+  version_requirements: *70218596797920
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70107726142540 !ruby/object:Gem::Requirement
+  requirement: &70218596797120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -202,7 +202,7 @@ dependencies:
         version: '2.16'
   type: :development
   prerelease: false
-  version_requirements: *70107726142540
+  version_requirements: *70218596797120
 description: ! 'Ruby-Mongrel2 is a complete Ruby (1.9-only) connector for
 
   Mongrel2[http://mongrel2.org/].