diff options
| author | rick <technoweenie@gmail.com> | 2008-06-27 23:29:47 -0700 |
|---|---|---|
| committer | rick <technoweenie@gmail.com> | 2008-06-27 23:29:47 -0700 |
| commit | b7c6ceff9a31cc478c4bc89d57980900a775fbed (patch) | |
| tree | a37c0f18910e7c2d822e9158d9951cec48a5e8d4 /activemodel/lib/active_model.rb | |
| parent | aec3c7aa72c89e37edae4d14ac98d7a6de4a195c (diff) | |
| download | rails-b7c6ceff9a31cc478c4bc89d57980900a775fbed.tar.gz rails-b7c6ceff9a31cc478c4bc89d57980900a775fbed.tar.bz2 rails-b7c6ceff9a31cc478c4bc89d57980900a775fbed.zip | |
tweak activemodel load order a bit
Diffstat (limited to 'activemodel/lib/active_model.rb')
| -rw-r--r-- | activemodel/lib/active_model.rb | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/activemodel/lib/active_model.rb b/activemodel/lib/active_model.rb index 369c7fed33..4ed7b0889d 100644 --- a/activemodel/lib/active_model.rb +++ b/activemodel/lib/active_model.rb @@ -1,17 +1,5 @@ -$LOAD_PATH << File.join(File.dirname(__FILE__), '..', '..', 'activesupport', 'lib') - -# premature optimization? -require 'active_support/inflector' -require 'active_support/core_ext/string/inflections' -String.send :include, ActiveSupport::CoreExtensions::String::Inflections - -require 'active_model/base' require 'active_model/observing' -require 'active_model/callbacks' -require 'active_model/validations' - -ActiveModel::Base.class_eval do - include ActiveModel::Observing - include ActiveModel::Callbacks - include ActiveModel::Validations -end
\ No newline at end of file +# disabled until they're tested +# require 'active_model/callbacks' +# require 'active_model/validations' +require 'active_model/base'
\ No newline at end of file |