all tests pass

9 files changed, 40 insertions, 40 deletions

diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index 92ff3380b0..95eb3446da 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -232,8 +232,8 @@ module ActionView #:nodoc:
       @controller_path ||= controller && controller.controller_path
     end
 
-    def controller_prefix
-      @controller_prefix ||= controller && controller._prefix
+    def controller_prefixes
+      @controller_prefixes ||= controller && controller._prefixes
     end
 
     ActiveSupport.run_load_hooks(:action_view, self)
diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
index 14cccd88f0..0d7f15e564 100644
--- a/actionpack/lib/action_view/lookup_context.rb
+++ b/actionpack/lib/action_view/lookup_context.rb
@@ -119,7 +119,7 @@ module ActionView
         name  = name.to_s.gsub(handlers_regexp, '')
         parts = name.split('/')
         name  = parts.pop
-        prx = if not prefixes or prefixes.empty?
+        prx = if prefixes.blank?
                 [parts.compact.join('/')]
               else
                 prefixes.map {|prefix| [prefix, *parts].compact.join('/') }
diff --git a/actionpack/lib/action_view/renderer/partial_renderer.rb b/actionpack/lib/action_view/renderer/partial_renderer.rb
index e83f7be610..f36b0602b1 100644
--- a/actionpack/lib/action_view/renderer/partial_renderer.rb
+++ b/actionpack/lib/action_view/renderer/partial_renderer.rb
@@ -152,7 +152,7 @@ module ActionView
         object = object.to_model if object.respond_to?(:to_model)
 
         object.class.model_name.partial_path.dup.tap do |partial|
-          path = @view.controller_prefix
+          path = @view.controller_prefixes.first
           partial.insert(0, "#{File.dirname(path)}/") if partial.include?(?/) && path.include?(?/)
         end
       end
diff --git a/actionpack/lib/action_view/renderer/template_renderer.rb b/actionpack/lib/action_view/renderer/template_renderer.rb
index 4a0bc503d3..938bb2a3f3 100644
--- a/actionpack/lib/action_view/renderer/template_renderer.rb
+++ b/actionpack/lib/action_view/renderer/template_renderer.rb
@@ -22,14 +22,14 @@ module ActionView
     def render_once(options)
       paths, locals = options[:once], options[:locals] || {}
       layout, keys  = options[:layout], locals.keys
-      prefix = options.fetch(:prefix, @view.controller_prefix)
+      prefixes = options.fetch(:prefixes, @view.controller_prefixes)
 
       raise "render :once expects a String or an Array to be given" unless paths
 
       render_with_layout(layout, locals) do
         contents = []
         Array.wrap(paths).each do |path|
-          template = find_template(path, prefix, false, keys)
+          template = find_template(path, prefixes, false, keys)
           contents << render_template(template, nil, locals) if @rendered.add?(template)
         end
         contents.join("\n")
diff --git a/actionpack/lib/action_view/template.rb b/actionpack/lib/action_view/template.rb
index 0d8373ef14..80543a8b77 100644
--- a/actionpack/lib/action_view/template.rb
+++ b/actionpack/lib/action_view/template.rb
@@ -163,7 +163,7 @@ module ActionView
       name    = pieces.pop
       partial = !!name.sub!(/^_/, "")
       lookup.disable_cache do
-        lookup.find_template(name, pieces.join('/'), partial, @locals)
+        lookup.find_template(name, [ pieces.join('/') ], partial, @locals)
       end
     end
 
diff --git a/actionpack/test/controller/new_base/render_once_test.rb b/actionpack/test/controller/new_base/render_once_test.rb
index 3035ed4ff2..175abf8a7e 100644
--- a/actionpack/test/controller/new_base/render_once_test.rb
+++ b/actionpack/test/controller/new_base/render_once_test.rb
@@ -18,8 +18,8 @@ module RenderTemplate
 
     self.view_paths = [RESOLVER]
 
-    def _prefix
-      "test"
+    def _prefixes
+      %w(test)
     end
 
     def multiple
@@ -39,11 +39,11 @@ module RenderTemplate
     end
 
     def with_prefix
-      render :once => "result", :prefix => "other"
+      render :once => "result", :prefixes => %w(other)
     end
 
     def with_nil_prefix
-      render :once => "test/result", :prefix => nil
+      render :once => "test/result", :prefixes => []
     end
   end
 
