0
@@ -52,6 +52,7 @@ module HasImage
0
       {
0
         :resize_to => "200x200",
0
         :thumbnails => {},
0
+        :auto_generate_thumbnails => true,
0
         :max_size => 12.megabytes,
0
         :min_size => 4.kilobytes,
0
         :path_prefix => klass.table_name,

0
@@ -84,7 +84,7 @@ module HasImage
0
     def install_images(object)
0
       generated_name = Storage.generated_file_name(object)
0
       install_main_image(object.has_image_id, generated_name)
0
-      generate_thumbnails(object.has_image_id, generated_name) unless options[:thumbnails].empty?
0
+      generate_thumbnails(object.has_image_id, generated_name) if thumbnails_needed?
0
       return generated_name
0
     ensure  
0
       @temp_file.close! if !@temp_file.closed?
0
@@ -169,6 +169,7 @@ module HasImage
0
     #
0
     #  /var/sites/example.org/production/public/photos/0000/0001
0
     def path_for(id)
0
+      debugger if $debug
0
       File.join(options[:base_path], options[:path_prefix], Storage.partitioned_path(id))
0
     end
0
     
0
@@ -191,6 +192,11 @@ module HasImage
0
       end
0
     end
0
     
0
+    # used in #install_images
0
+    def thumbnails_needed?
0
+      !options[:thumbnails].empty? && options[:auto_generate_thumbnails]
0
+    end
0
+    
0
     # Instantiates the processor using the options set in my contructor (if
0
     # not already instantiated), stores it in an instance variable, and
0
     # returns it.

0
@@ -118,6 +118,16 @@ class StorageTest < Test::Unit::TestCase
0
     assert @storage.remove_images(stub(:has_image_id => 1), @name)
0
   end
0
   
0
+  def test_install_images_doesnt_automatically_generate_thumbnails_if_that_option_is_set
0
+    @storage = HasImage::Storage.new(default_options.merge(
0
+      :thumbnails => {:two => "200x200"},
0
+      :auto_generate_thumbnails => false
0
+    ))
0
+    @storage.image_data = temp_file("image.jpg")
0
+    @storage.expects(:generate_thumbnails).never
0
+    @storage.install_images(stub(:has_image_id => 1))
0
+  end
0
+
0
   def test_image_not_too_small
0
     @storage = HasImage::Storage.new(default_options.merge(:min_size => 1.kilobyte))
0
     @storage.image_data = temp_file("image.jpg")

0
@@ -10,8 +10,9 @@ end
0
 
0
 class PicTest < Test::Unit::TestCase
0
   def setup
0
+    # Note: Be sure to not set the whole options hash in your tests below
0
     Pic.has_image_options = HasImage.default_options_for(Pic)
0
-    Pic.has_image_options[:base_path] = File.join(RAILS_ROOT, '/tmp')
0
+    Pic.has_image_options[:base_path] = File.join(RAILS_ROOT, 'tmp')
0
   end
0
   
0
   def teardown
0
@@ -64,10 +65,23 @@ class PicTest < Test::Unit::TestCase
0
   def test_default_options_respect_table_name
0
     assert_equal 'pics', HasImage.default_options_for(PicWithDifferentTableName)[:path_prefix]
0
   end
0
+  
0
+  def test_generate_thumbnails_on_create
0
+    Pic.has_image_options[:thumbnails] = {:tiny => "16x16"}
0
+    @pic = Pic.create!(:image_data => fixture_file_upload("/image.jpg", "image/jpeg"))
0
+    assert File.exist?(@pic.absolute_path(:tiny))
0
+  end
0
+  
0
+  def test_doesnt_generate_thumbnails_if_option_disabled
0
+    Pic.has_image_options[:thumbnails] = {:tiny => "16x16"}
0
+    Pic.has_image_options[:auto_generate_thumbnails] = false
0
+    @pic = Pic.create!(:image_data => fixture_file_upload("/image.jpg", "image/jpeg"))
0
+    assert !File.exist?(@pic.absolute_path(:tiny))
0
+  end
0
 
0
   def test_regenerate_thumbnails_succeeds
0
-    Pic.has_image_options = HasImage.default_options_for(Pic).merge(
0
-      :thumbnails => {:small => "100x100", :tiny => "16x16"})
0
+    Pic.has_image_options[:thumbnails] = {:small => "100x100", :tiny => "16x16"}
0
+    
0
     @pic = Pic.new(:image_data => fixture_file_upload("/image.jpg", "image/jpeg"))
0
     @pic.save!
0
     assert @pic.regenerate_thumbnails