@@ -20,16 +20,16 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. require "rubygems" -gem "activesupport", "2.3.4" -gem "mongo", "0.15.1" -gem "durran-validatable", "1.7.5" +gem "activemodel" +gem "activesupport" +gem "mongo" gem "will_paginate", "2.3.11" require "delegate" require "observer" -require "validatable" require "active_support/callbacks" require "active_support/core_ext" +require "active_model/validations" require "will_paginate/collection" require "mongo" require "mongoid/associations" lib/mongoid.rb @@ -1,7 +1,8 @@ module Mongoid #:nodoc: class Document include ActiveSupport::Callbacks - include Commands, Observable, Validatable + include ActiveModel::Validations + include Commands, Observable extend Associations attr_accessor :association_name, :parent lib/mongoid/document.rb @@ -115,20 +115,20 @@ Gem::Specification.new do |s| s.specification_version = 3 if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then - s.add_runtime_dependency(%q<durran-validatable>, ["= 1.7.5"]) s.add_runtime_dependency(%q<will_paginate>, ["= 2.3.11"]) - s.add_runtime_dependency(%q<activesupport>, ["= 2.3.4"]) - s.add_runtime_dependency(%q<mongo>, ["= 0.15.1"]) + s.add_runtime_dependency(%q<activemodel>, [">= 3.0.pre"]) + s.add_runtime_dependency(%q<activesupport>, [">= 3.0.pre"]) + s.add_runtime_dependency(%q<mongo>, [">= 0.15.1"]) else - s.add_dependency(%q<durran-validatable>, ["= 1.7.5"]) s.add_dependency(%q<will_paginate>, ["= 2.3.11"]) - s.add_dependency(%q<activesupport>, ["= 2.3.4"]) - s.add_dependency(%q<mongo>, ["= 0.15.1"]) + s.add_runtime_dependency(%q<activemodel>, [">= 3.0.pre"]) + s.add_dependency(%q<activesupport>, [">= 3.0.pre"]) + s.add_dependency(%q<mongo>, ["= 0.16"]) end else - s.add_dependency(%q<durran-validatable>, ["= 1.7.5"]) s.add_dependency(%q<will_paginate>, ["= 2.3.11"]) - s.add_dependency(%q<activesupport>, ["= 2.3.4"]) - s.add_dependency(%q<mongo>, ["= 0.15.1"]) + s.add_runtime_dependency(%q<activemodel>, [">= 3.0.pre"]) + s.add_dependency(%q<activesupport>, [">= 3.0.pre"]) + s.add_dependency(%q<mongo>, ["= 0.16"]) end end mongoid.gemspec 2b572e9af8f3743b364e082434d193c2aecfa05e Nicolas Mérouze nicolas.merouze@gmail.com http://github.com/nmerouze/mongoid/commit/b3f482ba4bfde8bc3ea44c7dfb204b75e919a7d6 b3f482ba4bfde8bc3ea44c7dfb204b75e919a7d6 2009-10-28T10:49:48-07:00 2009-10-28T10:49:48-07:00 Add ActiveModel::Validations. 435adfcbc0badcea434c58699e2e118bfff64ef2 Nicolas Mérouze nicolas.merouze@gmail.com