12 files changed, 28 insertions, 16 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index de506dfbbb..e8e8434a62 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,10 +1,7 @@
-*2.3.1 [RC2] (March 5, 2009)*
+*2.3.2 [Final] (March 15, 2009)*
 
 * Allow metal to live in plugins #2045 [Matthew Rudy]
 
-
-*2.3.0 [RC1] (February 1st, 2009)*
-
 * Added metal [Josh Peek]
 
 * Remove script/performance/request in favour of the performance integration tests. [Pratik Naik]
diff --git a/railties/Rakefile b/railties/Rakefile
index 4b524f1c6f..6c0fc22629 100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -311,11 +311,11 @@ spec = Gem::Specification.new do |s|
   EOF
 
   s.add_dependency('rake', '>= 0.8.3')
-  s.add_dependency('activesupport',    '= 2.3.1' + PKG_BUILD)
-  s.add_dependency('activerecord',     '= 2.3.1' + PKG_BUILD)
-  s.add_dependency('actionpack',       '= 2.3.1' + PKG_BUILD)
-  s.add_dependency('actionmailer',     '= 2.3.1' + PKG_BUILD)
-  s.add_dependency('activeresource',   '= 2.3.1' + PKG_BUILD)
+  s.add_dependency('activesupport',    '= 2.3.2' + PKG_BUILD)
+  s.add_dependency('activerecord',     '= 2.3.2' + PKG_BUILD)
+  s.add_dependency('actionpack',       '= 2.3.2' + PKG_BUILD)
+  s.add_dependency('actionmailer',     '= 2.3.2' + PKG_BUILD)
+  s.add_dependency('activeresource',   '= 2.3.2' + PKG_BUILD)
 
   s.rdoc_options << '--exclude' << '.'
   s.has_rdoc = false
diff --git a/railties/builtin/rails_info/rails/info.rb b/railties/builtin/rails_info/rails/info.rb
index 7b6f09ac69..a20d9bfe62 100644
--- a/railties/builtin/rails_info/rails/info.rb
+++ b/railties/builtin/rails_info/rails/info.rb
@@ -85,6 +85,10 @@ module Rails
       Gem::RubyGemsVersion
     end
 
+    property 'Rack version' do
+      ::Rack.release
+    end
+
     # The Rails version.
     property 'Rails version' do
       Rails::VERSION::STRING
diff --git a/railties/lib/rails/rack/metal.rb b/railties/lib/rails/rack/metal.rb
index 78b8a01449..adc43da864 100644
--- a/railties/lib/rails/rack/metal.rb
+++ b/railties/lib/rails/rack/metal.rb
@@ -18,7 +18,7 @@ module Rails
         metal_glob.each do |glob|
           Dir[glob].sort.map do |file|
             file = file.match(matcher)[1]
-            all_metals[file.classify] = file
+            all_metals[file.camelize] = file
           end
         end
 
diff --git a/railties/lib/rails/version.rb b/railties/lib/rails/version.rb
index fd38705e75..99c7516a65 100644
--- a/railties/lib/rails/version.rb
+++ b/railties/lib/rails/version.rb
@@ -2,7 +2,7 @@ module Rails
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 3
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
diff --git a/railties/test/fixtures/metal/multiplemetals/app/metal/metal_a.rb b/railties/test/fixtures/metal/multiplemetals/app/metal/metal_a.rb
index b8e7001351..2d373ce422 100644
--- a/railties/test/fixtures/metal/multiplemetals/app/metal/metal_a.rb
+++ b/railties/test/fixtures/metal/multiplemetals/app/metal/metal_a.rb
@@ -1,5 +1,5 @@
 class MetalA < Rails::Rack::Metal
   def self.call(env)
-    [200, { "Content-Type" => "text/html"}, "Hi"]
+    [200, { "Content-Type" => "text/html"}, ["Hi"]]
   end
 end
