aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel
diff options
context:
space:
mode:
authorrick <rick@spacemonkey.local>2008-04-23 12:14:59 -0700
committerrick <rick@spacemonkey.local>2008-04-23 12:14:59 -0700
commiteacb5cf0cab6447db78085c8bda6c94dd329ce6b (patch)
treedf4bc7789c4d1fe83085b725be0d1fe4a6223880 /activemodel
parent69d29e80f76079262f2e98e350592be1cfdfcd1e (diff)
parent6c1c16bfd9eb865dffa68c12c7df66d5a59a8714 (diff)
downloadrails-eacb5cf0cab6447db78085c8bda6c94dd329ce6b.tar.gz
rails-eacb5cf0cab6447db78085c8bda6c94dd329ce6b.tar.bz2
rails-eacb5cf0cab6447db78085c8bda6c94dd329ce6b.zip
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'activemodel')
-rw-r--r--activemodel/lib/active_model/validations.rb19
1 files changed, 1 insertions, 18 deletions
diff --git a/activemodel/lib/active_model/validations.rb b/activemodel/lib/active_model/validations.rb
index 503fb10795..b15bdb06ca 100644
--- a/activemodel/lib/active_model/validations.rb
+++ b/activemodel/lib/active_model/validations.rb
@@ -3,24 +3,7 @@ module ActiveModel
def self.included(base) # :nodoc:
base.extend(ClassMethods)
base.send!(:include, ActiveSupport::Callbacks)
-
- %w( validate validate_on_create validate_on_update ).each do |validation_method|
- base.class_eval <<-"end_eval"
- def self.#{validation_method}(*methods, &block)
- methods = CallbackChain.build(:#{validation_method}, *methods, &block)
- self.#{validation_method}_callback_chain.replace(#{validation_method}_callback_chain | methods)
- end
-
- def self.#{validation_method}_callback_chain
- if chain = read_inheritable_attribute(:#{validation_method})
- return chain
- else
- write_inheritable_attribute(:#{validation_method}, CallbackChain.new)
- return #{validation_method}_callback_chain
- end
- end
- end_eval
- end
+ base.define_callbacks :validate, :validate_on_create, :validate_on_update
end
module ClassMethods