mongrel2 0.3.0 → 0.3.1

data/ChangeLog

@@ -1,8 +1,39 @@
+2011-09-27  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.3.1 for changeset 844ff1c3ef53
+	[f01c6e6098bb] [tip]
+
+	* .hgsigs:
+	Added signature for changeset dff90858f4cd
+	[844ff1c3ef53] [v0.3.1]
+
+	* History.rdoc, lib/mongrel2.rb:
+	Bump patch version, update history for release.
+	[dff90858f4cd]
+
+	* lib/mongrel2/httpresponse.rb, spec/mongrel2/httpresponse_spec.rb:
+	Report the size of the response body in bytes, not characters
+	[f41c8d38bb25]
+
+	* lib/mongrel2/handler.rb:
+	Report unhandled disconnect notices as INFO instead of WARN
+	[d5b3e7c4075e]
+
+	* lib/mongrel2/connection.rb, spec/mongrel2/connection_spec.rb:
+	Made a stringified connection show the useful parts of the inspect
+	output
+	[aa4b85dc3470]
+
+	* README.rdoc:
+	Made the synopsis in the README stand a little better on its own
+	[b26dbd8d93f9]
+
 2011-09-23  Michael Granger  <ged@FaerieMUD.org>
 
 	* .hgtags:
 	Added tag v0.3.0 for changeset 627526429d63
-	[9c054d0e96c0] [tip]
+	[9c054d0e96c0]
 
 	* .hgsigs:
 	Added signature for changeset 745c431bcc1b
@@ -129,7 +160,7 @@
 
 	* lib/mongrel2/constants.rb:
 	Whitespace fix; add missing HTTP::CONTINUE constant.
-	[3082d251f00c] [github/master]
+	[3082d251f00c]
 
 2011-09-18  Michael Granger  <ged@FaerieMUD.org>
 
@@ -203,14 +234,18 @@
 	* Automated merge with ssh://deveiate.org/Ruby-Mongrel2
 	[2da76acfb8db]
 
-	* History.rdoc:
-	Updating History
-	[3b013d4918c6]
-
 	* Rakefile:
 	Automated merge with ssh://deveiate.org/Ruby-Mongrel2
 	[e3908fd8e744]
 
+	* Rakefile:
+	Remove ChangeLog task, since hoe-deveiate already does it
+	[5f4982a32949]
+
+	* History.rdoc:
+	Updating History
+	[3b013d4918c6]
+
 	* .hgtags:
 	Added tag v0.1.1 for changeset 42da048fe158
 	[2489be2693d5]
@@ -227,10 +262,6 @@
 	Updated rbzmq dependency
 	[758fe465780e]
 
-	* Rakefile:
-	Remove ChangeLog task, since hoe-deveiate already does it
-	[5f4982a32949]
-
 	* .hgtags:
 	Added tag v0.1.0 for changeset 55c8f01c01c6
 	[39b509c68142]
@@ -272,11 +303,15 @@
 	Merged with 3659a56af8fb
 	[f2201728e874]
 
+	* .hgignore:
+	Ignoring packaging directory
+	[0613976b6735]
+
 2011-09-12  Michael Granger  <ged@FaerieMUD.org>
 
 	* README.rdoc:
 	README fixes
-	[3659a56af8fb]
+	[3659a56af8fb] [github/master]
 
 	* Rakefile:
 	Fixing gem name
@@ -340,12 +375,6 @@
 	procedures.
 	[19e0a72320dd]
 
-2011-09-13  Michael Granger  <ged@FaerieMUD.org>
-
-	* .hgignore:
-	Ignoring packaging directory
-	[0613976b6735]
-
 2011-09-10  Michael Granger  <ged@FaerieMUD.org>
 
 	* bin/m2sh.rb:
@@ -386,6 +415,18 @@
 	* Merged with 6ea60b67e106
 	[6d5341f30cc4]
 
+	* Manifest.txt:
+	Updating the manifest for the first release
+	[916a79570cdc]
+
+	* examples/helloworld-handler.rb, lib/mongrel2/handler.rb:
+	More Handler API docs.
+	[47427db9b4fb]
+
+	* lib/mongrel2/handler.rb:
+	Adding some Mongrel2::Handler API docs.
+	[da95bfdf83da]
+
 	* lib/mongrel2/config/host.rb:
 	Adding a many_to_one association for the server belonging to a
 	Mongrel2::Config::Host
