Merge remote branch 'mainstream/master'

Conflicts:
	activerecord/lib/active_record/base.rb
	railties/lib/rails/configuration.rb
	railties/lib/rails/log_subscriber.rb

7 files changed, 82 insertions, 18 deletions

diff --git a/activemodel/test/cases/conversion_test.rb b/activemodel/test/cases/conversion_test.rb
new file mode 100644
index 0000000000..7669bf5f65
--- /dev/null
+++ b/activemodel/test/cases/conversion_test.rb
@@ -0,0 +1,25 @@
+require 'cases/helper'
+require 'models/contact'
+
+class ConversionTest < ActiveModel::TestCase
+  test "to_model default implementation returns self" do
+    contact = Contact.new
+    assert_equal contact, contact.to_model
+  end
+
+  test "to_key default implementation returns nil for new records" do
+    assert_nil Contact.new.to_key
+  end
+
+  test "to_key default implementation returns the id in an array for persisted records" do
+    assert_equal [1], Contact.new(:id => 1).to_key
+  end
+
+  test "to_param default implementation returns nil for new records" do
+    assert_nil Contact.new.to_param
+  end
+
+  test "to_param default implementation returns a string of ids for persisted records" do
+    assert_equal "1", Contact.new(:id => 1).to_param
+  end
+end
\ No newline at end of file
diff --git a/activemodel/test/cases/helper.rb b/activemodel/test/cases/helper.rb
index 8bcbe54651..8578ab7dbd 100644
--- a/activemodel/test/cases/helper.rb
+++ b/activemodel/test/cases/helper.rb
@@ -1,5 +1,8 @@
 require File.expand_path('../../../../load_paths', __FILE__)
 
+lib = File.expand_path("#{File.dirname(__FILE__)}/../../lib")
+$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
+
 require 'config'
 require 'active_model'
 
diff --git a/activemodel/test/cases/lint_test.rb b/activemodel/test/cases/lint_test.rb
index 63804004ee..68372160cd 100644
--- a/activemodel/test/cases/lint_test.rb
+++ b/activemodel/test/cases/lint_test.rb
@@ -1,18 +1,14 @@
-require "cases/helper"
+require 'cases/helper'
 
 class LintTest < ActiveModel::TestCase
   include ActiveModel::Lint::Tests
 
   class CompliantModel
     extend ActiveModel::Naming
-
-    def to_model
-      self
-    end
+    include ActiveModel::Conversion
 
     def valid?()      true end
-    def new_record?() true end
-    def destroyed?()  true end
+    def persisted?() false end
 
     def errors
       obj = Object.new
diff --git a/activemodel/test/cases/validations/presence_validation_test.rb b/activemodel/test/cases/validations/presence_validation_test.rb
index 8b9795a90c..c4d787dadb 100644
--- a/activemodel/test/cases/validations/presence_validation_test.rb
+++ b/activemodel/test/cases/validations/presence_validation_test.rb
@@ -10,6 +10,12 @@ require 'models/custom_reader'
 class PresenceValidationTest < ActiveModel::TestCase
   include ActiveModel::TestsDatabase
 
+  teardown do
+    Topic.reset_callbacks(:validate)
+    Person.reset_callbacks(:validate)
+    CustomReader.reset_callbacks(:validate)
+  end
+
   def test_validate_presences
     Topic.validates_presence_of(:title, :content)
 
@@ -27,17 +33,21 @@ class PresenceValidationTest < ActiveModel::TestCase
     t.content = "like stuff"
 
     assert t.save
-  ensure
-    Topic.reset_callbacks(:validate)
+  end
+
+  test 'accepts array arguments' do
+    Topic.validates_presence_of %w(title content)
+    t = Topic.new
+    assert !t.valid?
+    assert_equal ["can't be blank"], t.errors[:title]
+    assert_equal ["can't be blank"], t.errors[:content]
   end
 
   def test_validates_acceptance_of_with_custom_error_using_quotes
