test/fixtures/cmyk.jpg @@ -223,6 +223,11 @@ module Fleximage @uploaded_image = Magick::Image.from_blob(file.read).first end + # Sanitize image data + @uploaded_image.colorspace = Magick::RGBColorspace + @uploaded_image.density = '72' + + # Save meta data to database set_magic_attributes(file) # Success, make sure everything is valid lib/fleximage/model.rb test/.DS_Store @@ -38,7 +38,10 @@ class Test::Unit::TestCase #:nodoc: when :web_photo 'http://www.google.com/intl/en_ALL/images/logo.gif' - + + when :cmyk + MockFile.new("#{RAILS_ROOT}/../fixtures/cmyk.jpg") + end end test/test_helper.rb @@ -19,4 +19,13 @@ class FleximageFileUploadFromLocalTest < Test::Unit::TestCase assert_equal 1, p.errors.size assert_equal 'was not a readable image', p.errors.on(:image_file) end + + def test_should_correct_colorspace_and_dpi + p = PhotoBare.new(:image_file => files(:cmyk)) + image = p.load_image + assert_equal Magick::RGBColorspace, image.colorspace + assert_equal '72x72', image.density + assert_equal 300, image.columns + assert_equal 300, image.rows + end end test/unit/file_upload_from_local_test.rb fe563024079feda6f0406f6917cf265dd7657201 Alex Wayne alex@beautifulpixel.com http://github.com/Squeegy/fleximage/commit/6c6051daa04dc5b5eb419275bf33b7710c842bea 6c6051daa04dc5b5eb419275bf33b7710c842bea 2008-06-02T14:27:26-07:00 2008-06-02T14:27:26-07:00 Image file now has a little bit of sanitization when its uploaded. It's converted to RGB and 72 dpi. Thanks to Ezra Freedman! f4c5ea5df59786f7f34d4178c632c4c13570d395 Alex Wayne alex@beautifulpixel.com