mongrel2 0.12.0 → 0.13.0

data/History.rdoc

@@ -1,3 +1,14 @@
+== v0.13.0 [2012-02-24] Michael Granger <ged@FaerieMUD.org>
+
+- Fix the ZMQ socket identifier used by Connection.
+- Add missing slash in the control socket URI
+- Add an argument so the helloworld handler can use another config DB
+- Fix handling of NO CONTENT (204) responses.
+  * Don't set a Content-type header
+  * Omit the body even if there is one
+  * Set the content-length to 0
+
+
 == v0.12.0 [2012-02-17] Michael Granger <ged@FaerieMUD.org>
 
 - Add bodiless response predicate to Mongrel2::HTTPResponse.

data/examples/helloworld-handler.rb

@@ -20,12 +20,14 @@ class HelloWorldHandler < Mongrel2::Handler
 
 end # class HelloWorldHandler
 
+configdb = ARGV.shift || 'examples.sqlite'
+
 # Log to a file instead of STDERR for a bit more speed.
-Mongrel2.log = Logger.new( 'hello-world.log' )
-Mongrel2.log.level = Logger::INFO
+# Mongrel2.log = Logger.new( 'hello-world.log' )
+Mongrel2.log.level = Logger::DEBUG
 
 # Point to the config database, which will cause the handler to use
 # its ID to look up its own socket info.
-Mongrel2::Config.configure( :configdb => 'examples.sqlite' )
+Mongrel2::Config.configure( configdb: configdb )
 HelloWorldHandler.run( 'helloworld-handler' )
 

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.12.0'
+	VERSION = '0.13.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 7cd687a35c4c $
+	REVISION = %q$Revision: 612156a7bc00 $
 
 
 	require 'mongrel2/logging'

data/lib/mongrel2/config/server.rb

@@ -46,7 +46,7 @@ class Mongrel2::Config::Server < Mongrel2::Config( :server )
 
 		csock_path = Pathname( self.chroot ) + sock_path
 		Mongrel2.log.debug "  fully-qualified path is: %p" % [ csock_path ]
-		csock_uri = "%s:/%s" % [ scheme, csock_path ]
+		csock_uri = "%s://%s" % [ scheme, csock_path ]
 
 		Mongrel2.log.debug "  control socket URI is: %p" % [ csock_uri ]
 		return csock_uri

data/lib/mongrel2/connection.rb

@@ -1,7 +1,9 @@
 #!/usr/bin/ruby
 
+require 'socket'
 require 'zmq'
 require 'yajl'
+require 'digest/sha1'
 
 require 'mongrel2' unless defined?( Mongrel2 )
 require 'mongrel2/mixins'
@@ -22,12 +24,14 @@ class Mongrel2::Connection
 	### will connect to a Mongrel2 server on the +sub_addr+ and +pub_addr+ (e.g., 
 	### 'tcp://127.0.0.1:9998').
 	def initialize( app_id, sub_addr, pub_addr )
-		@app_id   = app_id
-		@sub_addr = sub_addr
-		@pub_addr = pub_addr
+		@app_id       = app_id
+		@sub_addr     = sub_addr
+		@pub_addr     = pub_addr
 
 		@request_sock = @response_sock = nil
-		@closed = false
+
+		@identifier   = make_identifier( app_id )
+		@closed       = false
 	end
 
 
@@ -43,9 +47,12 @@ class Mongrel2::Connection
 	public
 	######
 
-	# The application's UUID that identifies it to Mongrel2
+	# The application's identifier string that associates it with its route
 	attr_reader :app_id
 
+	# The ZMQ socket identity used by this connection
+	attr_reader :identifier
+
 	# The connection's subscription (request) socket address
 	attr_reader :sub_addr
 
@@ -58,16 +65,16 @@ class Mongrel2::Connection
 		ctx = Mongrel2.zmq_context
 		self.log.debug "0mq Context is: %p" % [ ctx ]
 
-		self.log.info "Connecting PULL request socket (%s)" % [ @sub_addr ]
+		self.log.info "Connecting PULL request socket (%s)" % [ self.sub_addr ]
 		@request_sock  = ctx.socket( ZMQ::PULL )
 		@request_sock.setsockopt( ZMQ::LINGER, 0 )
-		@request_sock.connect( @sub_addr )
+		@request_sock.connect( self.sub_addr )
 
-		self.log.info "Connecting PUB response socket (%s)" % [ @pub_addr ]
+		self.log.info "Connecting PUB response socket (%s)" % [ self.pub_addr ]
 		@response_sock  = ctx.socket( ZMQ::PUB )
