Make config.generators accept string namespaces, you can do now config.generators.test_framework 'rspec' for instance

Signed-off-by: José Valim <jose.valim@gmail.com>

2 files changed, 16 insertions, 0 deletions

diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb
index 74b2bcaeb1..e5af12b901 100644
--- a/railties/lib/rails/configuration.rb
+++ b/railties/lib/rails/configuration.rb
@@ -60,6 +60,7 @@ module Rails
           namespace, configuration = method, args.shift
         else
           namespace, configuration = args.shift, args.shift
+          namespace = namespace.to_sym if namespace.respond_to?(:to_sym)
           @options[:rails][method] = namespace
         end
 
diff --git a/railties/test/application/generators_test.rb b/railties/test/application/generators_test.rb
index cbf0decd07..d258625f42 100644
--- a/railties/test/application/generators_test.rb
+++ b/railties/test/application/generators_test.rb
@@ -103,5 +103,20 @@ module ApplicationTests
         assert_equal({ :plugin => { :generator => "-g" } }, c.generators.aliases)
       end
     end
+
+    test "generators with string and hash for options should generate symbol keys" do
+      with_bare_config do |c|
+        c.generators do |g|
+          g.orm    'datamapper', :migration => false
+        end
+
+        expected = {
+          :rails => { :orm => :datamapper },
+          :datamapper => { :migration => false }
+        }
+
+        assert_equal expected, c.generators.options
+      end
+    end
   end
 end