kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Remove deprecation warning from AttributeMethodsMatcher

Browse source
This commit is contained in:
Paul Nikitochkin 2013-06-27 22:03:18 +03:00
parent ca81874b3b
commit e63ba910ae
2 changed files with 0 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
activemodel/lib/active_model/attribute_methods.rb
View file

@ -388,14 +388,6 @@ module ActiveModel
AttributeMethodMatch = Struct.new(:target, :attr_name, :method_name) AttributeMethodMatch = Struct.new(:target, :attr_name, :method_name)
def initialize(options = {}) def initialize(options = {})
if options[:prefix] == '' || options[:suffix] == ''
message = "Specifying an empty prefix/suffix for an attribute method is no longer " \
"necessary. If the un-prefixed/suffixed version of the method has not been " \
"defined when `define_attribute_methods` is called, it will be defined " \
"automatically."
ActiveSupport::Deprecation.warn message
end
@prefix, @suffix = options.fetch(:prefix, ''), options.fetch(:suffix, '') @prefix, @suffix = options.fetch(:prefix, ''), options.fetch(:suffix, '')
@regex = /^(?:#{Regexp.escape(@prefix)})(.*)(?:#{Regexp.escape(@suffix)})$/ @regex = /^(?:#{Regexp.escape(@prefix)})(.*)(?:#{Regexp.escape(@suffix)})$/
@method_missing_target = "#{@prefix}attribute#{@suffix}" @method_missing_target = "#{@prefix}attribute#{@suffix}"

11
activemodel/test/cases/attribute_methods_test.rb
View file

@ -202,17 +202,6 @@ class AttributeMethodsTest < ActiveModel::TestCase
assert_equal 'bar', m.foo_test assert_equal 'bar', m.foo_test
end end
test 'explicitly specifying an empty prefix/suffix is deprecated' do
klass = Class.new(ModelWithAttributes)
assert_deprecated { klass.attribute_method_suffix '' }
assert_deprecated { klass.attribute_method_prefix '' }
klass.define_attribute_methods(:foo)
assert_equal 'value of foo', klass.new.foo
end
test 'should not interfere with method_missing if the attr has a private/protected method' do test 'should not interfere with method_missing if the attr has a private/protected method' do
m = ModelWithAttributes2.new m = ModelWithAttributes2.new
m.attributes = { 'private_method' => '<3', 'protected_method' => 'O_o' } m.attributes = { 'private_method' => '<3', 'protected_method' => 'O_o' }