diff --git a/railties/test/fixtures/metal/multiplemetals/app/metal/metal_b.rb b/railties/test/fixtures/metal/multiplemetals/app/metal/metal_b.rb
index adc2f45fcf..a8bbf3fd60 100644
--- a/railties/test/fixtures/metal/multiplemetals/app/metal/metal_b.rb
+++ b/railties/test/fixtures/metal/multiplemetals/app/metal/metal_b.rb
@@ -1,5 +1,5 @@
 class MetalB < Rails::Rack::Metal
   def self.call(env)
-    [200, { "Content-Type" => "text/html"}, "Hi"]
+    [200, { "Content-Type" => "text/html"}, ["Hi"]]
   end
 end
diff --git a/railties/test/fixtures/metal/pluralmetal/app/metal/legacy_routes.rb b/railties/test/fixtures/metal/pluralmetal/app/metal/legacy_routes.rb
new file mode 100644
index 0000000000..0cd3737c32
--- /dev/null
+++ b/railties/test/fixtures/metal/pluralmetal/app/metal/legacy_routes.rb
@@ -0,0 +1,5 @@
+class LegacyRoutes < Rails::Rack::Metal
+  def self.call(env)
+    [301, { "Location" => "http://example.com"}, []]
+  end
+end
diff --git a/railties/test/fixtures/metal/singlemetal/app/metal/foo_metal.rb b/railties/test/fixtures/metal/singlemetal/app/metal/foo_metal.rb
index 9ade2ce8e7..5f5b087592 100644
--- a/railties/test/fixtures/metal/singlemetal/app/metal/foo_metal.rb
+++ b/railties/test/fixtures/metal/singlemetal/app/metal/foo_metal.rb
@@ -1,5 +1,5 @@
 class FooMetal < Rails::Rack::Metal
   def self.call(env)
-    [200, { "Content-Type" => "text/html"}, "Hi"]
+    [200, { "Content-Type" => "text/html"}, ["Hi"]]
   end
 end
diff --git a/railties/test/fixtures/metal/subfolders/app/metal/Folder/metal_a.rb b/railties/test/fixtures/metal/subfolders/app/metal/Folder/metal_a.rb
index 71a5a62eb8..25b3bb0abc 100644
--- a/railties/test/fixtures/metal/subfolders/app/metal/Folder/metal_a.rb
+++ b/railties/test/fixtures/metal/subfolders/app/metal/Folder/metal_a.rb
@@ -1,7 +1,7 @@
 module Folder
   class MetalA < Rails::Rack::Metal
     def self.call(env)
-      [200, { "Content-Type" => "text/html"}, "Hi"]
+      [200, { "Content-Type" => "text/html"}, ["Hi"]]
     end
   end
 end
diff --git a/railties/test/fixtures/metal/subfolders/app/metal/Folder/metal_b.rb b/railties/test/fixtures/metal/subfolders/app/metal/Folder/metal_b.rb
index 430d7bfed6..7583363f71 100644
--- a/railties/test/fixtures/metal/subfolders/app/metal/Folder/metal_b.rb
+++ b/railties/test/fixtures/metal/subfolders/app/metal/Folder/metal_b.rb
@@ -1,7 +1,7 @@
 module Folder
   class MetalB < Rails::Rack::Metal
     def self.call(env)
-      [200, { "Content-Type" => "text/html"}, "Hi"]
+      [200, { "Content-Type" => "text/html"}, ["Hi"]]
     end
   end
 end
diff --git a/railties/test/metal_test.rb b/railties/test/metal_test.rb
index 143efdda11..d3d231132b 100644
--- a/railties/test/metal_test.rb
+++ b/railties/test/metal_test.rb
@@ -8,6 +8,12 @@ class MetalTest < Test::Unit::TestCase
     end
   end
 
+  def test_metals_should_respect_class_name_conventions
+    use_appdir("pluralmetal") do
+      assert_equal(["LegacyRoutes"], found_metals_as_string_array)
+    end
+  end
+
   def test_metals_should_return_alphabetical_list_of_found_metal_apps
     use_appdir("multiplemetals") do
       assert_equal(["MetalA", "MetalB"], found_metals_as_string_array)