mongrel2 0.2.1 → 0.2.2

data/.autotest

@@ -0,0 +1,23 @@
+# -*- ruby -*-
+
+require 'autotest/restart'
+
+# Autotest.add_hook :initialize do |at|
+#   at.extra_files << "../some/external/dependency.rb"
+#
+#   at.libs << ":../some/external"
+#
+#   at.add_exception 'vendor'
+#
+#   at.add_mapping(/dependency.rb/) do |f, _|
+#     at.files_matching(/test_.*rb$/)
+#   end
+#
+#   %w(TestA TestB).each do |klass|
+#     at.extra_class_map[klass] = "test/test_misc.rb"
+#   end
+# end
+
+# Autotest.add_hook :run_command do |at|
+#   system "rake build"
+# end

data/ChangeLog

@@ -0,0 +1,456 @@
+2011-09-19  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.2.1 for changeset d1d66d73becd
+	[6ba4c0f4f07e] [tip]
+
+	* .hgsigs:
+	Added signature for changeset 95ea49073e6c
+	[d1d66d73becd] [v0.2.1]
+
+	* lib/mongrel2.rb:
+	Bumping patch version for release.
+	[95ea49073e6c]
+
+	* lib/mongrel2/constants.rb:
+	Whitespace fix; add missing HTTP::CONTINUE constant.
+	[3082d251f00c]
+
+2011-09-18  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.2.0 for changeset 9828c04f097a
+	[8d578ccedea4]
+
+	* .hgsigs:
+	Added signature for changeset 5c631fa35bff
+	[9828c04f097a] [v0.2.0]
+
+	* lib/mongrel2.rb:
+	Bumping minor version for release.
+	[5c631fa35bff]
+
+	* lib/mongrel2/testing.rb, spec/lib/helpers.rb:
+	Factor out the generically-useful RSpec helper functions into
+	mongrel2/testing.rb and add a RequestFactory.
+	[25fea15c26cb]
+
+	* lib/mongrel2/connection.rb, lib/mongrel2/handler.rb,
+	lib/mongrel2/httprequest.rb, lib/mongrel2/request.rb,
+	spec/mongrel2/handler_spec.rb:
+	Fix object ID in inspect output, clean up inspected Request/Response
+	objects.
+	[3d7de6e47b42]
+
+	* experiments/mongrel2.org-dsl.rb:
+	Tighten up the mongrel2.org DSL example, remove the accidentally-
+	committed adminserver part.
+	[ed8f18ffe4c3]
+
+	* examples/request-dumper.rb:
+	Test the request dumper under $SAFE = 1, revert back to using
+	examples.sqlite
+	[291742549f11]
+
+	* data/mongrel2/bootstrap.html, data/mongrel2/css/master.css, examples
+	/request-dumper.tmpl:
+	Added CSS
+	[032124c021b5]
+
+	* lib/mongrel2/config/host.rb:
+	Config DSL: directory: Default the index file to index.html
+	[34b61931b6e6]
+
+2011-09-16  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.1.2 for changeset 8c47a392865d
+	[edb13b600572]
+
+	* .hgsigs:
+	Added signature for changeset 4212c8770654
+	[8c47a392865d] [v0.1.2]
+
+	* lib/mongrel2.rb:
+	Bump patch version for bugfix release.
+	[4212c8770654]
+
+	* examples/config.rb, examples/request-dumper.rb,
+	lib/mongrel2/constants.rb, lib/mongrel2/httpresponse.rb,
+	spec/mongrel2/httpresponse_spec.rb:
+	Fixed some header problems in Mongrel2::HTTPResponse.
+	- Re-calculate content-length and date headers on each render.
+	- Don't clear headers passed to the constructor.
+	[e74dcb79bf15]
+
+2011-09-14  Michael Granger  <ged@FaerieMUD.org>
+
+	* Automated merge with ssh://deveiate.org/Ruby-Mongrel2
+	[2da76acfb8db]
+
+	* 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]
+
+	* .hgsigs:
+	Added signature for changeset 2f5183ca5446
+	[42da048fe158] [v0.1.1]
+
+	* lib/mongrel2.rb:
+	Bumped minor version for dependency update.
+	[2f5183ca5446]
+
+	* Rakefile, lib/mongrel2.rb:
+	Updated rbzmq dependency
+	[758fe465780e]
+
+	* .hgtags:
+	Added tag v0.1.0 for changeset 55c8f01c01c6
+	[39b509c68142]
+
+	* .hgsigs:
+	Added signature for changeset da03e18009f8
+	[55c8f01c01c6] [v0.1.0]
+
+	* History.rdoc, lib/mongrel2.rb, lib/mongrel2/request.rb:
+	Updated docs, bumped version to 0.1.0 to reflect API change.
+	[da03e18009f8]
+
+	* lib/mongrel2/httprequest.rb, lib/mongrel2/request.rb,
+	spec/mongrel2/httprequest_spec.rb, spec/mongrel2/request_spec.rb:
+	Make Mongrel2::Request#response memoize its return value, and add a
+	class for determining which response type to return for ease of
+	overriding.
+	[80bdfbf38454]
+
+2011-09-13  Michael Granger  <ged@FaerieMUD.org>
+
+	* History.rdoc:
+	Updating History file.
+	[05ce9d6df9af]
+
+	* .hgtags:
+	Added tag v0.0.2 for changeset 8947e2c06ceb
+	[0183a9fdcadc]
+
+	* .hgsigs:
+	Added signature for changeset c39289ec700e
+	[8947e2c06ceb] [v0.0.2]
+
+	* Rakefile, lib/mongrel2.rb, lib/mongrel2/handler.rb:
+	Adding a shim for lack of ZMQ::Error in 2.1.3.
+	[c39289ec700e]
+
+	* .hgignore:
+	Merged with 3659a56af8fb
+	[f2201728e874]
+
+	* .hgignore:
+	Ignoring packaging directory
+	[0613976b6735]
+
+2011-09-12  Michael Granger  <ged@FaerieMUD.org>
+
+	* README.rdoc:
+	README fixes
+	[3659a56af8fb] [github/master]
+
+	* Rakefile:
+	Fixing gem name
+	[8283ced55657]
+
+	* .hgtags:
+	Added tag v0.0.1 for changeset 0eb864f65172
+	[5cb0ab2a1471]
+
+	* .hgsigs:
+	Added signature for changeset 7ece186852cd
+	[0eb864f65172] [v0.0.1]
+
+	* .hgignore, History.rdoc, Rakefile:
+	Fix release tasks, update the History.rdoc.
+	[7ece186852cd]
+
+	* .hgtags:
+	Removed tag v0.0.1
+	[6083c1af9ba5]
+
+	* .hgtags:
+	Added tag v0.0.1 for changeset 21aa45e88d3b
+	[54ecb2092464]
+
+	* .hgsigs:
+	Added signature for changeset b5bd6fee2124
+	[21aa45e88d3b]
+
+	* .hgtags:
+	Added tag prerelease for changeset 8e1320cd72d8
+	[b5bd6fee2124]
+
+	* README.rdoc:
+	README updates
+	[8e1320cd72d8] [prerelease]
+
+	* .gemtest, .hgignore, lib/mongrel2/config.rb,
+	lib/mongrel2/connection.rb, lib/mongrel2/handler.rb,
+	lib/mongrel2/httprequest.rb, lib/mongrel2/httpresponse.rb,
+	lib/mongrel2/jsonrequest.rb, lib/mongrel2/response.rb,
+	spec/lib/constants.rb, spec/lib/helpers.rb, spec/lib/matchers.rb,
+	spec/mongrel2/config/directory_spec.rb,
+	spec/mongrel2/config/dsl_spec.rb,
+	spec/mongrel2/config/handler_spec.rb,
+	spec/mongrel2/config/host_spec.rb,
+	spec/mongrel2/config/proxy_spec.rb,
+	spec/mongrel2/config/route_spec.rb,
+	spec/mongrel2/config/server_spec.rb,
+	spec/mongrel2/config/setting_spec.rb,
+	spec/mongrel2/config/statistic_spec.rb,
+	spec/mongrel2/config_spec.rb, spec/mongrel2/connection_spec.rb,
+	spec/mongrel2/constants_spec.rb, spec/mongrel2/control_spec.rb,
+	spec/mongrel2/handler_spec.rb, spec/mongrel2/httprequest_spec.rb,
+	spec/mongrel2/httpresponse_spec.rb, spec/mongrel2/logging_spec.rb,
+	spec/mongrel2/mixins_spec.rb, spec/mongrel2/request_spec.rb,
+	spec/mongrel2/response_spec.rb, spec/mongrel2/table_spec.rb,
+	spec/mongrel2_spec.rb:
+	Improve overall test coverage to 95%, finished replacing real 0MQ
+	sockets with mocks and stubs to avoid complex setup/teardown
+	procedures.
+	[19e0a72320dd]
+
+2011-09-10  Michael Granger  <ged@FaerieMUD.org>
+
+	* bin/m2sh.rb:
+	Finished as much of m2sh.rb as I'm going to for the 0.0.1 release.
+	[9f50e70a27e0]
+
+	* README.rdoc, Rakefile:
+	Documentation fixes; switch gem dependencies from sqlite3 to
+	amalgalite
+	[919e1b72ef4f]
+
+	* bin/m2sh.rb, experiments/mongrel2.org-dsl.rb:
+	Finishing up work on the initial version of m2sh.rb
+	[07a2f605a04a]
+
+	* lib/mongrel2.rb:
+	Make the version string return "Ruby-Mongrel2" to avoid aonfusion
+	[be362e9b6bc8]
+
+	* lib/mongrel2/config/server.rb, spec/mongrel2/config/server_spec.rb:
+	Add validations for Mongrel2::Config::Server
+	[cb21877eb469]
+
+	* .hgignore, .irbrc, README.rdoc, experiments/m2specs-amalgalite.dot,
+	experiments/m2specs-sqlite3.dot, lib/mongrel2/config.rb,
+	lib/mongrel2/config/dsl.rb, lib/mongrel2/config/log.rb,
+	lib/mongrel2/logging.rb, spec/lib/helpers.rb,
+	spec/mongrel2/config/directory_spec.rb,
+	spec/mongrel2/config/dsl_spec.rb,
+	spec/mongrel2/config/handler_spec.rb,
+	spec/mongrel2/config/log_spec.rb, spec/mongrel2/config_spec.rb,
+	spec/mongrel2/handler_spec.rb:
+	Adding support for Amalgalite
+	[3f8402c080ce]
+
+2011-09-09  Michael Granger  <ged@FaerieMUD.org>
+
+	* 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
+	[6ea60b67e106]
+
+	* lib/mongrel2/config/log.rb, spec/mongrel2/config/log_spec.rb:
+	Fixing a bug and adding coverage for
+	Mongrel2::Config::Log.log_action
+	[ff7c27cd7d0c]
+
+	* lib/mongrel2/config/log.rb, spec/mongrel2/config/log_spec.rb:
+	Adding a convenience class method and a stringification method to
+	Mongrel2::Config::Log
+	[79204623a123]
+
+	* experiments/requestdumper-profile-97bfa5c5211f.graffle:
+	Adding a proftools dump of the requestdumper app
+	[00cbc1b89a61]
+
+2011-09-08  Michael Granger  <ged@FaerieMUD.org>
+
+	* README.rdoc, lib/mongrel2.rb, lib/mongrel2/config.rb,
+	lib/mongrel2/config/dsl.rb, lib/mongrel2/handler.rb,
+	lib/mongrel2/response.rb, lib/mongrel2/table.rb,
+	spec/lib/helpers.rb, spec/mongrel2/config/dsl_spec.rb,
+	spec/mongrel2/config/route_spec.rb, spec/mongrel2/control_spec.rb,
+	spec/mongrel2/table_spec.rb:
+	Documentation work and spec fixes.
+	[6644045857ff]
+
+	* lib/mongrel2/control.rb, lib/mongrel2/exceptions.rb,
+	spec/mongrel2/control_spec.rb:
+	Finished up the initial implementation of Mongrel2::Control
+	[20b4127ec5b8]
+
+	* .hgignore, Rakefile, bin/m2sh.rb, config.sqlite,
+	data/mongrel2/bootstrap.html, examples/README.txt,
+	examples/config.rb, examples/helloworld-handler.rb, examples
+	/request-dumper.rb, examples/request-dumper.tmpl, examples/run,
+	experiments/bootstrap.config, experiments/endtoend.rb,
+	lib/mongrel2.rb, lib/mongrel2/config.rb,
+	lib/mongrel2/config/directory.rb, lib/mongrel2/config/dsl.rb,
+	lib/mongrel2/config/handler.rb, lib/mongrel2/config/host.rb,
+	lib/mongrel2/connection.rb, lib/mongrel2/constants.rb,
+	lib/mongrel2/exceptions.rb, lib/mongrel2/handler.rb,
+	lib/mongrel2/httprequest.rb, lib/mongrel2/httpresponse.rb,
+	lib/mongrel2/jsonrequest.rb, lib/mongrel2/request.rb,
+	lib/mongrel2/response.rb, lib/mongrel2/table.rb,
+	lib/mongrel2/xmlrequest.rb, spec/lib/constants.rb,
+	spec/lib/helpers.rb, spec/lib/matchers.rb,
+	spec/mongrel2/config/directory_spec.rb,
+	spec/mongrel2/config/dsl_spec.rb, spec/mongrel2/connection_spec.rb,
+	spec/mongrel2/handler_spec.rb, spec/mongrel2/httpresponse_spec.rb,
+	spec/mongrel2/request_spec.rb, spec/mongrel2/response_spec.rb:
+	Adding the initial Mongrel2::Handler class, split out requests into
+	HTTP, JSON, and XML.
+	[97bfa5c5211f]
+
+	* README.rdoc, lib/mongrel2.rb, lib/mongrel2/connection.rb,
+	lib/mongrel2/constants.rb, lib/mongrel2/control.rb,
+	lib/mongrel2/exceptions.rb, lib/mongrel2/logging.rb,
+	lib/mongrel2/mixins.rb:
+	Documentation updates/fixes
+	[9818069b4fa1]
+
+2011-08-31  Michael Granger  <ged@FaerieMUD.org>
+
+	* .rvmrc, lib/mongrel2.rb, lib/mongrel2/config/host.rb,
+	lib/mongrel2/config/route.rb:
+	*Actually* making the library warn under Rubies earlier than 1.9.2.
+	[2bda0ef5b1dc]
+
+	* Rakefile, spec/lib/helpers.rb:
+	Make Mongrel2 1.9-only
+	[e28dd808791f]
+
+2011-08-30  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/mongrel2.rb, lib/mongrel2/config/directory.rb,
+	lib/mongrel2/config/host.rb, spec/lib/helpers.rb,
+	spec/mongrel2/config/directory_spec.rb,
+	spec/mongrel2/config/dsl_spec.rb,
+	spec/mongrel2/config/route_spec.rb,
+	spec/mongrel2/connection_spec.rb:
+	Added directory validation; fixed broken directory creation
+	elsewhere.
+	[b70f91252903]
+
+2011-08-29  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgignore, Rakefile, bin/m2sh.rb, config.sqlite,
+	experiments/endtoend.rb, experiments/xmlhandler.rb, lib/mongrel2.rb,
+	lib/mongrel2/config/directory.rb, lib/mongrel2/connection.rb,
+	lib/mongrel2/control.rb, lib/mongrel2/exceptions.rb,
+	lib/mongrel2/logging.rb, lib/mongrel2/mixins.rb,
+	lib/mongrel2/request.rb, lib/mongrel2/response.rb,
+	spec/lib/constants.rb, spec/lib/helpers.rb,
+	spec/mongrel2/config/directory_spec.rb,
+	spec/mongrel2/connection_spec.rb, spec/mongrel2/request_spec.rb:
+	Splitting out request/response types
+	[ca2cff4a050e]
+
+	* lib/mongrel2/config/handler.rb, spec/lib/constants.rb,
+	spec/mongrel2/config/handler_spec.rb:
+	Added validations to Mongrel2::Config::Handler.
+	[b4eeb85cbfe6]
+
+	* config.sqlite, experiments/bootstrap.config,
+	experiments/endtoend.rb, lib/mongrel2.rb,
+	lib/mongrel2/connection.rb, lib/mongrel2/constants.rb,
+	lib/mongrel2/control.rb, lib/mongrel2/request.rb,
+	lib/mongrel2/response.rb, lib/mongrel2/table.rb,
+	spec/lib/constants.rb, spec/mongrel2/connection_spec.rb,
+	spec/mongrel2/constants_spec.rb, spec/mongrel2/control_spec.rb,
+	spec/mongrel2/logging_spec.rb, spec/mongrel2/request_spec.rb,
+	spec/mongrel2/response_spec.rb, spec/mongrel2/table_spec.rb,
+	spec/mongrel2_spec.rb:
+	Adding handler framework classes
+	[d990a27281a3]
+
+2011-08-26  Michael Granger  <ged@FaerieMUD.org>
+
+	* README.rdoc, Rakefile, experiments/dsl-spike.rb,
+	experiments/mongrel2.org-dsl.rb:
+	Documentation update.
+	[2d46631ac05c]
+
+	* .hgignore, History.md, History.rdoc, Manifest.txt, README.rdoc,
+	Rakefile, bin/m2sh.rb, data/mongrel2/bootstrap.html,
+	data/mongrel2/config.sql, data/mongrel2/mimetypes.sql, experiments
+	/dsl-spike.rb, experiments/mongrel2.org-dsl.rb,
+	experiments/mongrel2.org.conf, lib/mongrel2/config.rb,
+	lib/mongrel2/config/dsl.rb, lib/mongrel2/config/host.rb,
+	lib/mongrel2/config/mimetype.rb, lib/mongrel2/config/route.rb,
+	lib/mongrel2/config/server.rb, spec/lib/constants.rb,
+	spec/lib/helpers.rb, spec/mongrel2/config/directory_spec.rb,
+	spec/mongrel2/config/dsl_spec.rb,
+	spec/mongrel2/config/handler_spec.rb,
+	spec/mongrel2/config/host_spec.rb, spec/mongrel2/config/log_spec.rb,
+	spec/mongrel2/config/proxy_spec.rb,
+	spec/mongrel2/config/route_spec.rb,
+	spec/mongrel2/config/server_spec.rb,
+	spec/mongrel2/config/setting_spec.rb,
+	spec/mongrel2/config/statistic_spec.rb,
+	spec/mongrel2/config_spec.rb:
+	Finished up work on the config classes and the DSL
+	[1ef9efccf8f2]
+
+2011-08-18  Michael Granger  <ged@FaerieMUD.org>
+
+	* .irbrc, README.md, README.rdoc, bin/m2sh.rb, config.sqlite,
+	experiments/bootstrap.config, lib/mongrel2.rb,
+	lib/mongrel2/config.rb, lib/mongrel2/config/directory.rb,
+	lib/mongrel2/config/handler.rb, lib/mongrel2/config/host.rb,
+	lib/mongrel2/config/log.rb, lib/mongrel2/config/proxy.rb,
+	lib/mongrel2/config/route.rb, lib/mongrel2/config/server.rb,
+	lib/mongrel2/config/setting.rb, lib/mongrel2/config/statistic.rb,
+	lib/mongrel2/constants.rb, lib/mongrel2/model.rb,
+	spec/mongrel2/config_spec.rb, spec/mongrel2/model_spec.rb:
+	Initial work on the config classes done; started work on a toy
+	version of m2sh.
+	[763661578e2d]
+
+2011-08-17  Michael Granger  <ged@FaerieMUD.org>
+
+	* .autotest, History.md, Manifest.txt, README.md, Rakefile,
+	bin/m2sh.rb, lib/mongrel2.rb, lib/mongrel2/constants.rb,
+	lib/mongrel2/logging.rb, lib/mongrel2/mixins.rb,
+	lib/mongrel2/model.rb, spec/lib/constants.rb, spec/lib/helpers.rb,
+	spec/mongrel2/mixins_spec.rb, spec/mongrel2/model_spec.rb,
+	spec/mongrel2_spec.rb:
+	Creating project skeleton.
+	[3a1882003e47]

