@@ -91,6 +91,10 @@ module Fleximage end end + def self.has_store? + db_store? || image_directory + end + # validation callback validate :validate_image @@ -327,14 +331,18 @@ module Fleximage return @output_image if @output_image # Load the image from disk - if self.class.db_store? - if image_file_data && image_file_data.any? - @output_image = Magick::Image.from_blob(image_file_data).first + if self.class.has_store? + if self.class.db_store? + if image_file_data && image_file_data.any? + @output_image = Magick::Image.from_blob(image_file_data).first + else + master_image_not_found + end else - master_image_not_found + @output_image = Magick::Image.read(file_path).first end else - @output_image = Magick::Image.read(file_path).first + master_image_not_found end rescue Magick::ImageMagickError => e lib/fleximage/model.rb 9b1d211b20a57df6bad04c272181182641071006 Alex Wayne alex@beautifulpixel.com http://github.com/Squeegy/fleximage/commit/fe563024079feda6f0406f6917cf265dd7657201 fe563024079feda6f0406f6917cf265dd7657201 2008-05-31T13:53:10-07:00 2008-05-31T13:53:10-07:00 Fixed that image would initially try to load from a file even if no image_directory was declared. 7d6e42eb8968835bfeb8423d90347a2d8b949f76 Alex Wayne alex@beautifulpixel.com