diff --git a/actionpack/test/template/log_subscriber_test.rb b/actionpack/test/template/log_subscriber_test.rb
index 435936b19f..8b8b005a1d 100644
--- a/actionpack/test/template/log_subscriber_test.rb
+++ b/actionpack/test/template/log_subscriber_test.rb
@@ -57,7 +57,7 @@ class AVLogSubscriberTest < ActiveSupport::TestCase
   end
 
   def test_render_partial_with_implicit_path
-    @view.stubs(:controller_prefix).returns("test")
+    @view.stubs(:controller_prefixes).returns(%w(test))
     @view.render(Customer.new("david"), :greeting => "hi")
     wait
 
@@ -74,7 +74,7 @@ class AVLogSubscriberTest < ActiveSupport::TestCase
   end
 
   def test_render_collection_with_implicit_path
-    @view.stubs(:controller_prefix).returns("test")
+    @view.stubs(:controller_prefixes).returns(%w(test))
     @view.render([ Customer.new("david"), Customer.new("mary") ], :greeting => "hi")
     wait
 
@@ -83,7 +83,7 @@ class AVLogSubscriberTest < ActiveSupport::TestCase
   end
 
   def test_render_collection_template_without_path
-    @view.stubs(:controller_prefix).returns("test")
+    @view.stubs(:controller_prefixes).returns(%w(test))
     @view.render([ GoodCustomer.new("david"), Customer.new("mary") ], :greeting => "hi")
     wait
 
diff --git a/actionpack/test/template/lookup_context_test.rb b/actionpack/test/template/lookup_context_test.rb
index c9dd27cf2a..a629b3c046 100644
--- a/actionpack/test/template/lookup_context_test.rb
+++ b/actionpack/test/template/lookup_context_test.rb
@@ -80,18 +80,18 @@ class LookupContextTest < ActiveSupport::TestCase
   end
 
   test "find templates using the given view paths and configured details" do
-    template = @lookup_context.find("hello_world", "test")
+    template = @lookup_context.find("hello_world", %w(test))
     assert_equal "Hello world!", template.source
 
     @lookup_context.locale = :da
-    template = @lookup_context.find("hello_world", "test")
+    template = @lookup_context.find("hello_world", %w(test))
     assert_equal "Hey verden", template.source
   end
 
   test "found templates respects given formats if one cannot be found from template or handler" do
     ActionView::Template::Handlers::ERB.expects(:default_format).returns(nil)
     @lookup_context.formats = [:text]
-    template = @lookup_context.find("hello_world", "test")
+    template = @lookup_context.find("hello_world", %w(test))
     assert_equal [:text], template.formats
   end
 
@@ -137,44 +137,44 @@ class LookupContextTest < ActiveSupport::TestCase
 
   test "gives the key forward to the resolver, so it can be used as cache key" do
     @lookup_context.view_paths = ActionView::FixtureResolver.new("test/_foo.erb" => "Foo")
-    template = @lookup_context.find("foo", "test", true)
+    template = @lookup_context.find("foo", %w(test), true)
     assert_equal "Foo", template.source
 
     # Now we are going to change the template, but it won't change the returned template
     # since we will hit the cache.
     @lookup_context.view_paths.first.hash["test/_foo.erb"] = "Bar"
-    template = @lookup_context.find("foo", "test", true)
+    template = @lookup_context.find("foo", %w(test), true)
     assert_equal "Foo", template.source
 
     # This time we will change the locale. The updated template should be picked since
     # lookup_context generated a new key after we changed the locale.
     @lookup_context.locale = :da
-    template = @lookup_context.find("foo", "test", true)
+    template = @lookup_context.find("foo", %w(test), true)
     assert_equal "Bar", template.source
 
     # Now we will change back the locale and it will still pick the old template.
     # This is expected because lookup_context will reuse the previous key for :en locale.
     @lookup_context.locale = :en
-    template = @lookup_context.find("foo", "test", true)
+    template = @lookup_context.find("foo", %w(test), true)
     assert_equal "Foo", template.source
 
     # Finally, we can expire the cache. And the expected template will be used.
     @lookup_context.view_paths.first.clear_cache
-    template = @lookup_context.find("foo", "test", true)
+    template = @lookup_context.find("foo", %w(test), true)
     assert_equal "Bar", template.source
   end
 
   test "can disable the cache on demand" do
     @lookup_context.view_paths = ActionView::FixtureResolver.new("test/_foo.erb" => "Foo")
-    old_template = @lookup_context.find("foo", "test", true)
+    old_template = @lookup_context.find("foo", %w(test), true)
 
-    template = @lookup_context.find("foo", "test", true)
+    template = @lookup_context.find("foo", %w(test), true)
     assert_equal template, old_template
 
     assert @lookup_context.cache
     template = @lookup_context.disable_cache do
       assert !@lookup_context.cache