data/History.rdoc

@@ -1,3 +1,35 @@
+== v0.2.2 [2011-09-19] Michael Granger <ged@FaerieMUD.org>
+
+- Packaging fix
+
+
+== v0.2.1 [2011-09-19] Michael Granger <ged@FaerieMUD.org>
+
+- Add missing HTTP::CONTINUE constant.
+
+
+== v0.2.0 [2011-09-18] Michael Granger <ged@FaerieMUD.org>
+
+- Factor out the generically-useful RSpec helper functions into
+  mongrel2/testing.rb and add a RequestFactory.
+- Fix object ID in inspect output, clean up inspected Request/Response
+  objects.
+- Tightened up the mongrel2.org DSL example, remove the accidentally-
+  committed adminserver part.
+- Request dumper now runs under $SAFE = 1
+- Revert examples back to using examples.sqlite
+- Added a bit of CSS to the examples
+- Config DSL: directory: Default the index file to index.html
+
+
+== v0.1.2 [2011-09-16] Michael Granger <ged@FaerieMUD.org>
+
+Fixed some header problems in Mongrel2::HTTPResponse:
+
+- Re-calculate content-length and date headers on each render.
+- Don't clear headers passed to the constructor.
+
+
 == v0.1.1 [2011-11-14] Michael Granger <ged@FaerieMUD.org>
 
 Update dependency to rbzmq-2.1.4 for ZMQ::Error.

