0
@@ -192,7 +192,7 @@ class Site < ActiveRecord::Base
0
     
0
     def set_preferred_template(section, template_type)
0
       preferred_template = section.template if [:page, :section].include?(template_type)
0
-      preferred_template.blank? ? templates.find_preferred(template_type) : templates[preferred_template]
0
+      templates.find_preferred(template_type, preferred_template)
0
     end
0
     
0
     def set_layout_template(section, template_type)
0
@@ -205,8 +205,7 @@ class Site < ActiveRecord::Base
0
             when :search then search_layout
0
           end
0
         end
0
-
0
-      templates[layout_template.blank? ? 'layout' : layout_template]
0
+      templates.find_preferred(:layout, layout_template)
0
     end
0
     
0
     def parse_template(template, assigns, controller)

0
@@ -8,7 +8,8 @@ module Mephisto
0
         :archive => [:archive,  :index],
0
         :search  => [:search,   :archive, :index],
0
         :error   => [:error,    :index],
0
-        :tag     => [:tag,      :archive, :index]
0
+        :tag     => [:tag,      :archive, :index],
0
+        :layout  => [:layout]
0
       }
0
     
0
       @@template_types = (@@hierarchy.values.flatten.uniq << :layout).collect! { |f| "#{f}.liquid" }

0
@@ -54,6 +54,8 @@ Fixtures.class_eval do
0
   end
0
 end
0
 
0
+THEME_ROOT = File.join(RAILS_ROOT, 'tmp/themes')
0
+
0
 class Test::Unit::TestCase
0
   self.use_transactional_fixtures = true
0
   self.use_instantiated_fixtures  = false
0
@@ -200,7 +202,6 @@ class Test::Unit::TestCase
0
     end
0
   end
0
 
0
-  THEME_ROOT = File.join(RAILS_ROOT, 'tmp/themes')
0
   def prepare_theme_fixtures
0
     FileUtils.rm_rf THEME_ROOT
0
     FileUtils.mkdir_p THEME_ROOT

0
@@ -1,6 +1,6 @@
0
 require File.dirname(__FILE__) + '/../test_helper'
0
 
0
-class TemplateTest < Test::Unit::TestCase
0
+context "Template" do
0
   fixtures :sites
0
 
0
   def setup
0
@@ -73,3 +73,45 @@ class TemplateTest < Test::Unit::TestCase
0
       assert_equal(expected_template_name.nil? ? nil : site.templates[expected_template_name], site.templates.find_preferred(template_type, options[:custom]))
0
     end
0
 end
0
+
0
+context "Site Template" do
0
+  fixtures :sites, :sections
0
+
0
+  def setup
0
+    prepare_theme_fixtures
0
+  end
0
+
0
+  specify "should find preferred for site" do
0
+    assert_site_template_name :home, :section
0
+  end
0
+
0
+  specify "should find fallback for site with preferred template" do
0
+    FileUtils.rm File.join(THEME_ROOT, 'site-1', 'templates', 'home.liquid')
0
+    assert_site_template_name :section, :section
0
+  end
0
+
0
+  specify "should find preferred for site layout" do
0
+    FileUtils.cp File.join(THEME_ROOT, 'site-1', 'layouts', 'layout.liquid'), File.join(THEME_ROOT, 'site-1', 'layouts', 'custom_layout.liquid')
0
+    sites(:first).sections.home.update_attribute :layout, 'custom_layout'
0
+    assert_site_layout_name :custom_layout, :layout
0
+  end
0
+
0
+  specify "should find fallback for site with preferred layout" do
0
+    sites(:first).sections.home.update_attribute :layout, 'custom_layout'
0
+    assert_site_layout_name :layout
0
+  end
0
+
0
+  protected
0
+    def assert_site_template_name(expected_template_name, template_type = nil, options = {})
0
+      template_type ||= expected_template_name
0
+      site            = options[:site] || sites(:first)
0
+      section         = options[:section] || site.sections.home
0
+      assert_equal(expected_template_name.nil? ? nil : site.templates[expected_template_name], site.send(:set_preferred_template, section, template_type))
0
+    end
0
+    def assert_site_layout_name(expected_template_name, template_type = nil, options = {})
0
+      template_type ||= expected_template_name
0
+      site            = options[:site] || sites(:first)
0
+      section         = options[:section] || site.sections.home
0
+      assert_equal(expected_template_name.nil? ? nil : site.templates[expected_template_name], site.send(:set_layout_template, section, template_type))
0
+    end
0
+end