mongrel2 0.8.0 → 0.9.0

data/History.rdoc

@@ -1,3 +1,9 @@
+== v0.9.0 [2011-10-12] Michael Granger <ged@FaerieMUD.org>
+
+- Fix Mongrel2::Table not duping/cloning its internal values.
+- Set a default Content-type header in HTTP responses
+
+
 == v0.8.0 [2011-10-12] Michael Granger <ged@FaerieMUD.org>
 
 - Split out the normalization of HTTP response headers into two

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.8.0'
+	VERSION = '0.9.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 986182bd469e $
+	REVISION = %q$Revision: 180ebbaeb4a0 $
 
 
 	require 'mongrel2/logging'

data/lib/mongrel2/httpresponse.rb

@@ -153,6 +153,7 @@ class Mongrel2::HTTPResponse < Mongrel2::Response
 
 		headers[:date] ||= Time.now.httpdate
 		headers[:content_length] ||= self.get_content_length
+		headers[:content_type] ||= DEFAULT_CONTENT_TYPE
 
 		return headers
 	end

data/lib/mongrel2/table.rb

@@ -50,8 +50,28 @@ class Mongrel2::Table
 
 
 	### Make sure the inner Hash is unique on duplications.
-	def initialize_copy( orig_table ) # :nodoc:
-		@hash = orig_table.to_hash
+	def initialize_dup( * ) # :nodoc:
+		@hash = @hash.dup
+		@hash.each do |k, v|
+			if v.is_a?( Array )
+				@hash[ k ] = v.map( &:dup )
+			else
+				@hash[ k ] = v.dup
+			end
+		end
+	end
+
+
+	### Make sure the inner Hash is unique on clones.
+	def initialize_clone( * ) # :nodoc:
+		@hash = @hash.clone
+		@hash.each do |k, v|
+			if v.is_a?( Array )
+				@hash[ k ] = v.map( &:clone )
+			else
+				@hash[ k ] = v.clone
+			end
+		end
 	end
 
 

data/spec/mongrel2/httpresponse_spec.rb

@@ -31,7 +31,7 @@ describe Mongrel2::HTTPResponse do
 	end
 
 	before( :each ) do
-		@response = Mongrel2::HTTPResponse.new( TEST_UUID, 299, :content_type => 'text/html' )
+		@response = Mongrel2::HTTPResponse.new( TEST_UUID, 299 )
 	end
 
 	after( :all ) do
@@ -44,16 +44,18 @@ describe Mongrel2::HTTPResponse do
 	end
 
 	it "allows headers to be set when the response is created" do
-		@response.headers.content_type.should == 'text/html'
+		response = Mongrel2::HTTPResponse.new( TEST_UUID, 299, :content_type => 'image/jpeg' )
+		response.headers.content_type.should == 'image/jpeg'
 	end
 
 	it "is a No Content response if not set otherwise" do
 		@response.status_line.should == 'HTTP/1.1 204 No Content'
 	end
 
-	it "sets Date and Content-length headers automatically if they haven't been set" do
+	it "sets Date, Content-type, and Content-length headers automatically if they haven't been set" do
 		@response << "Some stuff."
 
