Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
362203e8
R
rails
项目概览
张重言
/
rails
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rails
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
362203e8
编写于
4月 03, 2014
作者:
R
Rafael Mendonça França
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #14582 from arthurnn/blacklist_ruby_methods
Blacklist ruby keywords for scopes
上级
ae110ce5
815c9dea
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
15 addition
and
1 deletion
+15
-1
activerecord/CHANGELOG.md
activerecord/CHANGELOG.md
+8
-0
activerecord/lib/active_record/attribute_methods.rb
activerecord/lib/active_record/attribute_methods.rb
+3
-1
activerecord/test/cases/enum_test.rb
activerecord/test/cases/enum_test.rb
+1
-0
activerecord/test/cases/scoping/named_scoping_test.rb
activerecord/test/cases/scoping/named_scoping_test.rb
+3
-0
未找到文件。
activerecord/CHANGELOG.md
浏览文件 @
362203e8
*
Block a few default Class methods as scope name.
For instance, this will raise:
scope :public, -> { where(status: 1) }
*arthurnn*
*
Fixed error when using
`with_options`
with lambda.
Fixes #9805.
...
...
activerecord/lib/active_record/attribute_methods.rb
浏览文件 @
362203e8
...
...
@@ -29,6 +29,8 @@ def self.set_name_cache(name, value)
end
}
BLACKLISTED_CLASS_METHODS
=
%w(private public protected)
class
AttributeMethodCache
def
initialize
@module
=
Module
.
new
...
...
@@ -132,7 +134,7 @@ def method_defined_within?(name, klass, superklass = klass.superclass) # :nodoc:
# A class method is 'dangerous' if it is already (re)defined by Active Record, but
# not by any ancestors. (So 'puts' is not dangerous but 'new' is.)
def
dangerous_class_method?
(
method_name
)
class_method_defined_within?
(
method_name
,
Base
)
BLACKLISTED_CLASS_METHODS
.
include?
(
method_name
.
to_s
)
||
class_method_defined_within?
(
method_name
,
Base
)
end
def
class_method_defined_within?
(
name
,
klass
,
superklass
=
klass
.
superclass
)
# :nodoc
...
...
activerecord/test/cases/enum_test.rb
浏览文件 @
362203e8
...
...
@@ -194,6 +194,7 @@ class EnumTest < ActiveRecord::TestCase
:valid
,
# generates #valid?, which conflicts with an AR method
:save
,
# generates #save!, which conflicts with an AR method
:proposed
,
# same value as an existing enum
:public
,
:private
,
:protected
,
# generates a method that conflict with ruby words
]
conflicts
.
each_with_index
do
|
value
,
i
|
...
...
activerecord/test/cases/scoping/named_scoping_test.rb
浏览文件 @
362203e8
...
...
@@ -291,6 +291,9 @@ def pro; end
:relation
,
# private class method on AR::Base
:new
,
# redefined class method on AR::Base
:all
,
# a default scope
:public
,
:protected
,
:private
]
non_conflicts
=
[
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录