Merge branch 'master' of git://github.com/rails/rails

4 files changed, 22 insertions, 8 deletions

diff --git a/railties/lib/rails/generators/actions.rb b/railties/lib/rails/generators/actions.rb
index a31932906d..7af329bbf0 100644
--- a/railties/lib/rails/generators/actions.rb
+++ b/railties/lib/rails/generators/actions.rb
@@ -54,7 +54,8 @@ module Rails
         name, version = args
 
         # Deal with deprecated options
-        { :env => :only, :lib => :require_as }.each do |old, new|
+        { :env => :group, :only => :group,
+          :lib => :require, :require_as => :require }.each do |old, new|
           next unless options[old]
           options[new] = options.delete(old)
           ActiveSupport::Deprecation.warn "#{old.inspect} option in gem is deprecated, use #{new.inspect} instead"
diff --git a/railties/lib/rails/generators/generated_attribute.rb b/railties/lib/rails/generators/generated_attribute.rb
index e962308585..f01934f946 100644
--- a/railties/lib/rails/generators/generated_attribute.rb
+++ b/railties/lib/rails/generators/generated_attribute.rb
@@ -9,12 +9,13 @@ module Rails
 
       def field_type
         @field_type ||= case type
-          when :integer, :float, :decimal   then :text_field
-          when :datetime, :timestamp, :time then :datetime_select
-          when :date                        then :date_select
-          when :string                      then :text_field
-          when :text                        then :text_area
-          when :boolean                     then :check_box
+          when :integer, :float, :decimal then :text_field
+          when :time                      then :time_select
+          when :datetime, :timestamp      then :datetime_select
+          when :date                      then :date_select
+          when :string                    then :text_field
+          when :text                      then :text_area
+          when :boolean                   then :check_box
           else
             :text_field
         end
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index 0a0b033738..ee44acc2fa 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -149,7 +149,7 @@ module Rails
     # can change in Ruby 1.8.7 when we FileUtils.cd.
     RAILS_DEV_PATH = File.expand_path("../../../../../..", File.dirname(__FILE__))
 
-    RESERVED_NAMES = %w[generate console server dbconsole
+    RESERVED_NAMES = %w[generate g console c server s dbconsole db
                         application destroy benchmarker profiler
                         plugin runner test]
 
diff --git a/railties/lib/rails/generators/test_case.rb b/railties/lib/rails/generators/test_case.rb
index 6b97c69d8d..952400e049 100644
--- a/railties/lib/rails/generators/test_case.rb
+++ b/railties/lib/rails/generators/test_case.rb
@@ -189,6 +189,18 @@ module Rails
       end
       alias :assert_method :assert_instance_method
 
+      # Asserts the given field name gets translated to an attribute type 
+      # properly.
+      #
+      #   assert_field_type :date, :date_select
+      #
+      def assert_field_type(name, attribute_type)
+        assert_equal(
+          Rails::Generators::GeneratedAttribute.new('test', name.to_s).field_type,
+          attribute_type
+        )
+      end
+      
       # Runs the generator configured for this class. The first argument is an array like
       # command line arguments:
       #