mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #36005 from shioyama/plain_matcher_first 

Make plain matcher match first, not last
This commit is contained in:
Rafael França 2019-07-25 23:51:19 -04:00 committed by GitHub
parent f72118577d 38c0bf7dfa
commit e5dc101cc5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
activemodel/lib/active_model/attribute_methods.rb
View File

@ -352,11 +352,7 @@ module ActiveModel
def attribute_method_matchers_matching(method_name)
attribute_method_matchers_cache.compute_if_absent(method_name) do
# Bump plain matcher to last place so that only methods that do not
# match any other pattern match the actual attribute name.
# This is currently only needed to support legacy usage.
matchers = attribute_method_matchers.partition(&:plain?).reverse.flatten(1)
matchers.map { |matcher| matcher.match(method_name) }.compact
attribute_method_matchers.map { |matcher| matcher.match(method_name) }.compact
end
end
@ -406,10 +402,6 @@ module ActiveModel
def method_name(attr_name)
@method_name % attr_name
end
def plain?
prefix.empty? && suffix.empty?
end
end
end