From ae5a133969ff9d5e3fb65342972c2d3ec2053451 Mon Sep 17 00:00:00 2001
From: chrisrhoden <carhoden@gmail.com>
Date: Wed, 6 Oct 2010 15:03:50 -0400
Subject: [PATCH] Clearing Deprecation Notices:

DEPRECATION WARNING: require "activerecord" is deprecated and will be removed
in Rails 3. Use require "active_record" instead. (called from <top (required)>
at gems/activerecord-2.3.9/lib/activerecord.rb:2)

DEPRECATION WARNING: ActiveSupport::Dependencies.load_paths is deprecated,
please use autoload_paths instead. (called from block in <top (required)> at
apn_on_rails/lib/apn_on_rails/apn_on_rails.rb:61)

DEPRECATION WARNING: ActiveSupport::Dependencies.load_once_paths is deprecated
and removed in Rails 3, please use autoload_once_paths instead. (called from
block in <top (required)> at apn_on_rails/lib/apn_on_rails/apn_on_rails.rb:62)
---
 Gemfile                          |  2 +-
 lib/apn_on_rails/apn_on_rails.rb | 11 ++++++++---
 spec/active_record/setup_ar.rb   |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index d73a60f5..6ba6bba0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -14,5 +14,5 @@ group :development do
   gem "jeweler", "~> 1.5.0.pre2"
   gem "rcov", ">= 0"
   gem "actionpack", '~> 2.3.8'
-  gem 'activerecord', "~> 2.3.8"
+  gem 'activerecord', "~> 2.3.8", :require => 'active_record'
 end
diff --git a/lib/apn_on_rails/apn_on_rails.rb b/lib/apn_on_rails/apn_on_rails.rb
index 959af560..f3e8ee11 100644
--- a/lib/apn_on_rails/apn_on_rails.rb
+++ b/lib/apn_on_rails/apn_on_rails.rb
@@ -57,9 +57,14 @@ def initialize(message) # :nodoc:
   path = File.join(File.dirname(__FILE__), 'app', dir)
   $LOAD_PATH << path 
   # puts "Adding #{path}"
-  begin 
-  ActiveSupport::Dependencies.load_paths << path 
-  ActiveSupport::Dependencies.load_once_paths.delete(path) 
+  begin
+    if ActiveSupport::Dependencies.respond_to? :autoload_paths
+      ActiveSupport::Dependencies.autoload_paths << path
+      ActiveSupport::Dependencies.autoload_once_paths.delete(path)
+    else
+      ActiveSupport::Dependencies.load_paths << path 
+      ActiveSupport::Dependencies.load_once_paths.delete(path) 
+    end
   rescue NameError
     Dependencies.load_paths << path 
     Dependencies.load_once_paths.delete(path) 
diff --git a/spec/active_record/setup_ar.rb b/spec/active_record/setup_ar.rb
index 38f2d6fc..22998cb2 100644
--- a/spec/active_record/setup_ar.rb
+++ b/spec/active_record/setup_ar.rb
@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'activerecord'
+require 'active_record'
 
 logger = Logger.new(STDOUT)
 logger.level = Logger::INFO