From 83e4f33ea1f39f1e72b7017641f186756206c14f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Mon, 2 Dec 2013 20:25:20 -0200
Subject: Make ActionView::Tags loading tread safe

---
 actionview/lib/action_view.rb                     |  1 +
 actionview/lib/action_view/helpers.rb             |  6 +++
 actionview/lib/action_view/helpers/form_helper.rb |  1 -
 actionview/lib/action_view/helpers/tags.rb        | 64 ++++++++++++-----------
 4 files changed, 40 insertions(+), 32 deletions(-)

(limited to 'actionview')

diff --git a/actionview/lib/action_view.rb b/actionview/lib/action_view.rb
index 39c0c6c856..810d82e89b 100644
--- a/actionview/lib/action_view.rb
+++ b/actionview/lib/action_view.rb
@@ -84,6 +84,7 @@ module ActionView
 
   def self.eager_load!
     super
+    ActionView::Helpers.eager_load!
     ActionView::Template.eager_load!
     HTML.eager_load!
   end
diff --git a/actionview/lib/action_view/helpers.rb b/actionview/lib/action_view/helpers.rb
index 8a78685ae1..787e9d67b2 100644
--- a/actionview/lib/action_view/helpers.rb
+++ b/actionview/lib/action_view/helpers.rb
@@ -27,6 +27,12 @@ module ActionView #:nodoc:
     autoload :TextHelper
     autoload :TranslationHelper
     autoload :UrlHelper
+    autoload :Tags
+
+    def self.eager_load!
+      super
+      Tags.eager_load!
+    end
 
     extend ActiveSupport::Concern
 
diff --git a/actionview/lib/action_view/helpers/form_helper.rb b/actionview/lib/action_view/helpers/form_helper.rb
index 38d969ed0c..e672891f7b 100644
--- a/actionview/lib/action_view/helpers/form_helper.rb
+++ b/actionview/lib/action_view/helpers/form_helper.rb
@@ -3,7 +3,6 @@ require 'action_view/helpers/date_helper'
 require 'action_view/helpers/tag_helper'
 require 'action_view/helpers/form_tag_helper'
 require 'action_view/helpers/active_model_helper'
-require 'action_view/helpers/tags'
 require 'action_view/model_naming'
 require 'active_support/core_ext/class/attribute_accessors'
 require 'active_support/core_ext/hash/slice'
diff --git a/actionview/lib/action_view/helpers/tags.rb b/actionview/lib/action_view/helpers/tags.rb
index a05e16979a..45c75d10c0 100644
--- a/actionview/lib/action_view/helpers/tags.rb
+++ b/actionview/lib/action_view/helpers/tags.rb
@@ -3,37 +3,39 @@ module ActionView
     module Tags #:nodoc:
       extend ActiveSupport::Autoload
 
-      autoload :Base
-      autoload :CheckBox
-      autoload :CollectionCheckBoxes
-      autoload :CollectionRadioButtons
-      autoload :CollectionSelect
-      autoload :ColorField
-      autoload :DateField
-      autoload :DateSelect
-      autoload :DatetimeField
-      autoload :DatetimeLocalField
-      autoload :DatetimeSelect
-      autoload :EmailField
-      autoload :FileField
-      autoload :GroupedCollectionSelect
-      autoload :HiddenField
-      autoload :Label
-      autoload :MonthField
-      autoload :NumberField
-      autoload :PasswordField
-      autoload :RadioButton
-      autoload :RangeField
-      autoload :SearchField
-      autoload :Select
-      autoload :TelField
-      autoload :TextArea
-      autoload :TextField
-      autoload :TimeField
-      autoload :TimeSelect
-      autoload :TimeZoneSelect
-      autoload :UrlField
-      autoload :WeekField
+      eager_autoload do
+        autoload :Base
+        autoload :CheckBox
+        autoload :CollectionCheckBoxes
+        autoload :CollectionRadioButtons
+        autoload :CollectionSelect
+        autoload :ColorField
+        autoload :DateField
+        autoload :DateSelect
+        autoload :DatetimeField
+        autoload :DatetimeLocalField
+        autoload :DatetimeSelect
+        autoload :EmailField
+        autoload :FileField
+        autoload :GroupedCollectionSelect
+        autoload :HiddenField
+        autoload :Label
+        autoload :MonthField
+        autoload :NumberField
+        autoload :PasswordField
+        autoload :RadioButton
+        autoload :RangeField
+        autoload :SearchField
+        autoload :Select
+        autoload :TelField
+        autoload :TextArea
+        autoload :TextField
+        autoload :TimeField
+        autoload :TimeSelect
+        autoload :TimeZoneSelect
+        autoload :UrlField
+        autoload :WeekField
+      end
     end
   end
 end
-- 
cgit v1.2.3