Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

include names in model generator warning message. refs #13515.

This is a follow up to #13515. It includes the name given and
the singularized version in the warning message. This will aide the user
to see wether the detected singular was right or not.
  • Loading branch information...
commit 174c9f0df39cd338a4871f82794256cc64f68a81 1 parent 0e144be
@senny senny authored
View
10 railties/lib/rails/generators/model_helpers.rb
@@ -3,21 +3,23 @@
module Rails
module Generators
module ModelHelpers # :nodoc:
- PLURAL_MODEL_NAME_WARN_MESSAGE = 'Plural version of the model detected, using singularized version. Override with --force-plural or setup custom inflection rules for this noun before running the generator.'
+ PLURAL_MODEL_NAME_WARN_MESSAGE = "The model name '%s' was recognized as a plural, using the singular '%s'. " \
+ "Override with --force-plural or setup custom inflection rules for this noun before running the generator."
mattr_accessor :skip_warn
def self.included(base) #:nodoc:
- base.class_option :force_plural, type: :boolean, default: false, desc: 'Forces the use of a plural model name'
+ base.class_option :force_plural, type: :boolean, default: false, desc: 'Forces the use of the given model name'
end
def initialize(args, *_options)
super
if name == name.pluralize && name.singularize != name.pluralize && !options[:force_plural]
+ singular = name.singularize
unless ModelHelpers.skip_warn
- say PLURAL_MODEL_NAME_WARN_MESSAGE
+ say PLURAL_MODEL_NAME_WARN_MESSAGE % [name, singular]
ModelHelpers.skip_warn = true
end
- name.replace name.singularize
+ name.replace singular
assign_names!(name)
end
end
View
2  railties/test/generators/model_generator_test.rb
@@ -38,7 +38,7 @@ def test_plural_names_are_singularized
content = run_generator ["accounts".freeze]
assert_file "app/models/account.rb", /class Account < ActiveRecord::Base/
assert_file "test/models/account_test.rb", /class AccountTest/
- assert_match(/Plural version of the model detected, using singularized version. Override with --force-plural or setup custom inflection rules for this noun before running the generator./, content)
+ assert_match(/The model name 'accounts' was recognized as a plural, using the singular 'account'\. Override with --force-plural or setup custom inflection rules for this noun before running the generator\./, content)
end
def test_model_with_underscored_parent_option
Please sign in to comment.
Something went wrong with that request. Please try again.