Merge commit 'rails/master'

1 files changed, 8 insertions, 15 deletions

diff --git a/activemodel/examples/amo_ap_example.rb b/activemodel/examples/validations.rb
index cef718d0d4..3f8311ff96 100644
--- a/activemodel/examples/amo_ap_example.rb
+++ b/activemodel/examples/validations.rb
@@ -1,31 +1,24 @@
-$:.push "activesupport/lib"
-$:.push "activemodel/lib"
-
-require "active_model/validations"
-require "active_model/deprecated_error_methods"
-require "active_model/errors"
-require "active_model/naming"
+require 'activemodel'
 
 class Person
+  include ActiveModel::Conversion
   include ActiveModel::Validations
-  extend ActiveModel::Naming
-  
+
   validates_presence_of :name
-  
+
   attr_accessor :name
+
   def initialize(attributes = {})
     @name = attributes[:name]
   end
-  
+
   def persist
     @persisted = true
   end
-  
+
   def new_record?
     @persisted
   end
-  
-  def to_model() self end
 end
 
 person1 = Person.new
@@ -33,4 +26,4 @@ p person1.valid?
 person1.errors
 
 person2 = Person.new(:name => "matz")
-p person2.valid?
\ No newline at end of file
+p person2.valid?