mongrel2 0.1.1 → 0.1.2

data/History.rdoc

@@ -1,3 +1,8 @@
+== v0.1.1 [2011-11-14] Michael Granger <ged@FaerieMUD.org>
+
+Update dependency to rbzmq-2.1.4 for ZMQ::Error.
+
+
 == v0.1.0 [2011-11-14] Michael Granger <ged@FaerieMUD.org>
 
 Memoize Mongrel2::Request#response, and add Mongrel2::Request.response_class to

data/Rakefile

@@ -46,28 +46,10 @@ ENV['VERSION'] ||= hoespec.spec.version.to_s
 # Ensure the specs pass before checking in
 task 'hg:precheckin' => :spec
 
-### Make the ChangeLog update if the repo has changed since it was last built
-file '.hg/branch'
-file 'ChangeLog' => '.hg/branch' do |task|
-	$stderr.puts "Updating the changelog..."
-	abort "Can't create the ChangeLog without hoe-mercurial (gem install hoe-mercurial)" unless
-		defined?( MercurialHelpers )
-
-	content = MercurialHelpers.make_changelog()
-	File.open( task.name, 'w', 0644 ) do |fh|
-		fh.print( content )
-	end
-end
 
 # Rebuild the ChangeLog immediately before release
 task :prerelease => 'ChangeLog'
 
-if Rake::Task.task_defined?( '.gemtest' )
-	Rake::Task['.gemtest'].clear
-	task '.gemtest' do
-		$stderr.puts "Not including a .gemtest until I'm confident the test suite is idempotent."
-	end
-end
 
 desc "Build a coverage report"
 task :coverage do

data/examples/request-dumper.rb

@@ -34,12 +34,13 @@ class RequestDumper < Mongrel2::Handler
 		return response
 	end
 
-end # class HelloWorldHandler
+end # class RequestDumper
 
-Mongrel2.log.level = Logger::INFO
+Mongrel2.log.level = $DEBUG ? Logger::DEBUG : Logger::INFO
+Inversion.log.level = Logger::INFO
 
 # 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 => 'config.sqlite' )
 RequestDumper.run( 'request-dumper' )
 

data/lib/mongrel2/constants.rb

@@ -149,9 +149,6 @@ module Mongrel2::Constants
 		    510 => "Not Extended"
 		}
 
-
-		# Methods which aren't allowed to have an entity-body
-		SHALLOW_METHODS = [ :GET, :HEAD, :DELETE ]
 	end
 
 

data/lib/mongrel2/httpresponse.rb

@@ -34,9 +34,11 @@ class Mongrel2::HTTPResponse < Mongrel2::Response
 
 		super( sender_id, conn_id, body )
 
-		@headers = Mongrel2::Table.new( headers )
+		@headers = Mongrel2::Table.new
 		@status = nil
 		self.reset
+
+		@headers.merge!( headers )
 	end
 
 
@@ -138,10 +140,12 @@ class Mongrel2::HTTPResponse < Mongrel2::Response
 
 	### Return the current response header as a valid HTTP string.
 	def header_data
-		self.headers[:date] ||= Time.now.httpdate
-		self.headers[:content_length] ||= self.get_content_length
+		headers = self.headers.dup
+
+		headers[:date] ||= Time.now.httpdate
+		headers[:content_length] ||= self.get_content_length
 
-		return self.headers.to_s
+		return headers.to_s
 	end
 
 

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.1.1'
+	VERSION = '0.1.2'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 2f5183ca5446 $
+	REVISION = %q$Revision: 4212c8770654 $
 
 
 	require 'mongrel2/logging'

data/spec/mongrel2/httpresponse_spec.rb

@@ -30,7 +30,7 @@ describe Mongrel2::HTTPResponse do
 	end
 
 	before( :each ) do
-		@response = Mongrel2::HTTPResponse.new( TEST_UUID, 299 )
+		@response = Mongrel2::HTTPResponse.new( TEST_UUID, 299, :content_type => 'text/html' )
 	end
 
 	after( :all ) do
@@ -42,15 +42,27 @@ describe Mongrel2::HTTPResponse do
 		@response.headers.should be_a( Mongrel2::Table )
 	end
 
