@@ -54,7 +54,7 @@ module HasImage :thumbnails => {}, :max_size => 12.megabytes, :min_size => 4.kilobytes, - :path_prefix => klass.to_s.tableize, + :path_prefix => klass.table_name, :base_path => File.join(RAILS_ROOT, 'public'), :column => :has_image_file, :convert_to => "JPEG", lib/has_image.rb @@ -11,7 +11,9 @@ class StorageTest < Test::Unit::TestCase end def default_options - HasImage.default_options_for("tests").merge( + mock_class = "test" + mock_class.stubs(:table_name).returns('tests') + HasImage.default_options_for(mock_class).merge( :base_path => File.join(File.dirname(__FILE__), '..', 'tmp') ) end @@ -115,7 +117,7 @@ class StorageTest < Test::Unit::TestCase @name = @storage.install_images(stub(:has_image_id => 1)) assert @storage.remove_images(stub(:has_image_id => 1), @name) end - + def test_image_not_too_small @storage = HasImage::Storage.new(default_options.merge(:min_size => 1.kilobyte)) @storage.image_data = temp_file("image.jpg") test/storage_test.rb @@ -1,10 +1,14 @@ require 'test_helper' +class Pic < ActiveRecord::Base + has_image +end + +class PicWithDifferentTableName < ActiveRecord::Base + set_table_name 'pics' +end + class PicTest < Test::Unit::TestCase - class Pic < ActiveRecord::Base - has_image - end - def setup Pic.has_image_options = HasImage.default_options_for(Pic) Pic.has_image_options[:base_path] = File.join(RAILS_ROOT, '/tmp') @@ -56,6 +60,10 @@ class PicTest < Test::Unit::TestCase path = HasImage::Storage.partitioned_path @pic.id assert_equal @pic, Pic.from_partitioned_path(path) end + + def test_default_options_respect_table_name + assert_equal 'pics', HasImage.default_options_for(PicWithDifferentTableName)[:path_prefix] + end def test_regenerate_thumbnails_succeeds Pic.has_image_options = HasImage.default_options_for(Pic).merge( test_rails/pic_test.rb 2aa128d9f79434d6f2f477b60b4ed9ca37ebff4e Gerrit Kaiser gerrit@gerritkaiser.de http://github.com/norman/has_image/commit/05a2527dd190e39d1ae60f7e48f40ad5c79002ab 05a2527dd190e39d1ae60f7e48f40ad5c79002ab 2008-10-20T21:45:24-07:00 2008-10-20T21:27:13-07:00 fixed bug where default options wouldn honour custom table name 737316c40ca26872d5fe73a8b7cb5322046d9fe3 Gerrit Kaiser gerrit@gerritkaiser.de