-		@response_sock.setsockopt( ZMQ::IDENTITY, @app_id )
+		@response_sock.setsockopt( ZMQ::IDENTITY, self.identifier )
 		@response_sock.setsockopt( ZMQ::LINGER, 0 )
-		@response_sock.connect( @pub_addr )
+		@response_sock.connect( self.pub_addr )
 	end
 
 
@@ -114,7 +121,7 @@ class Mongrel2::Connection
 		buf = header + ' ' + data
 		self.log.debug "Sending response (PUB): %p" % [ buf ]
 		self.response_sock.send( buf )
-		self.log.debug "  done with send."
+		self.log.debug "  done with send (%d bytes)" % [ buf.bytesize ]
 	end
 
 
@@ -214,6 +221,23 @@ class Mongrel2::Connection
 		raise Mongrel2::ConnectionError, "operation on closed Connection" if self.closed?
 	end
 
+
+	#######
+	private
+	#######
+
+	### Make a unique identifier for this connection's socket based on the +app_id+
+	### and some other stuff.
+	def make_identifier( app_id )
+		identifier = Digest::SHA1.new
+		identifier << app_id
+		identifier << Socket.gethostname
+		identifier << Process.pid.to_s
+		identifier << Time.now.to_s
+
+		return identifier.hexdigest
+	end
+
 end # class Mongrel2::Connection
 
 # vim: set nosta noet ts=4 sw=4:

data/lib/mongrel2/httpresponse.rb

@@ -59,7 +59,7 @@ class Mongrel2::HTTPResponse < Mongrel2::Response
 		return [
 			self.status_line,
 			self.header_data,
-			self.body
+			self.bodiless? ? '' : self.body
 		].join( "\r\n" )
 	end
 
@@ -99,6 +99,7 @@ class Mongrel2::HTTPResponse < Mongrel2::Response
 		return self.status_category == 1
 	end
 
+
 	### Return true if response is in the 2XX range
 	def status_is_successful?
 		return self.status_category == 2
@@ -160,7 +161,12 @@ class Mongrel2::HTTPResponse < Mongrel2::Response
 
 		headers[:date] ||= Time.now.httpdate
 		headers[:content_length] ||= self.get_content_length
-		headers[:content_type] ||= DEFAULT_CONTENT_TYPE.dup
+
+		if self.bodiless?
+			headers.delete( :content_type )
+		else
+			headers[:content_type] ||= DEFAULT_CONTENT_TYPE.dup
+		end
 
 		return headers
 	end
@@ -170,7 +176,9 @@ class Mongrel2::HTTPResponse < Mongrel2::Response
 	### one, or using #seek and #tell if it implements those. If neither of those are
 	### possible, an exception is raised.
 	def get_content_length
-		if self.body.respond_to?( :bytesize )
+		if self.bodiless?
+			return 0
+		elsif self.body.respond_to?( :bytesize )
 			return self.body.bytesize
 		elsif self.body.respond_to?( :seek ) && self.body.respond_to?( :tell )
 			starting_pos = self.body.tell

data/spec/mongrel2/config/server_spec.rb

@@ -83,13 +83,13 @@ describe Mongrel2::Config::Server do
 
 	it "knows where its control socket is if there's no setting for control_port" do
 		Mongrel2::Config::Setting.dataset.truncate
-		@server.control_socket_uri.should == 'ipc://usr/local/www/run/control'
+		@server.control_socket_uri.should == 'ipc:///usr/local/www/run/control'
 	end
 
 	it "knows where its control socket is if there is a setting for control_port" do
 		Mongrel2::Config::Setting.dataset.truncate
 		Mongrel2::Config::Setting.create( key: 'control_port', value: 'ipc://var/run/control.sock' )
-		@server.control_socket_uri.should == 'ipc://usr/local/www/var/run/control.sock'
+		@server.control_socket_uri.should == 'ipc:///usr/local/www/var/run/control.sock'
 	end
 
 	it "can create a Mongrel2::Control for its control port" do

data/spec/mongrel2/connection_spec.rb

@@ -61,7 +61,7 @@ describe Mongrel2::Connection do
 
 		@ctx.should_receive( :socket ).with( ZMQ::PUB ).and_return( response_sock )
 		response_sock.should_receive( :setsockopt ).with( ZMQ::LINGER, 0 )
-		response_sock.should_receive( :setsockopt ).with( ZMQ::IDENTITY, TEST_UUID )
+		response_sock.should_receive( :setsockopt ).with( ZMQ::IDENTITY, /^[[:xdigit:]]{40}$/ )
 		response_sock.should_receive( :connect ).with( TEST_RECV_SPEC )
 
 		@conn.request_sock.should == request_sock

data/spec/mongrel2/httpresponse_spec.rb

