From 1b446d06dddd2e14b4725eb896d046d4218941c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Strza=C5=82kowski?=
 <lukasz.strzalkowski@gmail.com>
Date: Tue, 25 Jun 2013 14:58:29 +0200
Subject: [PATCH] Move view_paths from AP to AV

---
 actionpack/lib/abstract_controller.rb                           | 1 -
 actionview/lib/action_view.rb                                   | 1 +
 .../lib/action_view}/view_paths.rb                              | 2 +-
 .../test/fixtures/override/test/hello_world.erb                 | 0
 .../test/fixtures/override2/layouts/test/sub.erb                | 0
 .../test => actionview/test/lib}/controller/view_paths_test.rb  | 0
 6 files changed, 2 insertions(+), 2 deletions(-)
 rename {actionpack/lib/abstract_controller => actionview/lib/action_view}/view_paths.rb (99%)
 rename {actionpack => actionview}/test/fixtures/override/test/hello_world.erb (100%)
 rename {actionpack => actionview}/test/fixtures/override2/layouts/test/sub.erb (100%)
 rename {actionpack/test => actionview/test/lib}/controller/view_paths_test.rb (100%)

diff --git a/actionpack/lib/abstract_controller.rb b/actionpack/lib/abstract_controller.rb
index 867a7954e0..ab311ec3bc 100644
--- a/actionpack/lib/abstract_controller.rb
+++ b/actionpack/lib/abstract_controller.rb
@@ -16,6 +16,5 @@ module AbstractController
   autoload :Rendering
   autoload :Translation
   autoload :AssetPaths
-  autoload :ViewPaths
   autoload :UrlFor
 end
diff --git a/actionview/lib/action_view.rb b/actionview/lib/action_view.rb
index 8def4ba7c5..7adf19cc7a 100644
--- a/actionview/lib/action_view.rb
+++ b/actionview/lib/action_view.rb
@@ -38,6 +38,7 @@ module ActionView
     autoload :RecordIdentifier
     autoload :RoutingUrlFor
     autoload :Template
+    autoload :ViewPaths
 
     autoload_under "renderer" do
       autoload :Renderer
diff --git a/actionpack/lib/abstract_controller/view_paths.rb b/actionview/lib/action_view/view_paths.rb
similarity index 99%
rename from actionpack/lib/abstract_controller/view_paths.rb
rename to actionview/lib/action_view/view_paths.rb
index c08b3a0e2a..6c349feb1d 100644
--- a/actionpack/lib/abstract_controller/view_paths.rb
+++ b/actionview/lib/action_view/view_paths.rb
@@ -1,6 +1,6 @@
 require 'action_view/base'
 
-module AbstractController
+module ActionView
   module ViewPaths
     extend ActiveSupport::Concern
 
diff --git a/actionpack/test/fixtures/override/test/hello_world.erb b/actionview/test/fixtures/override/test/hello_world.erb
similarity index 100%
rename from actionpack/test/fixtures/override/test/hello_world.erb
rename to actionview/test/fixtures/override/test/hello_world.erb
diff --git a/actionpack/test/fixtures/override2/layouts/test/sub.erb b/actionview/test/fixtures/override2/layouts/test/sub.erb
similarity index 100%
rename from actionpack/test/fixtures/override2/layouts/test/sub.erb
rename to actionview/test/fixtures/override2/layouts/test/sub.erb
diff --git a/actionpack/test/controller/view_paths_test.rb b/actionview/test/lib/controller/view_paths_test.rb
similarity index 100%
rename from actionpack/test/controller/view_paths_test.rb
rename to actionview/test/lib/controller/view_paths_test.rb