0
@@ -1,5 +1,7 @@
0
 * SVN *
0
 
0
+* Raise MissingThemesError if Site#theme is nil
0
+
0
 * RIP: Site#search_layout
0
 
0
 * Add link_to_search_result filter that uses either a paged or blog permalink, depending on the search section.

0
@@ -124,7 +124,7 @@ class Site < ActiveRecord::Base
0
   end
0
 
0
   def theme
0
-    @theme ||= themes[current_theme_path] || themes.first
0
+    @theme ||= themes[current_theme_path] || themes.first || raise(MissingThemesError.new(self))
0
   end
0
 
0
   def change_theme_to(new_theme_path)

0
@@ -50,6 +50,14 @@ class MissingTemplateError < StandardError
0
   end
0
 end
0
 
0
+class MissingThemesError < StandardError
0
+  attr_reader :site
0
+  def initialize(site)
0
+    @site = site
0
+    super "No themes found in '#{site.theme_path.to_s}/#{site.current_theme_path}'.  This must be set correctly in the site settings."
0
+  end
0
+end
0
+
0
 class ThemeError < StandardError
0
   attr_reader :theme
0
   def initialize(theme, message)

0
@@ -52,4 +52,11 @@ context "Theme" do
0
     end
0
     assert !dest.exist?
0
   end
0
+  
0
+  specify "should raise MissingThemesError on missing themes" do
0
+    site = Site.new
0
+    site.stubs(:themes).returns([])
0
+    site.stubs(:current_theme_path).returns(0)
0
+    assert_raises(MissingThemesError) { site.theme }
0
+  end
0
 end