diff options
author | Pratik Naik <pratiknaik@gmail.com> | 2009-03-19 23:36:08 +0000 |
---|---|---|
committer | Pratik Naik <pratiknaik@gmail.com> | 2009-03-19 23:44:30 +0000 |
commit | 638333b7a17234ed65b2e8b0bee3d9b533446803 (patch) | |
tree | faaf6282b5aa6d6f88f885aded40404f6392e4f1 | |
parent | 8828b2ca674acfa028a3c1e086a1795d3bb893e1 (diff) | |
download | rails-638333b7a17234ed65b2e8b0bee3d9b533446803.tar.gz rails-638333b7a17234ed65b2e8b0bee3d9b533446803.tar.bz2 rails-638333b7a17234ed65b2e8b0bee3d9b533446803.zip |
Move uniqueness and association validations to Active Record
-rw-r--r-- | activerecord/lib/active_record/validations.rb | 5 | ||||
-rw-r--r-- | activerecord/lib/active_record/validations/associated.rb (renamed from activemodel/lib/active_model/validations/associated.rb) | 2 | ||||
-rw-r--r-- | activerecord/lib/active_record/validations/uniqueness.rb (renamed from activemodel/lib/active_model/validations/uniqueness.rb) | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/validations.rb b/activerecord/lib/active_record/validations.rb index a7043516a7..c6a950d093 100644 --- a/activerecord/lib/active_record/validations.rb +++ b/activerecord/lib/active_record/validations.rb @@ -65,3 +65,8 @@ module ActiveRecord end end end + +Dir[File.dirname(__FILE__) + "/validations/*.rb"].sort.each do |path| + filename = File.basename(path) + require "active_record/validations/#{filename}" +end diff --git a/activemodel/lib/active_model/validations/associated.rb b/activerecord/lib/active_record/validations/associated.rb index ba4af5d66d..1d7df6b771 100644 --- a/activemodel/lib/active_model/validations/associated.rb +++ b/activerecord/lib/active_record/validations/associated.rb @@ -1,4 +1,4 @@ -module ActiveModel +module ActiveRecord module Validations module ClassMethods # Validates whether the associated object or objects are all valid themselves. Works with any kind of association. diff --git a/activemodel/lib/active_model/validations/uniqueness.rb b/activerecord/lib/active_record/validations/uniqueness.rb index 37beac863f..edec4e9e43 100644 --- a/activemodel/lib/active_model/validations/uniqueness.rb +++ b/activerecord/lib/active_record/validations/uniqueness.rb @@ -1,4 +1,4 @@ -module ActiveModel +module ActiveRecord module Validations module ClassMethods # Validates whether the value of the specified attributes are unique across the system. Useful for making sure that only one user |