diff options
| author | José Valim <jose.valim@gmail.com> | 2009-11-04 00:14:44 -0200 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-03 18:22:05 -0800 |
| commit | d627c932bdc5c0e2911e39cfb38952c29dab7afc (patch) | |
| tree | 16a2a6723f6a365d98c655e2b23574744ab6f7a3 /railties/lib/rails/configuration.rb | |
| parent | e5211e3bd052ebc24905c65172d449f7b3bcc73f (diff) | |
| download | rails-d627c932bdc5c0e2911e39cfb38952c29dab7afc.tar.gz rails-d627c932bdc5c0e2911e39cfb38952c29dab7afc.tar.bz2 rails-d627c932bdc5c0e2911e39cfb38952c29dab7afc.zip | |
Pass config.generators options along when RAILS_GENERATORS is set and show --force-plural message just once.
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Diffstat (limited to 'railties/lib/rails/configuration.rb')
| -rw-r--r-- | railties/lib/rails/configuration.rb | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb index 0a545f23de..2b847ba711 100644 --- a/railties/lib/rails/configuration.rb +++ b/railties/lib/rails/configuration.rb @@ -278,12 +278,16 @@ module Rails end def method_missing(method, *args) - method = method.to_s.sub(/=$/, '').to_sym - namespace = args.first.is_a?(Symbol) ? args.shift : nil - configuration = args.first.is_a?(Hash) ? args.shift : nil + method = method.to_s.sub(/=$/, '').to_sym - @options[:rails][method] = namespace if namespace - namespace ||= method + if method == :rails + namespace, configuration = :rails, args.shift + elsif args.first.is_a?(Hash) + namespace, configuration = method, args.shift + else + namespace, configuration = args.shift, args.shift + @options[:rails][method] = namespace + end if configuration aliases = configuration.delete(:aliases) |