data/Manifest.txt

@@ -1,3 +1,6 @@
+.autotest
+.gemtest
+ChangeLog
 History.rdoc
 Manifest.txt
 README.rdoc
@@ -5,6 +8,7 @@ Rakefile
 bin/m2sh.rb
 data/mongrel2/bootstrap.html
 data/mongrel2/config.sql
+data/mongrel2/css/master.css
 data/mongrel2/mimetypes.sql
 examples/README.txt
 examples/config.rb
@@ -38,6 +42,7 @@ lib/mongrel2/mixins.rb
 lib/mongrel2/request.rb
 lib/mongrel2/response.rb
 lib/mongrel2/table.rb
+lib/mongrel2/testing.rb
 lib/mongrel2/xmlrequest.rb
 spec/lib/constants.rb
 spec/lib/helpers.rb
@@ -57,6 +62,7 @@ spec/mongrel2/connection_spec.rb
 spec/mongrel2/constants_spec.rb
 spec/mongrel2/control_spec.rb
 spec/mongrel2/handler_spec.rb
+spec/mongrel2/httprequest_spec.rb
 spec/mongrel2/httpresponse_spec.rb
 spec/mongrel2/logging_spec.rb
 spec/mongrel2/mixins_spec.rb

data/Rakefile

@@ -38,6 +38,9 @@ hoespec = Hoe.spec 'mongrel2' do
 	self.spec_extras[:licenses] = ["BSD"]
 	self.require_ruby_version( '>= 1.9.2' )
 
