mongrel2 0.22.1 → 0.23.0

data/ChangeLog

@@ -1,8 +1,20 @@
 2012-05-07  Michael Granger  <ged@FaerieMUD.org>
 
+	* .hgtags:
+	Added tag v0.22.1 for changeset ab969af3bf2c
+	[142eade04d61] [tip]
+
+	* .hgsigs:
+	Added signature for changeset c68ca662121f
+	[ab969af3bf2c] [v0.22.1]
+
+	* .rvm.gems, History.rdoc, Rakefile, lib/mongrel2.rb:
+	Fix loggability dependency version; bump patch version.
+	[c68ca662121f]
+
 	* .hgtags:
 	Added tag v0.22.0 for changeset 82e0a3ed6dc5
-	[666e8d88a6d7] [tip]
+	[666e8d88a6d7]
 
 	* .hgsigs:
 	Added signature for changeset e25ffaab1897
@@ -28,13 +40,13 @@
 	spec/mongrel2/logging_spec.rb, spec/mongrel2/mixins_spec.rb,
 	spec/mongrel2_spec.rb:
 	Convert to Loggability for logging.
-	[0da53476f796]
+	[0da53476f796] [github/master]
 
 2012-04-25  Michael Granger  <ged@FaerieMUD.org>
 
 	* bin/m2sh.rb:
 	Add an option to m2sh.rb to set the m2 port on the fly
-	[0a0238b4c238] [github/master]
+	[0a0238b4c238]
 
 2012-04-23  Michael Granger  <ged@FaerieMUD.org>
 

data/History.rdoc

@@ -1,3 +1,11 @@
+== v0.23.0 [2012-05-17] Michael Granger <ged@FaerieMUD.org>
+
+- Add a convenience method to Mongrel2::Handler for fetching its
+  associated config object.
+- Fix typos in m2sh.rb's exception handler
+- Bumping dependency on Loggability to 0.2.
+
+
 == v0.22.1 [2012-05-07] Michael Granger <ged@FaerieMUD.org>
 
 Fix loggability dependency version.

data/Rakefile

@@ -22,7 +22,6 @@ hoespec = Hoe.spec 'mongrel2' do
 	self.readme_file = 'README.rdoc'
 	self.history_file = 'History.rdoc'
 	self.extra_rdoc_files = Rake::FileList[ '*.rdoc' ]
-	self.spec_extras[:rdoc_options] = ['-t', 'Ruby-Mongrel2']
 
 	self.developer 'Michael Granger', 'ged@FaerieMUD.org'
 
@@ -34,7 +33,7 @@ hoespec = Hoe.spec 'mongrel2' do
 	self.dependency 'trollop',    '~> 1.16'
 	self.dependency 'sysexits',   '~> 1.0'
 	self.dependency 'zmq',        '~> 2.1'
-	self.dependency 'loggability','~> 0.0'
+	self.dependency 'loggability','~> 0.2'
 
 	self.dependency 'configurability', '~> 1.0', :developer
 	self.dependency 'simplecov',       '~> 0.6', :developer

data/bin/m2sh.rb

@@ -130,8 +130,8 @@ class Mongrel2::M2SHCommand
 		exit :ok
 
 	rescue => err
-		self.fatal "Oops: %s: %s" % [ err.class.name, err.message ]
-		self.debug { '  ' + err.backtrace.join("\n  ") }
+		self.log.fatal "Oops: %s: %s" % [ err.class.name, err.message ]
+		self.log.debug { '  ' + err.backtrace.join("\n  ") }
 
 		exit :software_error
 	end

data/lib/mongrel2/connection.rb

@@ -121,7 +121,7 @@ class Mongrel2::Connection
 	### 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 ]
+		header = "%s %d:%s," % [ sender_id, conn_id.to_s.length, conn_id ]
 		buf = header + ' ' + data
 		self.log.debug "Sending response (PUB): %p" % [ buf ]
 		self.response_sock.send( buf )

data/lib/mongrel2/handler.rb

@@ -119,7 +119,8 @@ class Mongrel2::Handler
 	### Create a new instance of the handler with the specified +app_id+, +send_spec+,
 	### and +recv_spec+.
 	def initialize( app_id, send_spec, recv_spec ) # :notnew:
-		@conn = Mongrel2::Connection.new( app_id, send_spec, recv_spec )
+		@app_id = app_id
+		@conn   = Mongrel2::Connection.new( app_id, send_spec, recv_spec )
 	end
 
 
@@ -130,6 +131,9 @@ class Mongrel2::Handler
 	# The handler's Mongrel2::Connection object.
 	attr_reader :conn
 
+	# The app ID the app was created with
+	attr_reader :app_id
+
 
 	### Run the handler.
 	def run
@@ -144,6 +148,13 @@ class Mongrel2::Handler
 	end
 
 
+	### Return the Mongrel2::Config::Handler that corresponds to this app's
+	### appid.
+	def handler_config
+		return Mongrel2::Config::Handler.by_send_ident( self.app_id ).first
+	end
+
+
 	### Shut down the handler.
 	def shutdown
 		self.log.info "Shutting down."

data/lib/mongrel2.rb

@@ -20,10 +20,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.22.1'
+	VERSION = '0.23.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: c68ca662121f $
+	REVISION = %q$Revision: 7d768d6e98ab $
 
 
 	require 'mongrel2/constants'

data/spec/mongrel2/handler_spec.rb

@@ -106,6 +106,17 @@ describe Mongrel2::Handler do
 			res.conn.pub_addr.should == TEST_RECV_SPEC
 		end
 
+		it "knows what handler config corresponds to its" do
+			req = make_request()
+			@request_sock.should_receive( :recv ).and_return( req )
+
+			res = OneShotHandler.run( TEST_UUID )
+
+			res.handler_config.should be_a( Mongrel2::Config::Handler )
+			res.handler_config.send_spec.should == TEST_SEND_SPEC
+			res.handler_config.recv_spec.should == TEST_RECV_SPEC
+		end
+
 	end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongrel2
 version: !ruby/object:Gem::Version
-  version: 0.22.1
+  version: 0.23.0
   prerelease: 
 platform: ruby
 authors:
@@ -36,7 +36,7 @@ cert_chain:
   YUhDS0xaZFNLai9SSHVUT3QrZ2JsUmV4OEZBaDhOZUEKY21saFhlNDZwWk5K
   Z1dLYnhaYWg4NWpJang5NWhSOHZPSStOQU01aUg5a09xSzEzRHJ4YWNUS1Bo
   cWo1UGp3RgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2012-05-07 00:00:00.000000000 Z
+date: 2012-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -173,7 +173,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -181,7 +181,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
   requirement: !ruby/object:Gem::Requirement