aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-01-12 11:23:26 +0100
committerJosé Valim <jose.valim@gmail.com>2010-01-13 01:19:22 +0100
commitc4e3344a26dce5d2bc15e788c75140356a40537c (patch)
tree4660b6033c00a9ce7eed6ba01dbad44cf3465c46
parenta5c45e69d9fde248e1aea249d31314962537430a (diff)
downloadrails-c4e3344a26dce5d2bc15e788c75140356a40537c.tar.gz
rails-c4e3344a26dce5d2bc15e788c75140356a40537c.tar.bz2
rails-c4e3344a26dce5d2bc15e788c75140356a40537c.zip
Revert "Add a generator_paths config option"
This reverts commit 8665c754cb61c947cd55f8886c28188050aed78d.
-rw-r--r--railties/lib/rails/configuration.rb12
-rw-r--r--railties/test/plugins/configuration_test.rb6
2 files changed, 5 insertions, 13 deletions
diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb
index 08f5dda8ee..eed9834203 100644
--- a/railties/lib/rails/configuration.rb
+++ b/railties/lib/rails/configuration.rb
@@ -22,17 +22,15 @@ module Rails
end
end
- attr_reader :middleware, :generator_paths
+ attr_reader :middleware
def initialize(base = nil)
if base
- @options = base.options.dup
- @middleware = base.middleware.dup
- @generator_paths = base.generator_paths.dup
+ @options = base.options.dup
+ @middleware = base.middleware.dup
else
- @options = Hash.new { |h,k| h[k] = ActiveSupport::OrderedOptions.new }
- @middleware = self.class.default_middleware_stack
- @generator_paths = []
+ @options = Hash.new { |h,k| h[k] = ActiveSupport::OrderedOptions.new }
+ @middleware = self.class.default_middleware_stack
end
end
diff --git a/railties/test/plugins/configuration_test.rb b/railties/test/plugins/configuration_test.rb
index 03c738971f..25bf24eb3b 100644
--- a/railties/test/plugins/configuration_test.rb
+++ b/railties/test/plugins/configuration_test.rb
@@ -24,12 +24,6 @@ module PluginsTest
assert_equal "hello", AppTemplate::Application.config.foo.greetings
end
- test "plugins can provide generators" do
- class Foo < Rails::Railtie ; config.generator_paths << "/foo" ; end
- require "#{app_path}/config/application"
- assert_eqaul ["/foo"], AppTemplate::Application.config.generator_paths
- end
-
test "plugin config merges are deep" do
class Foo < Rails::Railtie ; config.foo.greetings = 'hello' ; end
class MyApp < Rails::Application