1 files changed, 9 insertions, 2 deletions
diff --git a/activemodel/lib/active_model/attribute_methods.rb b/activemodel/lib/active_model/attribute_methods.rb
index bdc0eb4a0d..f058d3aa79 100644
--- a/activemodel/lib/active_model/attribute_methods.rb
+++ b/activemodel/lib/active_model/attribute_methods.rb
@@ -60,7 +60,7 @@ module ActiveModel
 
     included do
       class_attribute :attribute_method_matchers, :instance_writer => false
-      self.attribute_method_matchers = []
+      self.attribute_method_matchers = [ClassMethods::AttributeMethodMatcher.new]
     end
 
     module ClassMethods
@@ -357,8 +357,11 @@ module ActiveModel
           if attribute_method_matchers_cache.key?(method_name)
             attribute_method_matchers_cache[method_name]
           else
+            # Must try to match prefixes/suffixes first, or else the matcher with no prefix/suffix
+            # will match every time.
+            matchers = attribute_method_matchers.partition(&:plain?).reverse.flatten(1)
             match = nil
-            attribute_method_matchers.detect { |method| match = method.match(method_name) }
+            matchers.detect { |method| match = method.match(method_name) }
             attribute_method_matchers_cache[method_name] = match
           end
         end
@@ -387,6 +390,10 @@ module ActiveModel
           def method_name(attr_name)
             @method_name % attr_name
           end
+
+          def plain?
+            prefix.empty? && suffix.empty?
+          end
         end
     end