@@ -405,18 +446,6 @@
 	Adding a proftools dump of the requestdumper app
 	[00cbc1b89a61]
 
-	* Manifest.txt:
-	Updating the manifest for the first release
-	[916a79570cdc]
-
-	* examples/helloworld-handler.rb, lib/mongrel2/handler.rb:
-	More Handler API docs.
-	[47427db9b4fb]
-
-	* lib/mongrel2/handler.rb:
-	Adding some Mongrel2::Handler API docs.
-	[da95bfdf83da]
-
 2011-09-08  Michael Granger  <ged@FaerieMUD.org>
 
 	* README.rdoc, lib/mongrel2.rb, lib/mongrel2/config.rb,

data/History.rdoc

@@ -1,3 +1,14 @@
+== v0.3.1 [2011-09-27] Michael Granger <ged@FaerieMUD.org>
+
+Bugfix:
+- Measure the content-length of HTTPResponse in bytes, not characters.
+- Log unhandled disconnect notices as INFO instead of WARN
+
+Enhancements:
+- Made a stringified connection show the useful parts of the inspect
+  output
+
+
 == v0.3.0 [2011-09-23] Michael Granger <ged@FaerieMUD.org>
 
 - Mongrel2::Client fixes/documentation updates.

data/README.rdoc

@@ -5,7 +5,8 @@
 
 == Description
 
