0
@@ -36,7 +36,7 @@ class Admin::ThemesController < Admin::BaseController
0
   def import
0
     return unless request.post?
0
     unless params[:theme] && params[:theme].size > 0 && theme_content_types.include?(params[:theme].content_type.strip)
0
-      flash.now[:error] = "Invalid theme upload."
0
+      flash.now[:error] = "Invalid theme uploaded."
0
       return
0
     end
0
     filename = params[:theme].original_filename
0
@@ -49,6 +49,8 @@ class Admin::ThemesController < Admin::BaseController
0
       site.import_theme zip_file, filename
0
       flash[:notice] = "The '#{filename}' theme has been imported."
0
       redirect_to :action => 'index'
0
+    rescue
0
+      flash.now[:error] = "Invalid theme uploaded: [#{$!.class.name}] #{$!}"
0
     ensure
0
       theme_site_path.rmtree
0
     end

0
@@ -38,6 +38,9 @@ class Theme
0
       end
0
     end
0
     dest.basename.to_s
0
+  rescue
0
+    dest.rmtree if dest.exist?
0
+    raise ThemeError.new(dest, $!.message)
0
   end
0
 
0
   def initialize(base)

0
@@ -129,4 +129,12 @@ class MissingTemplateError < StandardError
0
     @templates     = templates
0
     super "No template found for #{template_type}, checked #{templates.to_sentence}."
0
   end
0
+end
0
+
0
+class ThemeError < StandardError
0
+  attr_reader :theme
0
+  def initialize(theme, message)
0
+    @theme = theme
0
+    super message
0
+  end
0
 end
0
\ No newline at end of file

0
@@ -57,7 +57,7 @@ Fixtures.class_eval do
0
   end
0
 end
0
 
0
-THEME_ROOT = File.join(RAILS_ROOT, 'tmp/themes') unless Object.const_defined?(:THEME_ROOT)
0
+THEME_ROOT = RAILS_PATH + 'tmp/themes' unless Object.const_defined?(:THEME_ROOT)
0
 THEME_FILES = [
0
   'about.yml',
0
   'preview.png',

0
@@ -1,6 +1,6 @@
0
 require File.dirname(__FILE__) + '/../test_helper'
0
 
0
-class ThemeTest < Test::Unit::TestCase
0
+context "Theme" do
0
   fixtures :sites
0
 
0
   def setup
0
@@ -8,15 +8,15 @@ class ThemeTest < Test::Unit::TestCase
0
     @theme = sites(:first).theme
0
   end
0
 
0
-  def test_should_find_preview
0
+  specify "should find preview" do
0
     assert @theme.preview.exist?
0
   end
0
 
0
-  def test_should_respond_to_to_param_for_routes
0
+  specify "should respond to to_param for routes" do
0
     assert_equal 'current', @theme.to_param
0
   end
0
 
0
-  def test_should_export_files
0
+  specify "should export files" do
0
     @theme.export 'foo', :to => THEME_ROOT
0
     
0
     THEME_FILES.each do |path|
0
@@ -24,7 +24,7 @@ class ThemeTest < Test::Unit::TestCase
0
     end
0
   end
0
 
0
-  def test_should_export_files_as_zip
0
+  specify "should export files as zip" do 
0
     @theme.export_as_zip 'foo', :to => THEME_ROOT
0
     
0
     assert File.exists?(File.join(THEME_ROOT, 'foo.zip'))
0
@@ -35,4 +35,21 @@ class ThemeTest < Test::Unit::TestCase
0
       end
0
     end
0
   end
0
+
0
+  specify "should import files" do
0
+    dest = THEME_ROOT + 'site-1/other/hemingway'
0
+    Theme.import THEME_ROOT + 'site-1/hemingway.zip', :to => dest
0
+    assert dest.exist?
0
+    THEME_FILES.each do |file|
0
+      assert((dest + file).exist?, "#{file} does not exist")
0
+    end
0
+  end
0
+  
0
+  specify "should not import bad theme" do
0
+    dest = THEME_ROOT + 'site-1/other/hemingway'
0
+    assert_raise ThemeError do
0
+      Theme.import THEME_ROOT + 'site-1/bad-hemingway.zip', :to => dest
0
+    end
0
+    assert !dest.exist?
0
+  end
0
 end