+		@response.header_data.should =~ %r{Content-type: #{Mongrel2::HTTPResponse::DEFAULT_CONTENT_TYPE}}i
 		@response.header_data.should =~ /Content-length: 11/i
 		@response.header_data.should =~ /Date: #{HTTP_DATE}/i
 	end
@@ -68,10 +70,6 @@ describe Mongrel2::HTTPResponse do
 		@response.body.should be_empty()
 	end
 
-	it "knows it hasn't been handled" do
-		@response.should_not be_handled()
-	end
-
 	it "stringifies to a valid RFC2616 response string" do
 		@response.to_s.should =~ HTTP_RESPONSE
 	end
@@ -128,14 +126,15 @@ describe Mongrel2::HTTPResponse do
 		@response.get_content_length.should == length - 100
 	end
 
-	it "knows that it has been handled even if the status is set to NOT_FOUND" do
-		@response.status = HTTP::NOT_FOUND
+	it "knows whether or not it has been handled" do
+		@response.should_not be_handled()
+		@response.status = HTTP::OK
 		@response.should be_handled()
 	end
 
-	it "knows if it has not yet been handled" do
-		@response.should_not be_handled()
-		@response.status = HTTP::OK
+	it "knows that it has been handled even if the status is set to NOT_FOUND" do
+		@response.reset
+		@response.status = HTTP::NOT_FOUND
 		@response.should be_handled()
 	end
 
@@ -185,25 +184,14 @@ describe Mongrel2::HTTPResponse do
 
 
 	it "knows what the response content type is" do
-		headers = mock( 'headers' )
-		@response.stub!( :headers ).and_return( headers )
-
-		headers.should_receive( :[] ).
-			with( :content_type ).
-			and_return( 'text/erotica' )
-
+		@response.headers['Content-Type'] = 'text/erotica'
 		@response.content_type.should == 'text/erotica'
 	end
 
 
 	it "can modify the response content type" do
-		headers = mock( 'headers' )
-		@response.stub!( :headers ).and_return( headers )
-
-		headers.should_receive( :[]= ).
-			with( :content_type, 'image/nude' )
-
 		@response.content_type = 'image/nude'
+		@response.headers['Content-Type'].should == 'image/nude'
 	end
 
 

data/spec/mongrel2/table_spec.rb

@@ -133,11 +133,17 @@ describe Mongrel2::Table do
 
 
 	it "dupes its inner hash when duped" do
-		newtable = @table.dup
+		@table['foom'] = 'a string'
+		@table['frong'] = %w[eenie meenie mynie moe]
 
+		newtable = @table.dup
 		newtable['idkfa'] = 'god'
+		newtable[:foom] << " and another string"
+		newtable[:frong][3].replace( "mississipi" )
+
 		@table.should_not include( 'idkfa' )
-		@table.should be_empty()
+		@table[:foom].should == 'a string'
+		@table[:frong][3].should == 'moe'
 	end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongrel2
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -52,7 +52,7 @@ date: 2011-10-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70231616719680 !ruby/object:Gem::Requirement
+  requirement: &70233021488600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -60,10 +60,10 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70231616719680
+  version_requirements: *70233021488600
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &70231616719240 !ruby/object:Gem::Requirement
+  requirement: &70233021487960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -71,10 +71,10 @@ dependencies:
         version: '3.26'
   type: :runtime
   prerelease: false
-  version_requirements: *70231616719240
+  version_requirements: *70233021487960
 - !ruby/object:Gem::Dependency
   name: amalgalite
-  requirement: &70231616718820 !ruby/object:Gem::Requirement
+  requirement: &70233021487340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -82,10 +82,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70231616718820
+  version_requirements: *70233021487340
 - !ruby/object:Gem::Dependency
   name: tnetstring
-  requirement: &70231616718300 !ruby/object:Gem::Requirement
+  requirement: &70233021486780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -93,10 +93,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70231616718300
+  version_requirements: *70233021486780
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70231616717720 !ruby/object:Gem::Requirement
+  requirement: &70233021486140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -104,10 +104,10 @@ dependencies:
         version: '0.8'
   type: :runtime
   prerelease: false
-  version_requirements: *70231616717720
+  version_requirements: *70233021486140
 - !ruby/object:Gem::Dependency
   name: zmq
-  requirement: &70231616717260 !ruby/object:Gem::Requirement
+  requirement: &70233021485440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -115,10 +115,10 @@ dependencies:
         version: 2.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70231616717260
+  version_requirements: *70233021485440
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
-  requirement: &70231616716720 !ruby/object:Gem::Requirement
+  requirement: &70233021484760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -126,10 +126,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *70231616716720
+  version_requirements: *70233021484760
 - !ruby/object:Gem::Dependency
   name: hoe-highline
-  requirement: &70231616716140 !ruby/object:Gem::Requirement
+  requirement: &70233021484020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -137,10 +137,10 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *70231616716140
+  version_requirements: *70233021484020
 - !ruby/object:Gem::Dependency
   name: configurability
-  requirement: &70231616715540 !ruby/object:Gem::Requirement
+  requirement: &70233021483100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -148,10 +148,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70231616715540
+  version_requirements: *70233021483100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70231616715060 !ruby/object:Gem::Requirement
+  requirement: &70233021482360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -159,10 +159,10 @@ dependencies:
         version: '2.4'
   type: :development
   prerelease: false
-  version_requirements: *70231616715060
+  version_requirements: *70233021482360
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70231616714540 !ruby/object:Gem::Requirement
+  requirement: &70233021481580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -170,7 +170,7 @@ dependencies:
         version: '2.12'
   type: :development
   prerelease: false
-  version_requirements: *70231616714540
+  version_requirements: *70233021481580
 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,

metadata.gz.sig

@@ -1 +1 @@
-=��>zM��G&+�!U��.
+h�8ޑ5�Y�{潍u�W㍡{tزܞ�{���:�HQ��	��I8����u��A��H�\� 4w���|�	h��gFA��H�[>ݤ�J�Q)%���8*�H�+Ba������LEJM�Sg��=��0Ӓ�/B��=�ǑK��"�����:�l�ӝ�����0=��cl�i]��BK\a��W���D�}U�!�������O0�zt�H�i��%'��C*�p	�������u^Q�
u