From d758d996d1b66e2a65640f79f01ce2ac674d7ed5 Mon Sep 17 00:00:00 2001 From: Pratik Naik Date: Sat, 21 Mar 2009 19:05:09 +0000 Subject: Deprecate Model#validate/validate_on_create/validate_on_update. Use Model.validate :method and likewise --- activerecord/test/models/company.rb | 9 ++++++--- activerecord/test/models/company_in_module.rb | 9 ++++++--- activerecord/test/models/reply.rb | 10 +++++++--- 3 files changed, 19 insertions(+), 9 deletions(-) (limited to 'activerecord/test/models') diff --git a/activerecord/test/models/company.rb b/activerecord/test/models/company.rb index 02a775f9ef..9c9d03dd5b 100644 --- a/activerecord/test/models/company.rb +++ b/activerecord/test/models/company.rb @@ -146,10 +146,13 @@ class Account < ActiveRecord::Base true end + validate :check_empty_credit_limit + protected - def validate - errors.add_on_empty "credit_limit" - end + + def check_empty_credit_limit + errors.add_on_empty "credit_limit" + end private diff --git a/activerecord/test/models/company_in_module.rb b/activerecord/test/models/company_in_module.rb index 7f02403d5a..1122c7256f 100644 --- a/activerecord/test/models/company_in_module.rb +++ b/activerecord/test/models/company_in_module.rb @@ -52,10 +52,13 @@ module MyApplication i.belongs_to :nested_unqualified_billing_firm, :class_name => 'Nested::Firm' end + validate :check_empty_credit_limit + protected - def validate - errors.add_on_empty "credit_limit" - end + + def check_empty_credit_limit + errors.add_on_empty "credit_limit" + end end end end diff --git a/activerecord/test/models/reply.rb b/activerecord/test/models/reply.rb index 55e7ccd22f..616c07687c 100644 --- a/activerecord/test/models/reply.rb +++ b/activerecord/test/models/reply.rb @@ -11,7 +11,11 @@ class Reply < Topic attr_accessible :title, :author_name, :author_email_address, :written_on, :content, :last_read - def validate + validate :check_empty_title + validate_on_create :check_content_mismatch + validate_on_update :check_wrong_update + + def check_empty_title errors[:title] << "Empty" unless attribute_present?("title") end @@ -19,7 +23,7 @@ class Reply < Topic errors[:content] << "Empty" unless attribute_present?("content") end - def validate_on_create + def check_content_mismatch if attribute_present?("title") && attribute_present?("content") && content == "Mismatch" errors[:title] << "is Content Mismatch" end @@ -29,7 +33,7 @@ class Reply < Topic errors[:title] << "is Wrong Create" if attribute_present?("title") && title == "Wrong Create" end - def validate_on_update + def check_wrong_update errors[:title] << "is Wrong Update" if attribute_present?("title") && title == "Wrong Update" end end -- cgit v1.2.3