aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorYoshiyuki Kinjo <yskkin@gmail.com>2018-08-31 14:12:53 +0900
committerYoshiyuki Kinjo <yskkin@gmail.com>2018-08-31 15:47:35 +0900
commitae6adf98cc3d6ac085c9c6a4887dad65f3c4be17 (patch)
treeda360fce5980b13d4d0fc5126c198b2a559782fd /railties/lib
parentd48f4ddfc8dd38b65f7a040c5c9c7d1468114d2d (diff)
downloadrails-ae6adf98cc3d6ac085c9c6a4887dad65f3c4be17.tar.gz
rails-ae6adf98cc3d6ac085c9c6a4887dad65f3c4be17.tar.bz2
rails-ae6adf98cc3d6ac085c9c6a4887dad65f3c4be17.zip
Emit warning for unknown inflection rule when generating model.
For words like "abuse", Rails cannot derive its singular form from plural form "abuses" without defining custom inflection rule. `rails generate model` and its families now emit warning for this case.
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/generators/model_helpers.rb9
1 files changed, 8 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/model_helpers.rb b/railties/lib/rails/generators/model_helpers.rb
index 50078404b3..3676432d5c 100644
--- a/railties/lib/rails/generators/model_helpers.rb
+++ b/railties/lib/rails/generators/model_helpers.rb
@@ -7,6 +7,10 @@ module Rails
module ModelHelpers # :nodoc:
PLURAL_MODEL_NAME_WARN_MESSAGE = "[WARNING] The model name '%s' was recognized as a plural, using the singular '%s' instead. " \
"Override with --force-plural or setup custom inflection rules for this noun before running the generator."
+ IRREGULAR_MODEL_NAME_WARN_MESSAGE = <<~WARNING
+ [WARNING] Rails cannot recover singular form from its plural form '%s'.
+ Please setup custom inflection rules for this noun before running the generator in config/initializers/inflections.rb.
+ WARNING
mattr_accessor :skip_warn
def self.included(base) #:nodoc:
@@ -19,11 +23,14 @@ module Rails
singular = name.singularize
unless ModelHelpers.skip_warn
say PLURAL_MODEL_NAME_WARN_MESSAGE % [name, singular]
- ModelHelpers.skip_warn = true
end
name.replace singular
assign_names!(name)
end
+ if name.singularize != name.pluralize.singularize && ! ModelHelpers.skip_warn
+ say IRREGULAR_MODEL_NAME_WARN_MESSAGE % [name.pluralize]
+ end
+ ModelHelpers.skip_warn = true
end
end
end