From 9d9b22f47a1928bf2fde3b7b574e3d8d4b1cca92 Mon Sep 17 00:00:00 2001
From: Andrew White <andyw@pixeltrix.co.uk>
Date: Tue, 19 Feb 2013 07:22:37 +0000
Subject: Revert "Deprecate the `eager_load_paths` configuration"

Because of the possibility of lib being unintentionally eager loaded
it's been agreed that we'll leave autoload paths and eager load paths
separate for Rails 4.0.

This reverts commit 0757b3388ffe4f44b60de950d40e18ef05055931.

Conflicts:
	railties/CHANGELOG.md
---
 railties/lib/rails/paths.rb | 44 ++++++++++++--------------------------------
 1 file changed, 12 insertions(+), 32 deletions(-)

(limited to 'railties/lib/rails/paths.rb')

diff --git a/railties/lib/rails/paths.rb b/railties/lib/rails/paths.rb
index 80ba144441..de6795eda2 100644
--- a/railties/lib/rails/paths.rb
+++ b/railties/lib/rails/paths.rb
@@ -5,13 +5,13 @@ module Rails
     # paths by a Hash like API. It requires you to give a physical path on initialization.
     #
     #   root = Root.new "/rails"
-    #   root.add "app/controllers", autoload: true
+    #   root.add "app/controllers", eager_load: true
     #
     # The command above creates a new root object and add "app/controllers" as a path.
     # This means we can get a <tt>Rails::Paths::Path</tt> object back like below:
     #
     #   path = root["app/controllers"]
-    #   path.autoload?                 # => true
+    #   path.eager_load?               # => true
     #   path.is_a?(Rails::Paths::Path) # => true
     #
     # The +Path+ object is simply an enumerable and allows you to easily add extra paths:
@@ -30,7 +30,7 @@ module Rails
     #   root["config/routes"].inspect # => ["config/routes.rb"]
     #
     # The +add+ method accepts the following options as arguments:
-    # autoload, autoload_once and glob.
+    # eager_load, autoload, autoload_once and glob.
     #
     # Finally, the +Path+ object also provides a few helpers:
     #
@@ -85,8 +85,7 @@ module Rails
       end
 
       def eager_load
-        ActiveSupport::Deprecation.warn "eager_load is deprecated and all autoload_paths are now eagerly loaded."
-        filter_by(:autoload?)
+        filter_by(:eager_load?)
       end
 
       def autoload_paths
@@ -125,13 +124,9 @@ module Rails
         @glob     = options[:glob]
 
         options[:autoload_once] ? autoload_once! : skip_autoload_once!
+        options[:eager_load]    ? eager_load!    : skip_eager_load!
         options[:autoload]      ? autoload!      : skip_autoload!
         options[:load_path]     ? load_path!     : skip_load_path!
-
-        if !options.key?(:autoload) && options.key?(:eager_load)
-          ActiveSupport::Deprecation.warn "the :eager_load option is deprecated and all :autoload paths are now eagerly loaded."
-          options[:eager_load] ? autoload! : skip_autoload!
-        end
       end
 
       def children
@@ -148,37 +143,22 @@ module Rails
         expanded.last
       end
 
-      %w(autoload_once autoload load_path).each do |m|
+      %w(autoload_once eager_load autoload load_path).each do |m|
         class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def #{m}!        # def autoload!
-            @#{m} = true   #   @autoload = true
+          def #{m}!        # def eager_load!
+            @#{m} = true   #   @eager_load = true
           end              # end
                            #
-          def skip_#{m}!   # def skip_autoload!
-            @#{m} = false  #   @autoload = false
+          def skip_#{m}!   # def skip_eager_load!
+            @#{m} = false  #   @eager_load = false
           end              # end
                            #
-          def #{m}?        # def autoload?
-            @#{m}          #   @autoload
+          def #{m}?        # def eager_load?
+            @#{m}          #   @eager_load
           end              # end
         RUBY
       end
 
-      def eager_load!
-        ActiveSupport::Deprecation.warn "eager_load paths are deprecated and all autoload paths are now eagerly loaded."
-        autoload!
-      end
-
-      def skip_eager_load!
-        ActiveSupport::Deprecation.warn "eager_load paths are deprecated and all autoload paths are now eagerly loaded."
-        skip_autoload!
-      end
-
-      def eager_load?
-        ActiveSupport::Deprecation.warn "eager_load paths are deprecated and all autoload paths are now eagerly loaded."
-        autoload?
-      end
-
       def each(&block)
         @paths.each(&block)
       end
-- 
cgit v1.2.3