Rename AV::Helpers::AssetPaths to AV::AssetPaths to solve autoload mess.

4 files changed, 84 insertions, 81 deletions

diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb
index 78eddb7530..d7229419a9 100644
--- a/actionpack/lib/action_view.rb
+++ b/actionpack/lib/action_view.rb
@@ -30,6 +30,7 @@ module ActionView
   extend ActiveSupport::Autoload
 
   eager_autoload do
+    autoload :AssetPaths
     autoload :Base
     autoload :Context
     autoload :Helpers
diff --git a/actionpack/lib/action_view/asset_paths.rb b/actionpack/lib/action_view/asset_paths.rb
new file mode 100644
index 0000000000..2b1fe545a6
--- /dev/null
+++ b/actionpack/lib/action_view/asset_paths.rb
@@ -0,0 +1,79 @@
+require 'active_support/core_ext/file'
+
+module ActionView
+  class AssetPaths #:nodoc:
+    attr_reader :config, :controller
+
+    def initialize(config, controller)
+      @config = config
+      @controller = controller
+    end
+
+    # Add the extension +ext+ if not present. Return full or scheme-relative URLs otherwise untouched.
+    # Prefix with <tt>/dir/</tt> if lacking a leading +/+. Account for relative URL
+    # roots. Rewrite the asset path for cache-busting asset ids. Include
+    # asset host, if configured, with the correct request protocol.
+    def compute_public_path(source, dir, ext = nil, include_host = true)
+      source = source.to_s
+      return source if is_uri?(source)
+
+      source = rewrite_extension(source, dir, ext) if ext
+      source = rewrite_asset_path(source, dir)
+
+      if controller && include_host
+        has_request = controller.respond_to?(:request)
+        source = rewrite_host_and_protocol(source, has_request)
+      end
+
+      source
+    end
+
+    def is_uri?(path)
+      path =~ %r{^[-a-z]+://|^cid:|^//}
+    end
+
+  private
+
+    def rewrite_extension(source, dir, ext)
+      raise NotImplementedError
+    end
+
+    def rewrite_asset_path(source, path = nil)
+      raise NotImplementedError
+    end
+
+    def rewrite_relative_url_root(source, relative_url_root)
+      relative_url_root && !source.starts_with?("#{relative_url_root}/") ? "#{relative_url_root}#{source}" : source
+    end
+
+    def rewrite_host_and_protocol(source, has_request)
+      source = rewrite_relative_url_root(source, controller.config.relative_url_root) if has_request
+      host = compute_asset_host(source)
+      if has_request && host && !is_uri?(host)
+        host = "#{controller.request.protocol}#{host}"
+      end
+      "#{host}#{source}"
+    end
+
+    # Pick an asset host for this source. Returns +nil+ if no host is set,
+    # the host if no wildcard is set, the host interpolated with the
+    # numbers 0-3 if it contains <tt>%d</tt> (the number is the source hash mod 4),
+    # or the value returned from invoking call on an object responding to call
+    # (proc or otherwise).
+    def compute_asset_host(source)
+      if host = config.asset_host
+        if host.respond_to?(:call)
+          case host.is_a?(Proc) ? host.arity : host.method(:call).arity
+          when 2
+            request = controller.respond_to?(:request) && controller.request
+            host.call(source, request)
+          else
+            host.call(source)
+          end
+        else
+          (host =~ /%d/) ? host % (source.hash % 4) : host
+        end
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_view/helpers/asset_paths.rb b/actionpack/lib/action_view/helpers/asset_paths.rb
index 9a99c3cf52..fae2e4fc1c 100644
--- a/actionpack/lib/action_view/helpers/asset_paths.rb
+++ b/actionpack/lib/action_view/helpers/asset_paths.rb
@@ -1,83 +1,7 @@
-require 'active_support/core_ext/file'
+ActiveSupport::Deprecation.warn "ActionView::Helpers::AssetPaths is deprecated. Please use ActionView::AssetPaths instead."
 
 module ActionView
   module Helpers
-
-    class AssetPaths #:nodoc:
-      attr_reader :config, :controller
-
-      def initialize(config, controller)
-        @config = config
-        @controller = controller
-      end
-
-      # Add the extension +ext+ if not present. Return full or scheme-relative URLs otherwise untouched.
-      # Prefix with <tt>/dir/</tt> if lacking a leading +/+. Account for relative URL
-      # roots. Rewrite the asset path for cache-busting asset ids. Include
-      # asset host, if configured, with the correct request protocol.
-      def compute_public_path(source, dir, ext = nil, include_host = true)
-        source = source.to_s
-        return source if is_uri?(source)
-
-        source = rewrite_extension(source, dir, ext) if ext
-        source = rewrite_asset_path(source, dir)
-
-        if controller && include_host
-          has_request = controller.respond_to?(:request)
-          source = rewrite_host_and_protocol(source, has_request)
-        end
-
-        source
-      end
-
-      def is_uri?(path)
-        path =~ %r{^[-a-z]+://|^cid:|^//}
-      end
-
-    private
-
-      def rewrite_extension(source, dir, ext)
-        raise NotImplementedError
-      end
-
-      def rewrite_asset_path(source, path = nil)
-        raise NotImplementedError
-      end
-
-      def rewrite_relative_url_root(source, relative_url_root)
-        relative_url_root && !source.starts_with?("#{relative_url_root}/") ? "#{relative_url_root}#{source}" : source
-      end
-
-      def rewrite_host_and_protocol(source, has_request)
-        source = rewrite_relative_url_root(source, controller.config.relative_url_root) if has_request
-        host = compute_asset_host(source)
-        if has_request && host && !is_uri?(host)
-          host = "#{controller.request.protocol}#{host}"
-        end
-        "#{host}#{source}"
-      end
-
-      # Pick an asset host for this source. Returns +nil+ if no host is set,
-      # the host if no wildcard is set, the host interpolated with the
-      # numbers 0-3 if it contains <tt>%d</tt> (the number is the source hash mod 4),
-      # or the value returned from invoking call on an object responding to call
-      # (proc or otherwise).
-      def compute_asset_host(source)
-        if host = config.asset_host
-          if host.respond_to?(:call)
-            case host.is_a?(Proc) ? host.arity : host.method(:call).arity
-            when 2
-              request = controller.respond_to?(:request) && controller.request
-              host.call(source, request)
-            else
-              host.call(source)
-            end
-          else
-            (host =~ /%d/) ? host % (source.hash % 4) : host
-          end
-        end
-      end
-    end
-
+    AssetPaths = ::ActionView::AssetPaths
   end
-end
+end
\ No newline at end of file
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helpers/asset_paths.rb b/actionpack/lib/action_view/helpers/asset_tag_helpers/asset_paths.rb
index 2d49823412..12a304b395 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helpers/asset_paths.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helpers/asset_paths.rb
@@ -1,11 +1,10 @@
 require 'active_support/core_ext/file'
-require 'action_view/helpers/asset_paths'
 
 module ActionView
   module Helpers
     module AssetTagHelper
 
-      class AssetPaths < ActionView::Helpers::AssetPaths #:nodoc:
+      class AssetPaths < ::ActionView::AssetPaths #:nodoc:
         # You can enable or disable the asset tag ids cache.
         # With the cache enabled, the asset tag helper methods will make fewer
         # expensive file system calls (the default implementation checks the file