From 4efad291c11a7c4fcf178fbb887b4845eaf61757 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Sat, 11 Aug 2012 16:52:12 +0200
Subject: [PATCH] Deprecate ActionController::RecordIdentifier

---
 actionpack/lib/action_controller.rb                   | 4 ++++
 actionpack/lib/action_controller/record_identifier.rb | 8 ++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 actionpack/lib/action_controller/record_identifier.rb

diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index 09029633fc..153e13f2db 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -46,6 +46,10 @@ module ActionController
   autoload :TestCase,           'action_controller/test_case'
   autoload :TemplateAssertions, 'action_controller/test_case'
 
+  eager_autoload do
+    autoload :RecordIdentifier
+  end
+
   def self.eager_load!
     super
     ActionController::Caching.eager_load!
diff --git a/actionpack/lib/action_controller/record_identifier.rb b/actionpack/lib/action_controller/record_identifier.rb
new file mode 100644
index 0000000000..7b6a5bb25c
--- /dev/null
+++ b/actionpack/lib/action_controller/record_identifier.rb
@@ -0,0 +1,8 @@
+require 'active_support/deprecation'
+require 'action_view/record_identifier'
+
+module ActionController
+  RecordIdentifier = ActionView::RecordIdentifier
+  ActiveSupport::Deprecation.warn "ActionController::RecordIdentifier was renamed to ActionView::RecordIdentifier. " +
+                                  "Please use it instead. ActionController::RecordIdentifier will be removed in Rails 4.1"
+end