kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Make Rails::Configuration::Generators accessor consistent

Browse source 
Rails::Configuration::Generators provides method_missing based accessor.

The following code sets `orm` value:

    Rails.application.config.generators.orm :data_mapper

The following code does NOT return `orm` value:

    Rails.application.config.generators.orm # => {}

It's better that the reader returns the value set by writter in terms of
consistency:

    Rails.application.config.generators.orm # => :data_mapper
This commit is contained in:
Kouhei Sutou 2017-03-16 14:21:37 +09:00 committed by Sutou Kouhei
parent 3a6770fb51
commit 4334299b65
2 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
railties/lib/rails/configuration.rb
View file

@ -110,7 +110,13 @@ module Rails
def method_missing(method, *args)
method = method.to_s.sub(/=$/, "").to_sym
return @options[method] if args.empty?
if args.empty?
if method == :rails
return @options[method]
else
return @options[:rails][method]
end
end
if method == :rails || args.first.is_a?(Hash)
namespace, configuration = method, args.shift

26
railties/test/railties/engine_test.rb
View file

@ -1029,15 +1029,15 @@ en:
boot_rails
app_generators = Rails.application.config.generators.options[:rails]
assert_equal :mongoid, app_generators[:orm]
assert_equal :liquid, app_generators[:template_engine]
assert_equal :test_unit, app_generators[:test_framework]
app_generators = Rails.application.config.generators
assert_equal :mongoid, app_generators.orm
assert_equal :liquid, app_generators.template_engine
assert_equal :test_unit, app_generators.test_framework
generators = Bukkits::Engine.config.generators.options[:rails]
assert_equal :data_mapper, generators[:orm]
assert_equal :haml, generators[:template_engine]
assert_equal :rspec, generators[:test_framework]
generators = Bukkits::Engine.config.generators
assert_equal :data_mapper, generators.orm
assert_equal :haml, generators.template_engine
assert_equal :rspec, generators.test_framework
end
test "engine should get default generators with ability to overwrite them" do
@ -1051,12 +1051,12 @@ en:
boot_rails
generators = Bukkits::Engine.config.generators.options[:rails]
assert_equal :active_record, generators[:orm]
assert_equal :rspec, generators[:test_framework]
generators = Bukkits::Engine.config.generators
assert_equal :active_record, generators.orm
assert_equal :rspec, generators.test_framework
app_generators = Rails.application.config.generators.options[:rails]
assert_equal :test_unit, app_generators[:test_framework]
app_generators = Rails.application.config.generators
assert_equal :test_unit, app_generators.test_framework
end
test "do not create table_name_prefix method if it already exists" do