-      @lookup_context.find("foo", "test", true)
+      @lookup_context.find("foo", %w(test), true)
     end
     assert @lookup_context.cache
 
@@ -182,11 +182,11 @@ class LookupContextTest < ActiveSupport::TestCase
   end
 
   test "data can be stored in cached templates" do
-    template = @lookup_context.find("hello_world", "test")
+    template = @lookup_context.find("hello_world", %w(test))
     template.data["cached"] = "data"
     assert_equal "Hello world!", template.source
 
-    template = @lookup_context.find("hello_world", "test")
+    template = @lookup_context.find("hello_world", %w(test))
     assert_equal "data", template.data["cached"]
     assert_equal "Hello world!", template.source
   end
@@ -200,54 +200,54 @@ class LookupContextWithFalseCaching < ActiveSupport::TestCase
   end
 
   test "templates are always found in the resolver but timestamp is checked before being compiled" do
-    template = @lookup_context.find("foo", "test", true)
+    template = @lookup_context.find("foo", %w(test), true)
     assert_equal "Foo", template.source
 
     # Now we are going to change the template, but it won't change the returned template
     # since the timestamp is the same.
     @resolver.hash["test/_foo.erb"][0] = "Bar"
-    template = @lookup_context.find("foo", "test", true)
+    template = @lookup_context.find("foo", %w(test), true)
     assert_equal "Foo", template.source
 
     # Now update the timestamp.
     @resolver.hash["test/_foo.erb"][1] = Time.now.utc
-    template = @lookup_context.find("foo", "test", true)
+    template = @lookup_context.find("foo", %w(test), true)
     assert_equal "Bar", template.source
   end
 
   test "if no template was found in the second lookup, with no cache, raise error" do
-    template = @lookup_context.find("foo", "test", true)
+    template = @lookup_context.find("foo", %w(test), true)
     assert_equal "Foo", template.source
 
     @resolver.hash.clear
     assert_raise ActionView::MissingTemplate do
-      @lookup_context.find("foo", "test", true)
+      @lookup_context.find("foo", %w(test), true)
     end
   end
 
   test "if no template was cached in the first lookup, retrieval should work in the second call" do
     @resolver.hash.clear
     assert_raise ActionView::MissingTemplate do
-      @lookup_context.find("foo", "test", true)
+      @lookup_context.find("foo", %w(test), true)
     end
 
     @resolver.hash["test/_foo.erb"] = ["Foo", Time.utc(2000)]
-    template = @lookup_context.find("foo", "test", true)
+    template = @lookup_context.find("foo", %w(test), true)
     assert_equal "Foo", template.source
   end
 
   test "data can be stored as long as template was not updated" do
-    template = @lookup_context.find("foo", "test", true)
+    template = @lookup_context.find("foo", %w(test), true)
     template.data["cached"] = "data"
     assert_equal "Foo", template.source
 
-    template = @lookup_context.find("foo", "test", true)
+    template = @lookup_context.find("foo", %w(test), true)
     assert_equal "data", template.data["cached"]
     assert_equal "Foo", template.source
 
     @resolver.hash["test/_foo.erb"][1] = Time.now.utc
-    template = @lookup_context.find("foo", "test", true)
+    template = @lookup_context.find("foo", %w(test), true)
     assert_nil template.data["cached"]
     assert_equal "Foo", template.source
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/test/template/template_test.rb b/actionpack/test/template/template_test.rb
index 2ec640c84c..3432a02c3c 100644
--- a/actionpack/test/template/template_test.rb
+++ b/actionpack/test/template/template_test.rb
@@ -95,14 +95,14 @@ class TestERBTemplate < ActiveSupport::TestCase
   def test_refresh_with_templates
     @template = new_template("Hello", :virtual_path => "test/foo/bar")
     @template.locals = [:key]
-    @context.lookup_context.expects(:find_template).with("bar", "test/foo", false, [:key]).returns("template")
+    @context.lookup_context.expects(:find_template).with("bar", %w(test/foo), false, [:key]).returns("template")
     assert_equal "template", @template.refresh(@context)
   end
 
   def test_refresh_with_partials
     @template = new_template("Hello", :virtual_path => "test/_foo")
     @template.locals = [:key]
-    @context.lookup_context.expects(:find_template).with("foo", "test", true, [:key]).returns("partial")
+    @context.lookup_context.expects(:find_template).with("foo", %w(test), true, [:key]).returns("partial")
     assert_equal "partial", @template.refresh(@context)
   end