Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
3a40d386
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,发现更多精彩内容 >>
提交
3a40d386
编写于
12月 01, 2011
作者:
J
Jon Leighton
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Get rid of the underscore versions of attribute methods!
This makes me happy!
上级
3dcb1271
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
40 addition
and
6 deletion
+40
-6
activerecord/lib/active_record.rb
activerecord/lib/active_record.rb
+1
-0
activerecord/lib/active_record/attribute_methods/deprecated_underscore_read.rb
...ve_record/attribute_methods/deprecated_underscore_read.rb
+32
-0
activerecord/lib/active_record/attribute_methods/primary_key.rb
...record/lib/active_record/attribute_methods/primary_key.rb
+1
-2
activerecord/lib/active_record/attribute_methods/read.rb
activerecord/lib/active_record/attribute_methods/read.rb
+0
-4
activerecord/lib/active_record/base.rb
activerecord/lib/active_record/base.rb
+1
-0
activerecord/test/cases/attribute_methods_test.rb
activerecord/test/cases/attribute_methods_test.rb
+5
-0
未找到文件。
activerecord/lib/active_record.rb
浏览文件 @
3a40d386
...
...
@@ -93,6 +93,7 @@ module AttributeMethods
autoload
:TimeZoneConversion
autoload
:Write
autoload
:Serialization
autoload
:DeprecatedUnderscoreRead
end
end
...
...
activerecord/lib/active_record/attribute_methods/deprecated_underscore_read.rb
0 → 100644
浏览文件 @
3a40d386
require
'active_support/concern'
require
'active_support/deprecation'
module
ActiveRecord
module
AttributeMethods
module
DeprecatedUnderscoreRead
extend
ActiveSupport
::
Concern
included
do
attribute_method_prefix
"_"
end
module
ClassMethods
protected
def
define_method__attribute
(
attr_name
)
# Do nothing, let it hit method missing instead.
end
end
protected
def
_attribute
(
attr_name
)
ActiveSupport
::
Deprecation
.
warn
(
"You have called '_
#{
attr_name
}
'. This is deprecated. Please use "
\
"either '
#{
attr_name
}
' or read_attribute('
#{
attr_name
}
')."
)
read_attribute
(
attr_name
)
end
end
end
end
activerecord/lib/active_record/attribute_methods/primary_key.rb
浏览文件 @
3a40d386
...
...
@@ -13,7 +13,6 @@ def to_key
def
id
read_attribute
(
self
.
class
.
primary_key
)
end
alias
_id
id
# Sets the primary key value
def
id
=
(
value
)
...
...
@@ -27,7 +26,7 @@ def id?
module
ClassMethods
def
dangerous_attribute_method?
(
method_name
)
super
&&
!
[
'id'
,
'id='
,
'id?'
,
'_id'
].
include?
(
method_name
)
super
&&
!
[
'id'
,
'id='
,
'id?'
].
include?
(
method_name
)
end
# Defines the primary key field -- can be overridden in subclasses. Overwriting will negate any effect of the
...
...
activerecord/lib/active_record/attribute_methods/read.rb
浏览文件 @
3a40d386
...
...
@@ -61,8 +61,6 @@ def #{attr_name}
def self.cast_
#{
attr_name
}
(v)
#{
cast_code
}
end
alias _
#{
attr_name
}
#{
attr_name
}
STR
else
generated_attribute_methods
.
module_eval
do
...
...
@@ -73,8 +71,6 @@ def self.cast_#{attr_name}(v)
singleton_class
.
send
(
:define_method
,
"cast_
#{
attr_name
}
"
)
do
|
v
|
eval
(
cast_code
)
end
alias_method
(
"_
#{
attr_name
}
"
,
attr_name
)
end
end
end
...
...
activerecord/lib/active_record/base.rb
浏览文件 @
3a40d386
...
...
@@ -2200,6 +2200,7 @@ def populate_with_current_scope_attributes
include
AttributeMethods
::
TimeZoneConversion
include
AttributeMethods
::
Dirty
include
AttributeMethods
::
Serialization
include
AttributeMethods
::
DeprecatedUnderscoreRead
include
ActiveModel
::
MassAssignmentSecurity
include
Callbacks
,
ActiveModel
::
Observing
,
Timestamp
include
Associations
,
NamedScope
...
...
activerecord/test/cases/attribute_methods_test.rb
浏览文件 @
3a40d386
...
...
@@ -114,6 +114,11 @@ def test_respond_to?
assert
!
topic
.
respond_to?
(
:nothingness
)
end
def
test_deprecated_underscore_method
topic
=
Topic
.
find
(
1
)
assert_equal
topic
.
title
,
assert_deprecated
{
topic
.
_title
}
end
def
test_respond_to_with_custom_primary_key
keyboard
=
Keyboard
.
create
assert_not_nil
keyboard
.
key_number
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录