@@ -1,2 +1,3 @@ tmp .DS_Store +*.log .gitignore @@ -1,11 +1,8 @@ -Has_Image -========= += HasImage -- Image attachment plugin/gem for Ruby on Rails -Has image was created as a smaller, simpler, lighter alternative to -attachment_fu for applications that need to handle uploaded images. - -While attachment_fu is easy to use and gets the job done in some cases, it -has some aspects that I find make it frustrating to work with: +HasImage was created as a smaller, simpler, lighter alternative to +attachment_fu[http://github.com/technoweenie/attachment_fu] for applications +that need to handle uploaded images. attachment_fu: README @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = "has_image" - s.version = "0.0.1" + s.version = "0.1.0" s.date = "2008-07-21" s.summary = "Lets you attach images with thumbnails to active record models." s.email = 'norman@randomba.org' has_image.gemspec @@ -42,7 +42,8 @@ module HasImage :base_path => File.join(RAILS_ROOT, 'public'), :convert_to => "JPEG", :output_quality => "85", - :invalid_image_message => "Can't process the uploaded image." + :invalid_image_message => "Can't process the uploaded image.", + :file_name_column => :file_name } end @@ -50,8 +51,8 @@ module HasImage module ModelInstanceMethods - def image_data=(data) - storage.data = data + def image_data=(image_data) + storage.image_data = image_data end def image_data_valid? @@ -69,7 +70,7 @@ module HasImage end def install_images - storage.install_images(self.id) + update_attribute(has_image_options[:file_name_column], storage.install_images(self.id)) end def storage lib/has_image.rb @@ -8,6 +8,10 @@ module HasImage class Processor attr_accessor :options + + def initialize(options) + @options = options + end # Arg should be either a file, or a path. This runs ImageMagick's # "identify" command and looks for an exit status indicating an error. If @@ -21,28 +25,22 @@ module HasImage end end - def initialize(options) - @options = options - end - # Create the resized image, and transform it to the desired output format, # if necessary. def resize(my_options) silence_stderr do my_options[:temp_file].close if !my_options[:temp_file].closed? @image = MiniMagick::Image.from_file(my_options[:temp_file].path) - @image.format(options[:convert_to]) if @image[:format] !=~ /#{options[:convert_to]}/ - @image.combine_options do |commands| + # Will work on some images, if EXIF data supports it. + commands.send("auto-orient".to_sym) # Remove EXIF data, this can be up to 32k. commands.strip commands.resize "#{my_options[:size]}^" commands.gravity @image[:width] < @image[:height] ? "north" : "center" commands.extent "#{my_options[:size]}" commands.quality options[:output_quality] - # Will work on some images, if EXIF data supports it. - commands.send(:"auto-orient") end return @image end lib/has_image/processor.rb @@ -9,7 +9,7 @@ module HasImage class Storage - attr_accessor :data, :options, :temp_file + attr_accessor :image_data, :options, :temp_file def initialize(options) @options = options @@ -25,14 +25,14 @@ module HasImage Zlib.crc32(Time.now.to_s + rand(10e10).to_s).to_s(36) end - def data=(data) - raise HasImage::FileDataError.new if data.blank? - if data.is_a?(Tempfile) - @temp_file = data + def image_data=(image_data) + raise HasImage::FileDataError.new if image_data.blank? + if image_data.is_a?(Tempfile) + @temp_file = image_data else - data.rewind + image_data.rewind @temp_file = Tempfile.new 'has_image_data_%s' % Storage.random_file_name - @temp_file.write(data.read) + @temp_file.write(image_data.read) end end @@ -40,7 +40,7 @@ module HasImage random_name = Storage.random_file_name install_thumbnails(id, random_name) if !options[:thumbnails].empty? install_main_image(id, random_name) - return file_name_for(random_name) + return random_name end def public_path_for(object, thumbnail = nil) @@ -56,6 +56,14 @@ module HasImage private + def extension + options[:convert_to].to_s.downcase.gsub("jpeg", "jpg") + end + + def file_name_for(*args) + "%s.%s" % [args.compact.join("_"), extension] + end + def install_main_image(id, name) FileUtils.mkdir_p path_for(id) main = processor.resize(:temp_file => @temp_file, :size => @options[:resize_to]) @@ -70,10 +78,6 @@ module HasImage end end - def file_name_for(*args) - "%s.%s" % [args.compact.join("_"), options[:convert_to].to_s.downcase.gsub("jpeg", "jpg")] - end - def path_for(id) File.join(options[:base_path], options[:path_prefix], Storage.partitioned_path(id)) end lib/has_image/storage.rb @@ -14,25 +14,25 @@ class PicTest < Test::Unit::TestCase def test_should_be_valid image = "/../../test/fixtures/image.jpg" - @pic = Pic.new(:name => "test", :image_data => fixture_file_upload(image, "image/jpeg")) + @pic = Pic.new(:image_data => fixture_file_upload(image, "image/jpeg")) assert @pic.valid? end def test_invalid_image_detected image = "/../../test/fixtures/bad_image.jpg" - @pic = Pic.new(:name => "test", :image_data => fixture_file_upload(image, "image/jpeg")) + @pic = Pic.new(:image_data => fixture_file_upload(image, "image/jpeg")) assert !@pic.valid? end def test_create image = "/../../test/fixtures/image.jpg" - @pic = Pic.new(:name => "test", :image_data => fixture_file_upload(image, "image/jpeg")) + @pic = Pic.new(:image_data => fixture_file_upload(image, "image/jpeg")) @pic.save! end def test_create_with_png image = "/../../test/fixtures/image.png" - @pic = Pic.new(:name => "test", :image_data => fixture_file_upload(image, "image/png")) + @pic = Pic.new(:image_data => fixture_file_upload(image, "image/png")) assert @pic.valid? @pic.save! end rails-test/pic_test.rb @@ -55,7 +55,7 @@ class StorageTest < Test::Unit::TestCase def test_set_data_from_file @storage = HasImage::Storage.new(default_options) @file = File.new(File.dirname(__FILE__) + "/fixtures/image.jpg", "r") - @storage.data = @file + @storage.image_data = @file assert @storage.temp_file.size > 0 assert_equal Zlib.crc32(@file.read), Zlib.crc32(@storage.temp_file.read) ensure @@ -67,7 +67,7 @@ class StorageTest < Test::Unit::TestCase @file = File.new(File.dirname(__FILE__) + "/fixtures/image.jpg", "r") @temp_file = Tempfile.new("test") @temp_file.write(@file.read) - @storage.data = @temp_file + @storage.image_data = @temp_file assert @storage.temp_file.size > 0 assert_equal Zlib.crc32(@storage.temp_file.read), Zlib.crc32(@temp_file.read) ensure @@ -79,7 +79,7 @@ class StorageTest < Test::Unit::TestCase @file = File.new(File.dirname(__FILE__) + "/fixtures/image.jpg", "r") @temp_file = Tempfile.new("test") @temp_file.write(@file.read) - @storage.data = @temp_file + @storage.image_data = @temp_file assert @storage.install_images(1) assert @storage.remove_images(1) ensure test/storage_test.rb 64c5ffb46b113a01c23cd7a2f6d9ea53c7398d28 Norman Clarke norman@addthree.com http://github.com/norman/has_image/commit/d8172965ff59686ba718bc4e3b4c139553bd46d5 d8172965ff59686ba718bc4e3b4c139553bd46d5 2008-07-22T12:59:34-07:00 2008-07-22T12:59:34-07:00 Tweaked README. Added logs to .gitignore. Made file_name column name configurable. Renamed storage.data to storage.image_data. 8d49e7891efb4f50f1b1cf97eb813d14b3f01c35 Norman Clarke norman@addthree.com