-    Person.validates_presence_of :karma, :message=> "This string contains 'single' and \"double\" quotes"
+    Person.validates_presence_of :karma, :message => "This string contains 'single' and \"double\" quotes"
     p = Person.new
     assert !p.valid?
     assert_equal "This string contains 'single' and \"double\" quotes", p.errors[:karma].last
-  ensure
-    Person.reset_callbacks(:validate)
   end
 
   def test_validates_presence_of_for_ruby_class
@@ -50,10 +60,8 @@ class PresenceValidationTest < ActiveModel::TestCase
 
     p.karma = "Cold"
     assert p.valid?
-  ensure
-    Person.reset_callbacks(:validate)
   end
-  
+
   def test_validates_presence_of_for_ruby_class_with_custom_reader
     CustomReader.validates_presence_of :karma
 
@@ -64,7 +72,5 @@ class PresenceValidationTest < ActiveModel::TestCase
 
     p[:karma] = "Cold"
     assert p.valid?
-  ensure
-    CustomReader.reset_callbacks(:validate)
   end
 end
diff --git a/activemodel/test/cases/validations/with_validation_test.rb b/activemodel/test/cases/validations/with_validation_test.rb
index 66b072ea38..92df4dd6cd 100644
--- a/activemodel/test/cases/validations/with_validation_test.rb
+++ b/activemodel/test/cases/validations/with_validation_test.rb
@@ -9,6 +9,7 @@ class ValidatesWithTest < ActiveRecord::TestCase
 
   def teardown
     Topic.reset_callbacks(:validate)
+    Topic._validators.clear
   end
 
   ERROR_MESSAGE = "Validation error from validator"
diff --git a/activemodel/test/cases/validations_test.rb b/activemodel/test/cases/validations_test.rb
index eb100d1c35..9fedd84c73 100644
--- a/activemodel/test/cases/validations_test.rb
+++ b/activemodel/test/cases/validations_test.rb
@@ -10,6 +10,10 @@ require 'models/custom_reader'
 class ValidationsTest < ActiveModel::TestCase
   include ActiveModel::TestsDatabase
 
+  def setup
+    Topic._validators.clear
+  end
+
   # Most of the tests mess with the validations of Topic, so lets repair it all the time.
   # Other classes we mess with will be dealt with in the specific tests
   def teardown
@@ -220,4 +224,27 @@ class ValidationsTest < ActiveModel::TestCase
     assert !t.valid?
     assert ["NO BLANKS HERE"], t.errors[:title]
   end
+
+  def test_list_of_validators_for_model
+    Topic.validates_presence_of :title
+    Topic.validates_length_of :title, :minimum => 2
+
+    assert_equal 2, Topic.validators.count
+    assert_equal [:presence, :length], Topic.validators.map(&:kind)
+  end
+
+  def test_list_of_validators_on_an_attribute
+    Topic.validates_presence_of :title, :content
+    Topic.validates_length_of :title, :minimum => 2
+
+    assert_equal 2, Topic.validators_on(:title).count
+    assert_equal [:presence, :length], Topic.validators_on(:title).map(&:kind)
+    assert_equal 1, Topic.validators_on(:content).count
+    assert_equal [:presence], Topic.validators_on(:content).map(&:kind)
+  end
+
+  def test_accessing_instance_of_validator_on_an_attribute
+    Topic.validates_length_of :title, :minimum => 10
+    assert_equal 10, Topic.validators_on(:title).first.options[:minimum]
+  end
 end
diff --git a/activemodel/test/models/contact.rb b/activemodel/test/models/contact.rb
index f9fb0af027..a9009fbdef 100644
--- a/activemodel/test/models/contact.rb
+++ b/activemodel/test/models/contact.rb
@@ -1,7 +1,13 @@
 class Contact
-  attr_accessor :name, :age, :created_at, :awesome, :preferences
+  include ActiveModel::Conversion
+
+  attr_accessor :id, :name, :age, :created_at, :awesome, :preferences
 
   def initialize(options = {})
     options.each { |name, value| send("#{name}=", value) }
   end
+
+  def persisted?
+    id
+  end
 end