favor composition over inheritence

1 files changed, 33 insertions, 9 deletions

diff --git a/activemodel/lib/active_model/errors.rb b/activemodel/lib/active_model/errors.rb
index ea23073a29..9d278220a8 100644
--- a/activemodel/lib/active_model/errors.rb
+++ b/activemodel/lib/active_model/errors.rb
@@ -60,9 +60,13 @@ module ActiveModel
   #   p.validate!             # => ["can not be nil"]
   #   p.errors.full_messages  # => ["name can not be nil"]
   #   # etc..
-  class Errors < ActiveSupport::OrderedHash
+  class Errors
+    include Enumerable
+
     CALLBACKS_OPTIONS = [:if, :unless, :on, :allow_nil, :allow_blank]
 
+    attr_reader :messages
+
     # Pass in the instance of the object that is using the errors object.
     #
     #   class Person
@@ -71,12 +75,24 @@ module ActiveModel
     #     end
     #   end
     def initialize(base)
-      @base = base
-      super()
+      @base     = base
+      @messages = ActiveSupport::OrderedHash.new
+    end
+
+    # Clear the messages
+    def clear
+      messages.clear
     end
 
-    alias_method :get, :[]
-    alias_method :set, :[]=
+    # Get messages for +key+
+    def get(key)
+      messages[key]
+    end
+
+    # Set messages for +key+ to +value+
+    def set(key, value)
+      messages[key] = value
+    end
 
     # When passed a symbol or a name of a method, returns an array of errors
     # for the method.
@@ -110,7 +126,7 @@ module ActiveModel
     #     # then yield :name and "must be specified"
     #   end
     def each
-      each_key do |attribute|
+      messages.each_key do |attribute|
         self[attribute].each { |error| yield attribute, error }
       end
     end
@@ -125,6 +141,16 @@ module ActiveModel
       values.flatten.size
     end
 
+    # Returns all message values
+    def values
+      messages.values
+    end
+
+    # Returns all message keys
+    def keys
+      messages.keys
+    end
+
     # Returns an array of error messages, with the attribute name included
     #
     #   p.errors.add(:name, "can't be blank")
@@ -169,9 +195,7 @@ module ActiveModel
     end
 
     def to_hash
-      hash = ActiveSupport::OrderedHash.new
-      each { |k, v| (hash[k] ||= []) << v }
-      hash
+      messages.dup
     end
 
     # Adds +message+ to the error messages on +attribute+, which will be returned on a call to