diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2004-12-09 12:50:18 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2004-12-09 12:50:18 +0000 |
commit | fc817eff447a268ce245a48369e7bd90d8f7f31f (patch) | |
tree | f0989d8b3858eb8b21da83b2eff8277c9dc3fdd1 /activerecord/lib/active_record | |
parent | 586aa2f2b7b7bfe1476fd9093c9a283a6e693db1 (diff) | |
download | rails-fc817eff447a268ce245a48369e7bd90d8f7f31f.tar.gz rails-fc817eff447a268ce245a48369e7bd90d8f7f31f.tar.bz2 rails-fc817eff447a268ce245a48369e7bd90d8f7f31f.zip |
Added validation macros to make the stackable just like the lifecycle callbacks
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@94 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record')
-rwxr-xr-x | activerecord/lib/active_record/validations.rb | 47 |
1 files changed, 46 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/validations.rb b/activerecord/lib/active_record/validations.rb index 07bc7b99b5..14e79cf68b 100755 --- a/activerecord/lib/active_record/validations.rb +++ b/activerecord/lib/active_record/validations.rb @@ -37,6 +37,8 @@ module ActiveRecord # # An +Errors+ object is automatically created for every Active Record. module Validations + VALIDATIONS = %w( validate validate_on_create validate_on_create ) + def self.append_features(base) # :nodoc: super @@ -46,6 +48,8 @@ module ActiveRecord alias_method :update_attribute_without_validation_skipping, :update_attribute alias_method :update_attribute, :update_attribute_with_validation_skipping + + VALIDATIONS.each { |vd| base.class_eval("def self.#{vd}(*methods) write_inheritable_array(\"#{vd}\", methods - (read_inheritable_attribute(\"#{vd}\") || [])) end") } end end @@ -66,8 +70,18 @@ module ActiveRecord # Runs validate and validate_on_create or validate_on_update and returns true if no errors were added otherwise false. def valid? errors.clear + + run_validations(:validate) validate - if new_record? then validate_on_create else validate_on_update end + + if new_record? + run_validations(:validate_on_create) + validate_on_create + else + run_validations(:validate_on_update) + validate_on_update + end + errors.empty? end @@ -89,6 +103,37 @@ module ActiveRecord # Overwrite this method for validation checks used only on updates. def validate_on_update # :doc: end + + private + def run_validations(validation_method) + validations = self.class.read_inheritable_attribute(validation_method.to_s) + if validations.nil? then return end + validations.each do |validation| + if Symbol === validation + self.send(validation) + elsif String === validation + eval(validation, binding) + elsif validation_block?(validation) + validation.call(self) + elsif filter_class?(validation, validation_method) + validation.send(validation_method, self) + else + raise( + ActiveRecordError, + "Validations need to be either a symbol, string (to be eval'ed), proc/method, or " + + "class implementing a static validation method" + ) + end + end + end + + def validation_block?(validation) + validation.respond_to?("call") && (validation.arity == 1 || validation.arity == -1) + end + + def validation_class?(validation, validation_method) + validation.respond_to?(validation_method) + end end # Active Record validation is reported to and from this object, which is used by Base#save to |