Merge branch 'master' of github.com:lifo/docrails

2 files changed, 22 insertions, 0 deletions

diff --git a/activemodel/README.rdoc b/activemodel/README.rdoc
index 1fd75141f8..0c7089598c 100644
--- a/activemodel/README.rdoc
+++ b/activemodel/README.rdoc
@@ -135,6 +135,16 @@ behavior out of the box:
   pattern in a Rails App and take advantage of all the standard observer
   functions.
 
+    class PersonObserver < ActiveModel::Observer
+      def after_create(person)
+        person.logger.info("New person added!")
+      end
+
+      def after_destroy(person)
+        person.logger.warn("Person with an id of #{person.id} was destroyed!")
+      end
+    end
+
   {Learn more}[link:classes/ActiveModel/Observer.html]
 
 * Making objects serializable
diff --git a/activemodel/lib/active_model/attribute_methods.rb b/activemodel/lib/active_model/attribute_methods.rb
index 97a83e58af..25d5d84ce6 100644
--- a/activemodel/lib/active_model/attribute_methods.rb
+++ b/activemodel/lib/active_model/attribute_methods.rb
@@ -180,6 +180,18 @@ module ActiveModel
         undefine_attribute_methods
       end
 
+
+      # Allows you to make aliases for attributes.
+      #
+      #   class Person
+      #     attr_accessor :name
+      #     alias_attribute :nickname, :name
+      #   end
+      #
+      #   person = Person.new
+      #   person.nickname = "Bob"
+      #   person.nickname # => "Bob"
+      #   person.name     # => "Bob"
       def alias_attribute(new_name, old_name)
         attribute_method_matchers.each do |matcher|
           matcher_new = matcher.method_name(new_name).to_s