-A complete Ruby connector for Mongrel2[http://mongrel2.org/].
+Ruby-Mongrel2 is a complete Ruby (1.9-only) connector for 
+Mongrel2[http://mongrel2.org/].
 
 This library includes configuration-database ORM classes, a Ruby
 implementation of the 'm2sh' tool, a configuration DSL for generating config

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.3.0'
+	VERSION = '0.3.1'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 745c431bcc1b $
+	REVISION = %q$Revision: dff90858f4cd $
 
 
 	require 'mongrel2/logging'

data/lib/mongrel2/connection.rb

@@ -168,6 +168,15 @@ class Mongrel2::Connection
 	end
 
 
+	### Return a string describing the connection.
+	def to_s
+		return "{%s} %s <-> %s" % [
+			self.app_id,
+			self.sub_addr,
+			self.pub_addr,
+		]
+	end
+
 	### Returns a string containing a human-readable representation of the Connection,
 	### suitable for debugging.
 	def inspect
@@ -181,12 +190,10 @@ class Mongrel2::Connection
 			"not connected"
 		end
 
-		return "#<%p:0x%016x {%s} %s <-> %s (%s)>" % [
+		return "#<%p:0x%016x %s (%s)>" % [
 			self.class,
 			self.object_id * 2,
-			self.app_id,
-			self.sub_addr,
-			self.pub_addr,
+			self.to_s,
 			state,
 		]
 	end

data/lib/mongrel2/handler.rb

@@ -254,7 +254,7 @@ class Mongrel2::Handler
 	### Handle a disconnect notice from Mongrel2 via the given +request+. Its return value
 	### is ignored.
 	def handle_disconnect( request )
-		self.log.warn "Unhandled disconnect notice."
+		self.log.info "Unhandled disconnect notice."
 		return nil
 	end
 

data/lib/mongrel2/httpresponse.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/ruby
+#encoding: utf-8
 
 require 'time'
 
@@ -153,8 +154,8 @@ 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 @body.respond_to?( :length )
-			return @body.length
+		if @body.respond_to?( :bytesize )
+			return @body.bytesize
 		elsif @body.respond_to?( :seek ) && @body.respond_to?( :tell )
 			starting_pos = @body.tell
 			@body.seek( 0, IO::SEEK_END )

data/spec/mongrel2/connection_spec.rb

@@ -68,6 +68,10 @@ describe Mongrel2::Connection do
 		@conn.response_sock.should == response_sock
 	end
 
+	it "stringifies as a description of the appid and both sockets" do
+		@conn.to_s.should == "{#{TEST_UUID}} #{TEST_SEND_SPEC} <-> #{TEST_RECV_SPEC}"
+	end
+
 	context "after a connection has been established" do
 
 		before( :each ) do

data/spec/mongrel2/httpresponse_spec.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+#encoding: utf-8
 
 BEGIN {
 	require 'pathname'
@@ -91,7 +92,6 @@ describe Mongrel2::HTTPResponse do
 		@response.headers.should have(1).keys
 	end
 
-
 	it "can find the length of its body if it's a String" do
 		test_body = 'A string full of stuff'
 		@response.body = test_body
@@ -99,6 +99,13 @@ describe Mongrel2::HTTPResponse do
 		@response.get_content_length.should == test_body.length
 	end
 
+	it "can find the length of its body if it's a String with multi-byte characters in it" do
+		test_body = 'Хорошая собака, Стрелке! Очень хорошо.'
+		@response.body = test_body
+
+		@response.get_content_length.should == test_body.bytesize
+	end
+
 	it "can find the length of its body if it's a seekable IO" do
 		test_body = File.open( __FILE__, 'r' )
 		test_body.seek( 0, IO::SEEK_END )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongrel2
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -48,11 +48,11 @@ cert_chain:
   -----END CERTIFICATE-----
 
 '
-date: 2011-09-24 00:00:00.000000000Z
+date: 2011-09-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2170257000 !ruby/object:Gem::Requirement
+  requirement: &70313120993700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -60,10 +60,10 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *2170257000
+  version_requirements: *70313120993700
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &2170254880 !ruby/object:Gem::Requirement
+  requirement: &70313120992860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -71,10 +71,10 @@ dependencies:
         version: '3.26'
   type: :runtime
   prerelease: false
-  version_requirements: *2170254880
+  version_requirements: *70313120992860
 - !ruby/object:Gem::Dependency
   name: amalgalite
-  requirement: &2170254220 !ruby/object:Gem::Requirement
+  requirement: &70313120991440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -82,10 +82,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2170254220
+  version_requirements: *70313120991440
 - !ruby/object:Gem::Dependency
   name: tnetstring
-  requirement: &2170253640 !ruby/object:Gem::Requirement
+  requirement: &70313120989920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -93,10 +93,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2170253640
+  version_requirements: *70313120989920
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &2170252900 !ruby/object:Gem::Requirement
+  requirement: &70313120988900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -104,10 +104,10 @@ dependencies:
         version: '0.8'
   type: :runtime
   prerelease: false
-  version_requirements: *2170252900
+  version_requirements: *70313120988900
 - !ruby/object:Gem::Dependency
   name: zmq
-  requirement: &2170252240 !ruby/object:Gem::Requirement
+  requirement: &70313120987840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -115,10 +115,10 @@ dependencies:
         version: 2.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *2170252240
+  version_requirements: *70313120987840
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
-  requirement: &2170251620 !ruby/object:Gem::Requirement
+  requirement: &70313120986520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -126,10 +126,10 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *2170251620
+  version_requirements: *70313120986520
 - !ruby/object:Gem::Dependency
   name: hoe-highline
-  requirement: &2170250880 !ruby/object:Gem::Requirement
+  requirement: &70313120985540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -137,10 +137,10 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *2170250880
+  version_requirements: *70313120985540
 - !ruby/object:Gem::Dependency
   name: configurability
-  requirement: &2170250120 !ruby/object:Gem::Requirement
+  requirement: &70313120984540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -148,10 +148,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *2170250120
+  version_requirements: *70313120984540
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2170249500 !ruby/object:Gem::Requirement
+  requirement: &70313120983260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -159,10 +159,10 @@ dependencies:
         version: '2.4'
   type: :development
   prerelease: false
-  version_requirements: *2170249500
+  version_requirements: *70313120983260
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &2170248800 !ruby/object:Gem::Requirement
+  requirement: &70313120963540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -170,8 +170,8 @@ dependencies:
         version: '2.12'
   type: :development
   prerelease: false
-  version_requirements: *2170248800
-description: ! "A complete Ruby connector for Mongrel2[http://mongrel2.org/].\n\nThis
+  version_requirements: *70313120963540
+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,
   a Control port interface object, and handler classes \nfor creating applications
@@ -295,5 +295,5 @@ rubyforge_project: mongrel2
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: A complete Ruby connector for Mongrel2[http://mongrel2.org/]
+summary: Ruby-Mongrel2 is a complete Ruby (1.9-only) connector for  Mongrel2[http://mongrel2.org/]
 test_files: []