aboutsummaryrefslogtreecommitdiffstats
path: root/activeresource/lib/active_resource.rb
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2009-03-19 23:45:08 +0000
committerPratik Naik <pratiknaik@gmail.com>2009-03-19 23:45:08 +0000
commit77acfefedf80a2c30f8a0f71b5b6d33d1b9fd144 (patch)
tree8ee169fa9dc6cd1dcc9e221e196dd0665234d78f /activeresource/lib/active_resource.rb
parent638333b7a17234ed65b2e8b0bee3d9b533446803 (diff)
downloadrails-77acfefedf80a2c30f8a0f71b5b6d33d1b9fd144.tar.gz
rails-77acfefedf80a2c30f8a0f71b5b6d33d1b9fd144.tar.bz2
rails-77acfefedf80a2c30f8a0f71b5b6d33d1b9fd144.zip
Make Active Resource use ActiveModel::Errors
Diffstat (limited to 'activeresource/lib/active_resource.rb')
-rw-r--r--activeresource/lib/active_resource.rb7
1 files changed, 7 insertions, 0 deletions
diff --git a/activeresource/lib/active_resource.rb b/activeresource/lib/active_resource.rb
index db9007060f..f0d30b1624 100644
--- a/activeresource/lib/active_resource.rb
+++ b/activeresource/lib/active_resource.rb
@@ -31,6 +31,13 @@ rescue LoadError
end
end
+begin
+ require 'active_model'
+rescue LoadError
+ $:.unshift "#{File.dirname(__FILE__)}/../../activemodel/lib"
+ require 'active_model'
+end
+
require 'active_resource/formats'
require 'active_resource/base'
require 'active_resource/validations'