+	it "allows headers to be set when the response is created" do
+		@response.headers.content_type.should == 'text/html'
+	end
+
 	it "is a status 200 response if not set otherwise" do
 		@response.status_line.should == 'HTTP/1.1 200 OK'
 	end
 
 	it "sets Date and Content-length headers automatically if they haven't been set" do
-		@response.header_data.should =~ /Content-length: 0/i
+		@response << "Some stuff."
+
+		@response.header_data.should =~ /Content-length: 11/i
 		@response.header_data.should =~ /Date: #{HTTP_DATE}/i
 	end
 
+	it "re-calculates the automatically-added headers when re-rendered" do
+		@response.header_data.should =~ /Content-length: 0/i
+		@response << "More data!"
+		@response.header_data.should =~ /Content-length: 10/i
+	end
+
 	it "doesn't have a body" do
 		@response.body.should be_empty()
 	end
@@ -228,5 +240,10 @@ describe Mongrel2::HTTPResponse do
 		@response.should be_keepalive()
 	end
 
+	it "has a puts method for appending objects to the body" do
+		@response.puts( :something_to_sable )
+		@response.body.should == "something_to_sable\n"
+	end
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongrel2
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -48,11 +48,11 @@ cert_chain:
   -----END CERTIFICATE-----
 
 '
-date: 2011-09-14 00:00:00.000000000Z
+date: 2011-09-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70222682787040 !ruby/object:Gem::Requirement
+  requirement: &2170501340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -60,10 +60,10 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70222682787040
+  version_requirements: *2170501340
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &70222682786320 !ruby/object:Gem::Requirement
+  requirement: &2170500720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -71,10 +71,10 @@ dependencies:
         version: '3.26'
   type: :runtime
   prerelease: false
-  version_requirements: *70222682786320
+  version_requirements: *2170500720
 - !ruby/object:Gem::Dependency
   name: amalgalite
-  requirement: &70222682785540 !ruby/object:Gem::Requirement
+  requirement: &2170500140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -82,10 +82,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70222682785540
+  version_requirements: *2170500140
 - !ruby/object:Gem::Dependency
   name: tnetstring
-  requirement: &70222682784540 !ruby/object:Gem::Requirement
+  requirement: &2170499500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -93,10 +93,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70222682784540
+  version_requirements: *2170499500
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70222682783760 !ruby/object:Gem::Requirement
+  requirement: &2170499000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -104,10 +104,10 @@ dependencies:
         version: '0.8'
   type: :runtime
   prerelease: false
-  version_requirements: *70222682783760
+  version_requirements: *2170499000
 - !ruby/object:Gem::Dependency
   name: zmq
-  requirement: &70222682783100 !ruby/object:Gem::Requirement
+  requirement: &2170498380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -115,21 +115,21 @@ dependencies:
         version: 2.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70222682783100
+  version_requirements: *2170498380
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
-  requirement: &70222682782180 !ruby/object:Gem::Requirement
+  requirement: &2170497820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.2.1
   type: :development
   prerelease: false
-  version_requirements: *70222682782180
+  version_requirements: *2170497820
 - !ruby/object:Gem::Dependency
   name: hoe-highline
-  requirement: &70222682781360 !ruby/object:Gem::Requirement
+  requirement: &2170497200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -137,10 +137,10 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *70222682781360
+  version_requirements: *2170497200
 - !ruby/object:Gem::Dependency
   name: configurability
-  requirement: &70222682757400 !ruby/object:Gem::Requirement
+  requirement: &2170496520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -148,10 +148,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70222682757400
+  version_requirements: *2170496520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70222682756760 !ruby/object:Gem::Requirement
+  requirement: &2170495900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -159,18 +159,18 @@ dependencies:
         version: '2.4'
   type: :development
   prerelease: false
-  version_requirements: *70222682756760
+  version_requirements: *2170495900
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70222682756080 !ruby/object:Gem::Requirement
+  requirement: &2170495420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '2.11'
   type: :development
   prerelease: false
-  version_requirements: *70222682756080
+  version_requirements: *2170495420
 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,