From c565f0060aab85db60390220679c5df419998f9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 21 Jul 2010 11:46:38 +0200
Subject: No need to delegate. Simply include the whole RecordIdentifier
 module.

---
 actionpack/lib/abstract_controller.rb              |  1 +
 .../lib/action_controller/record_identifier.rb     |  2 ++
 actionpack/lib/action_dispatch.rb                  |  2 ++
 actionpack/lib/action_view.rb                      |  1 +
 actionpack/lib/action_view/helpers.rb              |  2 --
 .../helpers/record_identification_helper.rb        | 23 ----------------------
 .../lib/action_view/helpers/record_tag_helper.rb   |  4 ++++
 7 files changed, 10 insertions(+), 25 deletions(-)
 delete mode 100644 actionpack/lib/action_view/helpers/record_identification_helper.rb

(limited to 'actionpack')

diff --git a/actionpack/lib/abstract_controller.rb b/actionpack/lib/abstract_controller.rb
index 5990a1bbd0..c565c940a1 100644
--- a/actionpack/lib/abstract_controller.rb
+++ b/actionpack/lib/abstract_controller.rb
@@ -1,6 +1,7 @@
 activesupport_path = File.expand_path('../../../activesupport/lib', __FILE__)
 $:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.include?(activesupport_path)
 
+require 'action_pack'
 require 'active_support/ruby/shim'
 require 'active_support/dependencies/autoload'
 require 'active_support/core_ext/class/attribute'
diff --git a/actionpack/lib/action_controller/record_identifier.rb b/actionpack/lib/action_controller/record_identifier.rb
index 975b03c0c9..3de40b0de3 100644
--- a/actionpack/lib/action_controller/record_identifier.rb
+++ b/actionpack/lib/action_controller/record_identifier.rb
@@ -67,6 +67,8 @@ module ActionController
       end
     end
 
+  protected
+
     # Returns a string representation of the key attribute(s) that is suitable for use in an HTML DOM id.
     # This can be overwritten to customize the default generated string representation if desired.
     # If you need to read back a key from a dom_id in order to query for the underlying database record,
diff --git a/actionpack/lib/action_dispatch.rb b/actionpack/lib/action_dispatch.rb
index 1da4a0d4be..9bb0471ffc 100644
--- a/actionpack/lib/action_dispatch.rb
+++ b/actionpack/lib/action_dispatch.rb
@@ -27,6 +27,8 @@ $:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.inc
 require 'active_support'
 require 'active_support/dependencies/autoload'
 
+require 'action_pack'
+require 'active_model'
 require 'rack'
 
 module Rack
diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb
index 9f56cca869..c0d7423682 100644
--- a/actionpack/lib/action_view.rb
+++ b/actionpack/lib/action_view.rb
@@ -23,6 +23,7 @@
 
 activesupport_path = File.expand_path('../../../activesupport/lib', __FILE__)
 $:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.include?(activesupport_path)
+
 require 'active_support/ruby/shim'
 require 'active_support/core_ext/class/attribute_accessors'
 
diff --git a/actionpack/lib/action_view/helpers.rb b/actionpack/lib/action_view/helpers.rb
index ba3bdd0d18..b7ffa345cc 100644
--- a/actionpack/lib/action_view/helpers.rb
+++ b/actionpack/lib/action_view/helpers.rb
@@ -20,7 +20,6 @@ module ActionView #:nodoc:
     autoload :NumberHelper
     autoload :PrototypeHelper
     autoload :RawOutputHelper
-    autoload :RecordIdentificationHelper
     autoload :RecordTagHelper
     autoload :SanitizeHelper
     autoload :ScriptaculousHelper
@@ -51,7 +50,6 @@ module ActionView #:nodoc:
     include NumberHelper
     include PrototypeHelper
     include RawOutputHelper
-    include RecordIdentificationHelper
     include RecordTagHelper
     include SanitizeHelper
     include ScriptaculousHelper
diff --git a/actionpack/lib/action_view/helpers/record_identification_helper.rb b/actionpack/lib/action_view/helpers/record_identification_helper.rb
deleted file mode 100644
index eea5de9bc6..0000000000
--- a/actionpack/lib/action_view/helpers/record_identification_helper.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-module ActionView
-  # = Action View Record Identification Helpers
-  #
-  # See ActionController::RecordIdentifier for documentation on these methods.
-  module Helpers
-    module RecordIdentificationHelper
-      # See ActionController::RecordIdentifier.partial_path -- this is just a delegate to that for convenient access in the view.
-      def partial_path(*args, &block)
-        ActionController::RecordIdentifier.partial_path(*args, &block)
-      end
-
-      # See ActionController::RecordIdentifier.dom_class -- this is just a delegate to that for convenient access in the view.
-      def dom_class(*args, &block)
-        ActionController::RecordIdentifier.dom_class(*args, &block)
-      end
-
-      # See ActionController::RecordIdentifier.dom_id -- this is just a delegate to that for convenient access in the view.
-      def dom_id(*args, &block)
-        ActionController::RecordIdentifier.dom_id(*args, &block)
-      end
-    end
-  end
-end
diff --git a/actionpack/lib/action_view/helpers/record_tag_helper.rb b/actionpack/lib/action_view/helpers/record_tag_helper.rb
index 7433f08777..e4a9210cde 100644
--- a/actionpack/lib/action_view/helpers/record_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/record_tag_helper.rb
@@ -1,7 +1,11 @@
+require 'action_controller/record_identifier'
+
 module ActionView
   # = Action View Record Tag Helpers
   module Helpers
     module RecordTagHelper
+      include ActionController::RecordIdentifier
+
       # Produces a wrapper DIV element with id and class parameters that
       # relate to the specified Active Record object. Usage example:
       #
-- 
cgit v1.2.3