@@ -52,6 +52,14 @@ describe Mongrel2::HTTPResponse do
 		@response.status_line.should == 'HTTP/1.1 204 No Content'
 	end
 
+	it "returns an empty response if its status is set to NO_CONTENT" do
+		@response.puts "The response body"
+		@response.status = HTTP::NO_CONTENT
+		@response.header_data.should =~ /Content-length: 0/i
+		@response.header_data.should_not =~ /Content-type/i
+		@response.to_s.should_not =~ /The response body/i
+	end
+
 	it "sets Date, Content-type, and Content-length headers automatically if they haven't been set" do
 		@response << "Some stuff."
 
@@ -216,6 +224,11 @@ describe Mongrel2::HTTPResponse do
 	end
 
 
+	it "returns a body length of 0 if it's a bodiless reponse" do
+		@response.status = HTTP::NO_CONTENT
+		@response.get_content_length.should == 0
+	end
+
 	it "raises a descriptive error message if it can't get the body's length" do
 		@response.body = Object.new
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongrel2
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
   prerelease: 
 platform: ruby
 authors:
@@ -36,11 +36,11 @@ cert_chain:
   YUhDS0xaZFNLai9SSHVUT3QrZ2JsUmV4OEZBaDhOZUEKY21saFhlNDZwWk5K
   Z1dLYnhaYWg4NWpJang5NWhSOHZPSStOQU01aUg5a09xSzEzRHJ4YWNUS1Bo
   cWo1UGp3RgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2012-02-18 00:00:00.000000000 Z
+date: 2012-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70186557497160 !ruby/object:Gem::Requirement
+  requirement: &70146044712400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -48,10 +48,10 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70186557497160
+  version_requirements: *70146044712400
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &70186557496640 !ruby/object:Gem::Requirement
+  requirement: &70146044711880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -59,10 +59,10 @@ dependencies:
         version: '3.31'
   type: :runtime
   prerelease: false
-  version_requirements: *70186557496640
+  version_requirements: *70146044711880
 - !ruby/object:Gem::Dependency
   name: amalgalite
-  requirement: &70186557496120 !ruby/object:Gem::Requirement
+  requirement: &70146044711420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -70,10 +70,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70186557496120
+  version_requirements: *70146044711420
 - !ruby/object:Gem::Dependency
   name: tnetstring
-  requirement: &70186557495600 !ruby/object:Gem::Requirement
+  requirement: &70146044710880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -81,10 +81,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70186557495600
+  version_requirements: *70146044710880
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70186557495180 !ruby/object:Gem::Requirement
+  requirement: &70146044710460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -92,10 +92,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70186557495180
+  version_requirements: *70146044710460
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70186557494640 !ruby/object:Gem::Requirement
+  requirement: &70146044709900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -103,10 +103,10 @@ dependencies:
         version: '1.16'
   type: :runtime
   prerelease: false
-  version_requirements: *70186557494640
+  version_requirements: *70146044709900
 - !ruby/object:Gem::Dependency
   name: sysexits
-  requirement: &70186557494140 !ruby/object:Gem::Requirement
+  requirement: &70146044709400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -114,10 +114,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70186557494140
+  version_requirements: *70146044709400
 - !ruby/object:Gem::Dependency
   name: zmq
-  requirement: &70186557493620 !ruby/object:Gem::Requirement
+  requirement: &70146044708880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -125,10 +125,10 @@ dependencies:
         version: 2.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70186557493620
+  version_requirements: *70146044708880
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
-  requirement: &70186557493100 !ruby/object:Gem::Requirement
+  requirement: &70146044708360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -136,10 +136,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *70186557493100
+  version_requirements: *70146044708360
 - !ruby/object:Gem::Dependency
   name: hoe-highline
-  requirement: &70186557492580 !ruby/object:Gem::Requirement
+  requirement: &70146044707840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -147,10 +147,10 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *70186557492580
+  version_requirements: *70146044707840
 - !ruby/object:Gem::Dependency
   name: configurability
-  requirement: &70186557491940 !ruby/object:Gem::Requirement
+  requirement: &70146044707080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -158,10 +158,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70186557491940
+  version_requirements: *70146044707080
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70186557490880 !ruby/object:Gem::Requirement
+  requirement: &70146044706060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -169,10 +169,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70186557490880
+  version_requirements: *70146044706060
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70186557506660 !ruby/object:Gem::Requirement
+  requirement: &70146044773520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -180,10 +180,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *70186557506660
+  version_requirements: *70146044773520
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70186557506040 !ruby/object:Gem::Requirement
+  requirement: &70146044773000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -191,7 +191,7 @@ dependencies:
         version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: *70186557506040
+  version_requirements: *70146044773000
 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,