+	self.hg_sign_tags = true if self.respond_to?( :hg_sign_tags= )
+	self.check_history_on_release = true if self.respond_to?( :check_history_on_release= )
+
 	self.rdoc_locations << "deveiate:/usr/local/www/public/code/#{remote_rdoc_dir}"
 end
 
@@ -48,7 +51,7 @@ task 'hg:precheckin' => :spec
 
 
 # Rebuild the ChangeLog immediately before release
-task :prerelease => 'ChangeLog'
+task :prerelease => [:check_manifest, :check_history, 'ChangeLog']
 
 
 desc "Build a coverage report"

data/data/mongrel2/css/master.css

@@ -0,0 +1,48 @@
+/* @override http://pelimer.pg.laika.com:8113/css/master.css */
+
+/*
+ * Mongrel2 Examples Stylesheet
+ * $Id$
+ */
+
+html {
+	background: #333;
+	margin: 0;
+}
+
+body {
+	background: ##9d9d9d;
+	background: -moz-linear-gradient(bottom, #aaa 0%, #eee 30%);
+	background: -webkit-gradient(linear, left bottom, left top, 
+		color-stop(0%,#9d9d9d), color-stop(30%,#eee));
+	background: linear-gradient(top, ##9d9d9d 0%,#eee 30%);
+	color: #333;
+	margin: 0;
+	padding: 4em;
+	font-family: Menlo, Monaco, monospace;
+	font-size: 76%;
+	min-width: 785px;
+}
+
+pre, table, code {
+	background-color: rgba( 25,25,200, 0.2 );
+	box-shadow: 0 2px 8px rgba( 50,50,50, 0.25 )
+}
+
+pre {
+	padding: 2px 8px;
+	font-family: Menlo, Monaco, monospace;
+	overflow: hidden;
+}
+table {
+	border-collapse: collapse;
+}
+th, td {
+	padding: 2px 8px;
+	border-bottom: 1px solid rgba( 150,150,150, 0.5 );
+}
+tbody th {
+	text-align: right;
+	vertical-align: top;
+	white-space: pre;
+}

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.2.1'
+	VERSION = '0.2.2'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 95ea49073e6c $
+	REVISION = %q$Revision: f1abf26d45ea $
 
 
 	require 'mongrel2/logging'

data/lib/mongrel2/testing.rb

@@ -0,0 +1,132 @@
+#!/usr/bin/env ruby
+
+require 'uri'
+require 'pathname'
+require 'mongrel2' unless defined?( Mongrel2 )
+
+
+# A collection of constants and functions for testing Mongrel2 applications,
+# as well as Mongrel2 itself.
+
+module Mongrel2
+
+	### A collection of helper functions that are generally useful
+	### for testing Mongrel2::Handlers.
+	module SpecHelpers
+	end # module SpecHelpers
+
+
+	### A factory for generating Mongrel2::Request objects for testing.
+	class RequestFactory
+
+		# Default testing UUID (sender_id)
+		DEFAULT_TEST_UUID = 'BD17D85C-4730-4BF2-999D-9D2B2E0FCCF9'
+
+		# Default connection ID
+		DEFAULT_CONN_ID = 0
+
+		# 0mq socket specifications for Handlers
+		TEST_SEND_SPEC = 'tcp://127.0.0.1:9998'
+		TEST_RECV_SPEC = 'tcp://127.0.0.1:9997'
+
+		# The testing URL to use by default
+		DEFAULT_TESTING_URL   = URI( 'http://localhost:8080/a_handler' )
+
+		DEFAULT_TESTING_HOST  = DEFAULT_TESTING_URL.host
+		DEFAULT_TESTING_PORT  = DEFAULT_TESTING_URL.port
+		DEFAULT_TESTING_ROUTE = DEFAULT_TESTING_URL.path
+
+		# The default set of headers used for HTTP requests
+		DEFAULT_TESTING_HEADERS  = {
+			"x-forwarded-for" => "127.0.0.1",
+			"accept-language" => "en-US,en;q=0.8",
+			"accept-encoding" => "gzip,deflate,sdch",
+			"connection"      => "keep-alive",
+			"accept-charset"  => "UTF-8,*;q=0.5",
+			"accept"          => "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
+			"user-agent"      => "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_1) " +
+			                     "AppleWebKit/535.1 (KHTML, like Gecko) Chrome/13.0.782.112 " +
+			                     "Safari/535.1",
+			"VERSION"         => "HTTP/1.1",
+		}
+
+		# The defaults used by the HTTP request factory
+		DEFAULT_FACTORY_CONFIG = {
+			:sender_id => DEFAULT_TEST_UUID,
+			:conn_id   => DEFAULT_CONN_ID,
+			:host      => DEFAULT_TESTING_HOST,
+			:port      => DEFAULT_TESTING_PORT,
+			:route     => DEFAULT_TESTING_ROUTE,
+			:headers   => DEFAULT_TESTING_HEADERS,
+		}
+
+		# Freeze all testing constants
+		constants.each do |cname|
+			const_get(cname).freeze
+		end
+
+
+		### Create a new RequestFactory with the given +config+, which will be merged with
+		### DEFAULT_FACTORY_CONFIG.
+		def initialize( config={} )
+			config[:headers] = DEFAULT_TESTING_HEADERS.merge( config[:headers] ) if config[:headers]
+			config = DEFAULT_FACTORY_CONFIG.merge( config )
+
+			@sender_id = config[:sender_id]
+			@host      = config[:host]
+			@port      = config[:port]
+			@route     = config[:route]
+			@headers   = Mongrel2::Table.new( config[:headers] )
+
+			@conn_id = 0
+		end
+
+		######
+		public
+		######
+
+		attr_accessor :sender_id, :host, :port, :route, :conn_id
+		attr_reader :headers
+
+		#
+		# :section: HTTP verb methods
+		#
+
+		### Create a new Mongrel2::Request for the specified +uri+.
+		def get( uri, headers={} )
+			raise "Request doesn't route through %p" % [ self.route ] unless
+				uri.start_with?( self.route )
+
+			headers = self.make_merged_headers( :GET, uri, headers )
+			rclass = Mongrel2::Request.subclass_for_method( :GET )
+
+			return rclass.new( self.sender_id, self.conn_id.to_s, uri.to_s, headers )
+		end
+
+
+		#########
+		protected
+		#########
+
+		### Merge the factory's headers with +userheaders+, and then merge in the
+		### special headers that Mongrel2 adds that are based on the +uri+ and other
+		### server attributes.
+		def make_merged_headers( verb, uri, userheaders )
+			headers = self.headers.merge( userheaders )
+			uri = URI( uri )
+
+			# Add mongrel headers
+			headers.uri       = uri.to_s
+			headers.path      = uri.path
+			headers['METHOD'] = verb.to_s
+			headers.host      = "%s:%d" % [ self.host, self.port ]
+			headers.query     = uri.query if uri.query
+			headers.pattern   = self.route
+
+			return headers
+		end
+
+	end # RequestFactory
+
+end # module Mongrel2
+

data/spec/mongrel2/httprequest_spec.rb

@@ -0,0 +1,82 @@
+#!/usr/bin/env ruby
+
+BEGIN {
+	require 'pathname'
+	basedir = Pathname.new( __FILE__ ).dirname.parent.parent
+
+	libdir = basedir + "lib"
+
+	$LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
+	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
+}
+
+require 'rspec'
+require 'tnetstring'
+
+require 'spec/lib/helpers'
+
+require 'mongrel2'
+require 'mongrel2/httprequest'
+
+
+#####################################################################
+###	C O N T E X T S
+#####################################################################
+
+describe Mongrel2::HTTPRequest do
+
+	before( :all ) do
+		setup_logging( :fatal )
+	end
+
+	before( :each ) do
+		headers = normalize_headers( {} )
+		@req = Mongrel2::HTTPRequest.new( TEST_UUID, 8817, '/test', headers, '' )
+	end
+
+	after( :all ) do
+		reset_logging()
+	end
+
+
+	it "can create an HTTPResponse for itself" do
+		result = @req.response
+		result.should be_a( Mongrel2::HTTPResponse )
+		result.sender_id.should == @req.sender_id
+		result.conn_id.should == @req.conn_id
+	end
+
+	it "remembers its corresponding HTTPResponse if it's created it already" do
+		result = @req.response
+		result.should be_a( Mongrel2::HTTPResponse )
+		result.sender_id.should == @req.sender_id
+		result.conn_id.should == @req.conn_id
+	end
+
+	it "knows that its connection isn't persistent if it's an HTTP/1.0 request" do
+		@req.headers.version = 'HTTP/1.0'
+		@req.should_not be_keepalive()
+	end
+
+	it "knows that its connection isn't persistent if has a 'close' token in its Connection header" do
+		@req.headers.version = 'HTTP/1.1'
+		@req.headers[ :connection ] = 'violent, close'
+		@req.should_not be_keepalive()
+	end
+
+	it "knows that its connection could be persistent if doesn't have a Connection header, " +
+	   "and it's an HTTP/1.1 request" do
+		@req.headers.version = 'HTTP/1.1'
+		@req.headers.delete( :connection )
+		@req.should be_keepalive()
+	end
+
+	it "knows that its connection is persistent if has a Connection header without a 'close' " +
+	   "token and it's an HTTP/1.1 request" do
+		@req.headers.version = 'HTTP/1.1'
+		@req.headers.connection = 'keep-alive'
+		@req.should be_keepalive()
+	end
+
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongrel2
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -52,7 +52,7 @@ date: 2011-09-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70247178090440 !ruby/object:Gem::Requirement
+  requirement: &70299509927540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -60,10 +60,10 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70247178090440
+  version_requirements: *70299509927540
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &70247178089880 !ruby/object:Gem::Requirement
+  requirement: &70299509926700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -71,10 +71,10 @@ dependencies:
         version: '3.26'
   type: :runtime
   prerelease: false
-  version_requirements: *70247178089880
+  version_requirements: *70299509926700
 - !ruby/object:Gem::Dependency
   name: amalgalite
-  requirement: &70247178067480 !ruby/object:Gem::Requirement
+  requirement: &70299509925840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -82,10 +82,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70247178067480
+  version_requirements: *70299509925840
 - !ruby/object:Gem::Dependency
   name: tnetstring
-  requirement: &70247178066860 !ruby/object:Gem::Requirement
+  requirement: &70299509924940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -93,10 +93,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70247178066860
+  version_requirements: *70299509924940
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70247178065640 !ruby/object:Gem::Requirement
+  requirement: &70299509911820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -104,10 +104,10 @@ dependencies:
         version: '0.8'
   type: :runtime
   prerelease: false
-  version_requirements: *70247178065640
+  version_requirements: *70299509911820
 - !ruby/object:Gem::Dependency
   name: zmq
-  requirement: &70247178064720 !ruby/object:Gem::Requirement
+  requirement: &70299509910920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -115,21 +115,21 @@ dependencies:
         version: 2.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70247178064720
+  version_requirements: *70299509910920
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
-  requirement: &70247178063880 !ruby/object:Gem::Requirement
+  requirement: &70299509910140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *70247178063880
+  version_requirements: *70299509910140
 - !ruby/object:Gem::Dependency
   name: hoe-highline
-  requirement: &70247178062860 !ruby/object:Gem::Requirement
+  requirement: &70299509909240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -137,10 +137,10 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *70247178062860
+  version_requirements: *70299509909240
 - !ruby/object:Gem::Dependency
   name: configurability
-  requirement: &70247178061880 !ruby/object:Gem::Requirement
+  requirement: &70299509908380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -148,10 +148,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70247178061880
+  version_requirements: *70299509908380
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70247178060660 !ruby/object:Gem::Requirement
+  requirement: &70299509907220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -159,10 +159,10 @@ dependencies:
         version: '2.4'
   type: :development
   prerelease: false
-  version_requirements: *70247178060660
+  version_requirements: *70299509907220
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70247178051460 !ruby/object:Gem::Requirement
+  requirement: &70299509906380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -170,7 +170,7 @@ dependencies:
         version: '2.12'
   type: :development
   prerelease: false
-  version_requirements: *70247178051460
+  version_requirements: *70299509906380
 description: ! "A complete Ruby connector for Mongrel2[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,
@@ -197,6 +197,9 @@ extra_rdoc_files:
 - README.rdoc
 - History.rdoc
 files:
+- .autotest
+- .gemtest
+- ChangeLog
 - History.rdoc
 - Manifest.txt
 - README.rdoc
@@ -204,6 +207,7 @@ files:
 - bin/m2sh.rb
 - data/mongrel2/bootstrap.html
 - data/mongrel2/config.sql
+- data/mongrel2/css/master.css
 - data/mongrel2/mimetypes.sql
 - examples/README.txt
 - examples/config.rb
@@ -237,6 +241,7 @@ files:
 - lib/mongrel2/request.rb
 - lib/mongrel2/response.rb
 - lib/mongrel2/table.rb
+- lib/mongrel2/testing.rb
 - lib/mongrel2/xmlrequest.rb
 - spec/lib/constants.rb
 - spec/lib/helpers.rb
@@ -256,6 +261,7 @@ files:
 - spec/mongrel2/constants_spec.rb
 - spec/mongrel2/control_spec.rb
 - spec/mongrel2/handler_spec.rb
+- spec/mongrel2/httprequest_spec.rb
 - spec/mongrel2/httpresponse_spec.rb
 - spec/mongrel2/logging_spec.rb
 - spec/mongrel2/mixins_spec.rb
@@ -263,7 +269,6 @@ files:
 - spec/mongrel2/response_spec.rb
 - spec/mongrel2/table_spec.rb
 - spec/mongrel2_spec.rb
-- .gemtest
 homepage: http://deveiate.org/projects/Ruby-Mongrel2/
 licenses:
 - BSD