Deprecate direct calls to AC::RecordIdentifier.dom_id and dom_class

Also add some generic tests to ensure they're properly deprecated.

1 files changed, 17 insertions, 5 deletions

diff --git a/actionpack/lib/action_controller/record_identifier.rb b/actionpack/lib/action_controller/record_identifier.rb
index 70e0a820c4..d598bac467 100644
--- a/actionpack/lib/action_controller/record_identifier.rb
+++ b/actionpack/lib/action_controller/record_identifier.rb
@@ -2,17 +2,29 @@ require 'action_view/record_identifier'
 
 module ActionController
   module RecordIdentifier
-    MESSAGE = 'method will no longer be included by default in controllers since Rails 4.1. ' +
-              'If you would like to use it in controllers, please include ' +
-              'ActionView::RecordIdentifier module.'
+    MODULE_MESSAGE = 'Calling ActionController::RecordIdentifier.%s is deprecated and ' \
+      'will be removed in Rails 4.1, please call using ActionView::RecordIdentifier instead.'
+    INSTANCE_MESSAGE = '%s method will no longer be included by default in controllers ' \
+      'since Rails 4.1. If you would like to use it in controllers, please include ' \
+      'ActionView::RecordIdentifier module.'
 
     def dom_id(record, prefix = nil)
-      ActiveSupport::Deprecation.warn('dom_id ' + MESSAGE)
+      ActiveSupport::Deprecation.warn(INSTANCE_MESSAGE % 'dom_id')
       ActionView::RecordIdentifier.dom_id(record, prefix)
     end
 
     def dom_class(record, prefix = nil)
-      ActiveSupport::Deprecation.warn('dom_class ' + MESSAGE)
+      ActiveSupport::Deprecation.warn(INSTANCE_MESSAGE % 'dom_class')
+      ActionView::RecordIdentifier.dom_class(record, prefix)
+    end
+
+    def self.dom_id(record, prefix = nil)
+      ActiveSupport::Deprecation.warn(MODULE_MESSAGE % 'dom_id')
+      ActionView::RecordIdentifier.dom_id(record, prefix)
+    end
+
+    def self.dom_class(record, prefix = nil)
+      ActiveSupport::Deprecation.warn(MODULE_MESSAGE % 'dom_class')
       ActionView::RecordIdentifier.dom_class(record, prefix)
     end
   end