提交 deaf2858 编写于 作者: C Carlos Antonio da Silva

Merge pull request #12686 from kryzhovnik/master

Minor doc fix of ActiveModel::Naming. [ci skip]

Conflicts:
	activemodel/lib/active_model/naming.rb
......@@ -262,10 +262,10 @@ def self.uncountable?(record_or_class)
# namespaced models regarding whether it's inside isolated engine.
#
# # For isolated engine:
# ActiveModel::Naming.singular_route_key(Blog::Post) #=> post
# ActiveModel::Naming.singular_route_key(Blog::Post) #=> "post"
#
# # For shared engine:
# ActiveModel::Naming.singular_route_key(Blog::Post) #=> blog_post
# ActiveModel::Naming.singular_route_key(Blog::Post) #=> "blog_post"
def self.singular_route_key(record_or_class)
model_name_from_record_or_class(record_or_class).singular_route_key
end
......@@ -274,10 +274,10 @@ def self.singular_route_key(record_or_class)
# namespaced models regarding whether it's inside isolated engine.
#
# # For isolated engine:
# ActiveModel::Naming.route_key(Blog::Post) #=> posts
# ActiveModel::Naming.route_key(Blog::Post) #=> "posts"
#
# # For shared engine:
# ActiveModel::Naming.route_key(Blog::Post) #=> blog_posts
# ActiveModel::Naming.route_key(Blog::Post) #=> "blog_posts"
#
# The route key also considers if the noun is uncountable and, in
# such cases, automatically appends _index.
......@@ -289,10 +289,10 @@ def self.route_key(record_or_class)
# namespaced models regarding whether it's inside isolated engine.
#
# # For isolated engine:
# ActiveModel::Naming.param_key(Blog::Post) #=> post
# ActiveModel::Naming.param_key(Blog::Post) #=> "post"
#
# # For shared engine:
# ActiveModel::Naming.param_key(Blog::Post) #=> blog_post
# ActiveModel::Naming.param_key(Blog::Post) #=> "blog_post"
def self.param_key(record_or_class)
model_name_from_record_or_class(record_or_class).param_key
end
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册