2 files changed, 12 insertions, 21 deletions
diff --git a/activemodel/lib/active_model/conversion.rb b/activemodel/lib/active_model/conversion.rb
index 374265f0d8..9c9b6f4a77 100644
--- a/activemodel/lib/active_model/conversion.rb
+++ b/activemodel/lib/active_model/conversion.rb
@@ -40,13 +40,15 @@ module ActiveModel
       self
     end
 
-    # Returns an Enumerable of all key attributes if any is set, regardless if
+    # Returns an Array of all key attributes if any is set, regardless if
     # the object is persisted or not. Returns +nil+ if there are no key attributes.
     #
-    #   class Person < ActiveRecord::Base
+    #   class Person
+    #     include ActiveModel::Conversion
+    #     attr_accessor :id
     #   end
     #
-    #   person = Person.create
+    #   person = Person.create(id: 1)
     #   person.to_key # => [1]
     def to_key
       key = respond_to?(:id) && id
@@ -56,10 +58,15 @@ module ActiveModel
     # Returns a +string+ representing the object's key suitable for use in URLs,
     # or +nil+ if <tt>persisted?</tt> is +false+.
     #
-    #   class Person < ActiveRecord::Base
+    #   class Person
+    #     include ActiveModel::Conversion
+    #     attr_accessor :id
+    #     def persisted?
+    #       true
+    #     end
     #   end
     #
-    #   person = Person.create
+    #   person = Person.create(id: 1)
     #   person.to_param # => "1"
     def to_param
       (persisted? && key = to_key) ? key.join('-') : nil
diff --git a/activemodel/lib/active_model/validator.rb b/activemodel/lib/active_model/validator.rb
index bddacc8c45..65cb1e5a88 100644
--- a/activemodel/lib/active_model/validator.rb
+++ b/activemodel/lib/active_model/validator.rb
@@ -106,7 +106,6 @@ module ActiveModel
     # Accepts options that will be made available through the +options+ reader.
     def initialize(options = {})
       @options  = options.except(:class).freeze
-      deprecated_setup(options)
     end
 
     # Returns the kind for this validator.
@@ -122,21 +121,6 @@ module ActiveModel
     def validate(record)
       raise NotImplementedError, "Subclasses must implement a validate(record) method."
     end
-
-    private
-    def deprecated_setup(options) # TODO: remove me in 4.2.
-      return unless respond_to?(:setup)
-      ActiveSupport::Deprecation.warn "The `Validator#setup` instance method is deprecated and will be removed on Rails 4.2. Do your setup in the constructor instead:
-
-class MyValidator < ActiveModel::Validator
-  def initialize(options={})
-    super
-    options[:class].send :attr_accessor, :custom_attribute
-  end
-end
-"
-      setup(options[:class])
-    end
   end
 
   # +EachValidator+ is a validator which iterates through the attributes given