@@ -25,7 +25,7 @@ class Geometry end # Construct an object from a geometry string - RE = /\A(\d*)(?:x(\d+))?([-+]\d+)?([-+]\d+)?([%!<>@]?)\Z/ + RE = /\A(\d*)(?:x(\d+)?)?([-+]\d+)?([-+]\d+)?([%!<>@]?)\Z/ def self.from_s(str) raise(ArgumentError, "no geometry string specified") unless str @@ -76,7 +76,7 @@ class Geometry new_height = orig_height if @flag && orig_height.send(@flag, new_height) end - [new_width, new_height].collect! { |v| v.round } + [new_width, new_height].collect! { |v| [v.round, 1].max } end end @@ -90,4 +90,4 @@ class Array geometry = Geometry.from_s(geometry) if geometry.is_a?(String) geometry.new_dimensions_for first, last end -end \ No newline at end of file +end lib/geometry.rb @@ -2,7 +2,37 @@ module Technoweenie # :nodoc: module AttachmentFu # :nodoc: @@default_processors = %w(ImageScience Rmagick MiniMagick Gd2 CoreImage) @@tempfile_path = File.join(RAILS_ROOT, 'tmp', 'attachment_fu') - @@content_types = ['image/jpeg', 'image/pjpeg', 'image/gif', 'image/png', 'image/x-png', 'image/jpg'] + @@content_types = [ + 'image/jpeg', + 'image/pjpeg', + 'image/jpg', + 'image/gif', + 'image/png', + 'image/x-png', + 'image/jpg', + 'image/x-ms-bmp', + 'image/bmp', + 'image/x-bmp', + 'image/x-bitmap', + 'image/x-xbitmap', + 'image/x-win-bitmap', + 'image/x-windows-bmp', + 'image/ms-bmp', + 'application/bmp', + 'application/x-bmp', + 'application/x-win-bitmap', + 'application/preview', + 'image/jp_', + 'application/jpg', + 'application/x-jpg', + 'image/pipeg', + 'image/vnd.swiftview-jpeg', + 'image/x-xbitmap', + 'application/png', + 'application/x-png', + 'image/gi_', + 'image/x-citrix-pjpeg' + ] mattr_reader :content_types, :tempfile_path, :default_processors mattr_writer :tempfile_path @@ -20,7 +50,11 @@ module Technoweenie # :nodoc: # * <tt>:thumbnail_class</tt> - Set what class to use for thumbnails. This attachment class is used by default. # * <tt>:path_prefix</tt> - path to store the uploaded files. Uses public/#{table_name} by default for the filesystem, and just #{table_name} # for the S3 backend. Setting this sets the :storage to :file_system. + # * <tt>:storage</tt> - Use :file_system to specify the attachment data is stored with the file system. Defaults to :db_system. + # * <tt>:bucket_key</tt> - Use this to specify a different bucket key other than :bucket_name in the amazon_s3.yml file. This allows you to use + # different buckets for different models. An example setting would be :image_bucket and the you would need to define the name of the corresponding + # bucket in the amazon_s3.yml file. # * <tt>:keep_profile</tt> By default image EXIF data will be stripped to minimize image size. For small thumbnails this proivides important savings. Picture quality is not affected. Set to false if you want to keep the image profile as is. ImageScience will allways keep EXIF data. # @@ -69,7 +103,11 @@ module Technoweenie # :nodoc: end attachment_options[:path_prefix] = attachment_options[:path_prefix][1..-1] if options[:path_prefix].first == '/' - with_options :foreign_key => 'parent_id' do |m| + association_options = { :foreign_key => 'parent_id' } + if attachment_options[:association_options] + association_options.merge!(attachment_options[:association_options]) + end + with_options(association_options) do |m| m.has_many :thumbnails, :class_name => "::#{attachment_options[:thumbnail_class]}" m.belongs_to :parent, :class_name => "::#{base_class}" unless options[:thumbnails].empty? end @@ -82,8 +120,8 @@ module Technoweenie # :nodoc: processors = Technoweenie::AttachmentFu.default_processors.dup begin if processors.any? - attachment_options[:processor] = "#{processors.first}Processor" - processor_mod = Technoweenie::AttachmentFu::Processors.const_get(attachment_options[:processor]) + attachment_options[:processor] = processors.first + processor_mod = Technoweenie::AttachmentFu::Processors.const_get("#{attachment_options[:processor].to_s.classify}Processor") include processor_mod unless included_modules.include?(processor_mod) end rescue Object, Exception @@ -138,6 +176,7 @@ module Technoweenie # :nodoc: base.after_save :after_process_attachment base.after_destroy :destroy_file base.after_validation :process_attachment + base.attr_accessible :uploaded_data if defined?(::ActiveSupport::Callbacks) base.define_callbacks :after_resize, :after_attachment_saved, :before_thumbnail_saved end @@ -244,12 +283,12 @@ module Technoweenie # :nodoc: def create_or_update_thumbnail(temp_file, file_name_suffix, *size) thumbnailable? || raise(ThumbnailError.new("Can't create a thumbnail if the content type is not an image or there is no parent_id column")) returning find_or_initialize_thumbnail(file_name_suffix) do |thumb| - thumb.attributes = { + thumb.temp_paths.unshift temp_file + thumb.send(:'attributes=', { :content_type => content_type, :filename => thumbnail_name_for(file_name_suffix), - :temp_path => temp_file, :thumbnail_resize_options => size - } + }, false) callback_with_args :before_thumbnail_saved, thumb thumb.save! end @@ -302,9 +341,9 @@ module Technoweenie # :nodoc: end if file_data.is_a?(StringIO) file_data.rewind - self.temp_data = file_data.read + set_temp_data file_data.read else - self.temp_path = file_data + self.temp_paths.unshift file_data end end @@ -323,22 +362,14 @@ module Technoweenie # :nodoc: [] : [copy_to_temp_file(full_filename)]) end - # Adds a new temp_path to the array. This should take a string or a Tempfile. This class makes no - # attempt to remove the files, so Tempfiles should be used. Tempfiles remove themselves when they go out of scope. - # You can also use string paths for temporary files, such as those used for uploaded files in a web server. - def temp_path=(value) - temp_paths.unshift value - temp_path - end - # Gets the data from the latest temp file. This will read the file into memory. def temp_data save_attachment? ? File.read(temp_path) : nil end # Writes the given data to a Tempfile and adds it to the collection of temp files. - def temp_data=(data) - self.temp_path = write_to_temp_file data unless data.nil? + def set_temp_data(data) + temp_paths.unshift write_to_temp_file data unless data.nil? end # Copies the given file to a randomly named Tempfile. @@ -391,7 +422,11 @@ module Technoweenie # :nodoc: def attachment_attributes_valid? [:size, :content_type].each do |attr_name| enum = attachment_options[attr_name] - errors.add attr_name, ActiveRecord::Errors.default_error_messages[:inclusion] unless enum.nil? || enum.include?(send(attr_name)) + if Object.const_defined?(:I18n) # Rails >= 2.2 + errors.add attr_name, I18n.translate("activerecord.errors.messages.inclusion", attr_name => enum) unless enum.nil? || enum.include?(send(attr_name)) + else + errors.add attr_name, ActiveRecord::Errors.default_error_messages[:inclusion] unless enum.nil? || enum.include?(send(attr_name)) + end end end lib/technoweenie/attachment_fu.rb @@ -1,4 +1,6 @@ -require 'ftools' +require 'fileutils' +require 'digest/sha2' + module Technoweenie # :nodoc: module AttachmentFu # :nodoc: module Backends @@ -28,16 +30,39 @@ module Technoweenie # :nodoc: # The attachment ID used in the full path of a file def attachment_path_id - ((respond_to?(:parent_id) && parent_id) || id).to_i + ((respond_to?(:parent_id) && parent_id) || id) || 0 end - # by default paritions files into directories e.g. 0000/0001/image.jpg - # to turn this off set :partition => false + # Partitions the given path into an array of path components. + # + # For example, given an <tt>*args</tt> of ["foo", "bar"], it will return + # <tt>["0000", "0001", "foo", "bar"]</tt> (assuming that that id returns 1). + # + # If the id is not an integer, then path partitioning will be performed by + # hashing the string value of the id with SHA-512, and splitting the result + # into 4 components. If the id a 128-bit UUID (as set by :uuid_primary_key => true) + # then it will be split into 2 components. + # + # To turn this off entirely, set :partition => false. def partitioned_path(*args) if respond_to?(:attachment_options) && attachment_options[:partition] == false args - else - ("%08d" % attachment_path_id).scan(/..../) + args + elsif attachment_options[:uuid_primary_key] + # Primary key is a 128-bit UUID in hex format. Split it into 2 components. + path_id = attachment_path_id.to_s + component1 = path_id[0..15] || "-" + component2 = path_id[16..-1] || "-" + [component1, component2] + args + else + path_id = attachment_path_id + if path_id.is_a?(Integer) + # Primary key is an integer. Split it after padding it with 0. + ("%08d" % path_id).scan(/..../) + args + else + # Primary key is a String. Hash it, then split it into 4 components. + hash = Digest::SHA512.hexdigest(path_id.to_s) + [hash[0..31], hash[32..63], hash[64..95], hash[96..127]] + args + end end end @@ -85,8 +110,8 @@ module Technoweenie # :nodoc: if save_attachment? # TODO: This overwrites the file if it exists, maybe have an allow_overwrite option? FileUtils.mkdir_p(File.dirname(full_filename)) - File.cp(temp_path, full_filename) - File.chmod(attachment_options[:chmod] || 0644, full_filename) + FileUtils.cp(temp_path, full_filename) + FileUtils.chmod(attachment_options[:chmod] || 0644, full_filename) end @old_filename = nil true lib/technoweenie/attachment_fu/backends/file_system_backend.rb @@ -18,17 +18,17 @@ module Technoweenie # :nodoc: # You can sign up for S3 and get access keys by visiting http://aws.amazon.com/s3. # # Example configuration (RAILS_ROOT/config/amazon_s3.yml) - # + # # development: # bucket_name: appname_development # access_key_id: <your key> # secret_access_key: <your key> - # + # # test: # bucket_name: appname_test # access_key_id: <your key> # secret_access_key: <your key> - # + # # production: # bucket_name: appname # access_key_id: <your key> @@ -81,10 +81,43 @@ module Technoweenie # :nodoc: # # Which would result in URLs like <tt>http(s)://:server/:bucket_name/my/custom/path/:id/:filename.</tt> # + # === Using different bucket names on different models + # + # By default the bucket name that the file will be stored to is the one specified by the + # <tt>:bucket_name</tt> key in the amazon_s3.yml file. You can use the <tt>:bucket_key</tt> option + # to overide this behavior on a per model basis. For instance if you want a bucket that will hold + # only Photos you can do this: + # + # class Photo < ActiveRecord::Base + # has_attachment :storage => :s3, :bucket_key => :photo_bucket_name + # end + # + # And then your amazon_s3.yml file needs to look like this. + # + # development: + # bucket_name: appname_development + # access_key_id: <your key> + # secret_access_key: <your key> + # + # test: + # bucket_name: appname_test + # access_key_id: <your key> + # secret_access_key: <your key> + # + # production: + # bucket_name: appname + # photo_bucket_name: appname_photos + # access_key_id: <your key> + # secret_access_key: <your key> + # + # If the bucket_key you specify is not there in a certain environment then attachment_fu will + # default to the <tt>bucket_name</tt> key. This way you only have to create special buckets + # this can be helpful if you only need special buckets in certain environments. + # # === Permissions # # By default, files are stored on S3 with public access permissions. You can customize this using - # the <tt>:s3_access</tt> option to <tt>has_attachment</tt>. Available values are + # the <tt>:s3_access</tt> option to <tt>has_attachment</tt>. Available values are # <tt>:private</tt>, <tt>:public_read_write</tt>, and <tt>:authenticated_read</tt>. # # === Other options @@ -123,7 +156,6 @@ module Technoweenie # :nodoc: def self.included(base) #:nodoc: mattr_reader :s3_config - begin require 'aws/s3' include AWS::S3 @@ -146,16 +178,13 @@ module Technoweenie # :nodoc: bucket_name.gsub('.','_').camelize.constantize.establish_connection!(:server => "#{bucket_name}.#{AWS::S3::DEFAULT_HOST}") end - - # Bucket.create(@@bucket_name) - base.before_update :rename_file end def self.protocol @protocol ||= s3_config[:use_ssl] ? 'https://' : 'http://' end - + def self.hostname @hostname ||= s3_config[:server] || AWS::S3::DEFAULT_HOST end @@ -172,7 +201,7 @@ module Technoweenie # :nodoc: def s3_protocol Technoweenie::AttachmentFu::Backends::S3Backend.protocol end - + def s3_hostname Technoweenie::AttachmentFu::Backends::S3Backend.hostname end @@ -213,7 +242,7 @@ module Technoweenie # :nodoc: thumbnail ? File.join(base_path, thumbnail_name_for(thumbnail)) : base_path end - # All public objects are accessible via a GET request to the S3 servers. You can generate a + # All public objects are accessible via a GET request to the S3 servers. You can generate a # url for an object using the s3_url method. # # @photo.s3_url @@ -232,7 +261,7 @@ module Technoweenie # :nodoc: end alias :public_filename :s3_url - # All private objects are accessible via an authenticated GET request to the S3 servers. You can generate an + # All private objects are accessible via an authenticated GET request to the S3 servers. You can generate an # authenticated url for an object like this: # # @photo.authenticated_s3_url @@ -244,7 +273,7 @@ module Technoweenie # :nodoc: # # # Absolute expiration date (October 13th, 2025) # @photo.authenticated_s3_url(:expires => Time.mktime(2025,10,13).to_i) - # + # # # Expiration in five hours from now # @photo.authenticated_s3_url(:expires_in => 5.hours) # @@ -258,6 +287,7 @@ module Technoweenie # :nodoc: # @photo.authenticated_s3_url('thumbnail', :expires_in => 5.hours, :use_ssl => true) def authenticated_s3_url(*args) options = args.extract_options! + options[:expires_in] = options[:expires_in].to_i if options[:expires_in] thumbnail = args.shift S3Object.url_for(full_filename(thumbnail), bucket_name, options) end @@ -273,7 +303,7 @@ module Technoweenie # :nodoc: def s3_protocol Technoweenie::AttachmentFu::Backends::S3Backend.protocol end - + def s3_hostname Technoweenie::AttachmentFu::Backends::S3Backend.hostname end @@ -294,7 +324,7 @@ module Technoweenie # :nodoc: def rename_file return unless @old_filename && @old_filename != filename - + old_full_filename = File.join(base_path, @old_filename) bucket_object.rename( lib/technoweenie/attachment_fu/backends/s3_backend.rb @@ -46,7 +46,7 @@ module Technoweenie # :nodoc: self.height = result.extent.size.height if respond_to?(:height) # Get a new temp_path for the image before saving - self.temp_path = Tempfile.new(random_tempfile_filename, Technoweenie::AttachmentFu.tempfile_path).path + temp_paths.unshift Tempfile.new(random_tempfile_filename, Technoweenie::AttachmentFu.tempfile_path).path result.save self.temp_path, OSX::NSJPEGFileType self.size = File.size(self.temp_path) end lib/technoweenie/attachment_fu/processors/core_image_processor.rb @@ -44,7 +44,7 @@ module Technoweenie # :nodoc: w, h = [img.width, img.height] / size.to_s img.resize!(w, h, false) end - self.temp_path = random_tempfile_filename + temp_paths.unshift random_tempfile_filename self.size = img.export(self.temp_path) end lib/technoweenie/attachment_fu/processors/gd2_processor.rb @@ -34,7 +34,7 @@ module Technoweenie # :nodoc: # supports. filename.sub! /gif$/, 'png' content_type.sub!(/gif$/, 'png') - self.temp_path = write_to_temp_file(filename) + temp_paths.unshift write_to_temp_file(filename) grab_dimensions = lambda do |img| self.width = img.width if respond_to?(:width) self.height = img.height if respond_to?(:height) lib/technoweenie/attachment_fu/processors/image_science_processor.rb @@ -7,7 +7,7 @@ module Technoweenie # :nodoc: base.send :extend, ClassMethods base.alias_method_chain :process_attachment, :processing end - + module ClassMethods # Yields a block containing an MiniMagick Image for the given binary data. def with_image(file, &block) @@ -23,23 +23,29 @@ module Technoweenie # :nodoc: !binary_data.nil? end end - + protected def process_attachment_with_processing return unless process_attachment_without_processing with_image do |img| resize_image_or_thumbnail! img - self.width = img[:width] if respond_to?(:width) - self.height = img[:height] if respond_to?(:height) + self.width = img[:width] if respond_to?(:width) + self.height = img[:height] if respond_to?(:height) callback_with_args :after_resize, img end if image? end - + # Performs the actual resizing operation for a thumbnail def resize_image(img, size) size = size.first if size.is_a?(Array) && size.length == 1 img.combine_options do |commands| commands.strip unless attachment_options[:keep_profile] + + # gif are not handled correct, this is a hack, but it seems to work. + if img.output =~ / GIF / + img.format("png") + end + if size.is_a?(Fixnum) || (size.is_a?(Array) && size.first.is_a?(Fixnum)) if size.is_a?(Fixnum) size = [size, size] @@ -47,13 +53,80 @@ module Technoweenie # :nodoc: else commands.resize(size.join('x') + '!') end + # extend to thumbnail size + elsif size.is_a?(String) and size =~ /e$/ + size = size.gsub(/e/, '') + commands.resize(size.to_s + '>') + commands.background('#ffffff') + commands.gravity('center') + commands.extent(size) + # crop thumbnail, the smart way + elsif size.is_a?(String) and size =~ /c$/ + size = size.gsub(/c/, '') + + # calculate sizes and aspect ratio + thumb_width, thumb_height = size.split("x") + thumb_width = thumb_width.to_f + thumb_height = thumb_height.to_f + + thumb_aspect = thumb_width.to_f / thumb_height.to_f + image_width, image_height = img[:width].to_f, img[:height].to_f + image_aspect = image_width / image_height + + # only crop if image is not smaller in both dimensions + unless image_width < thumb_width and image_height < thumb_height + command = calculate_offset(image_width,image_height,image_aspect,thumb_width,thumb_height,thumb_aspect) + + # crop image + commands.extract(command) + end + + # don not resize if image is not as height or width then thumbnail + if image_width < thumb_width or image_height < thumb_height + commands.background('#ffffff') + commands.gravity('center') + commands.extent(size) + # resize image + else + commands.resize("#{size.to_s}") + end + # crop end else commands.resize(size.to_s) end end - self.temp_path = img + temp_paths.unshift img + end + + def calculate_offset(image_width,image_height,image_aspect,thumb_width,thumb_height,thumb_aspect) + # only crop if image is not smaller in both dimensions + + # special cases, image smaller in one dimension then thumbsize + if image_width < thumb_width + offset = (image_height / 2) - (thumb_height / 2) + command = "#{image_width}x#{thumb_height}+0+#{offset}" + elsif image_height < thumb_height + offset = (image_width / 2) - (thumb_width / 2) + command = "#{thumb_width}x#{image_height}+#{offset}+0" + + # normal thumbnail generation + # calculate height and offset y, width is fixed + elsif (image_aspect <= thumb_aspect or image_width < thumb_width) and image_height > thumb_height + height = image_width / thumb_aspect + offset = (image_height / 2) - (height / 2) + command = "#{image_width}x#{height}+0+#{offset}" + # calculate width and offset x, height is fixed + else + width = image_height * thumb_aspect + offset = (image_width / 2) - (width / 2) + command = "#{width}x#{image_height}+#{offset}+0" + end + # crop image + command end + + end end end -end +end \ No newline at end of file lib/technoweenie/attachment_fu/processors/mini_magick_processor.rb @@ -42,11 +42,14 @@ module Technoweenie # :nodoc: if size.is_a?(Fixnum) || (size.is_a?(Array) && size.first.is_a?(Fixnum)) size = [size, size] if size.is_a?(Fixnum) img.thumbnail!(*size) + elsif size.is_a?(String) && size =~ /^c.*$/ # Image cropping - example geometry string: c75x75 + dimensions = size[1..size.size].split("x") + img.crop_resized!(dimensions[0].to_i, dimensions[1].to_i) else img.change_geometry(size.to_s) { |cols, rows, image| image.resize!(cols<1 ? 1 : cols, rows<1 ? 1 : rows) } end img.strip! unless attachment_options[:keep_profile] - self.temp_path = write_to_temp_file(img.to_blob) + temp_paths.unshift write_to_temp_file(img.to_blob) end end end lib/technoweenie/attachment_fu/processors/rmagick_processor.rb @@ -1,4 +1,5 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'test_helper')) +require 'digest/sha2' class FileSystemTest < Test::Unit::TestCase include BaseAttachmentTests @@ -52,7 +53,7 @@ class FileSystemTest < Test::Unit::TestCase assert_not_created do use_temp_file 'files/rails.png' do |file| attachment.filename = 'rails2.png' - attachment.temp_path = File.join(fixture_path, file) + attachment.temp_paths.unshift File.join(fixture_path, file) attachment.save! assert File.exists?(attachment.full_filename), "#{attachment.full_filename} does not exist" assert !File.exists?(old_filename), "#{old_filename} still exists" @@ -77,4 +78,66 @@ class FileSystemTest < Test::Unit::TestCase end test_against_subclass :test_should_delete_old_file_when_renaming, FileAttachment -end \ No newline at end of file + + def test_path_partitioning_works_on_integer_id(klass = FileAttachment) + attachment_model klass + + # Create a random attachment object, doesn't matter what. + attachment = upload_file :filename => '/files/rails.png' + old_id = attachment.id + attachment.id = 1 + + begin + assert_equal ["0000", "0001", "bar.txt"], attachment.send(:partitioned_path, "bar.txt") + ensure + attachment.id = old_id + end + end + + test_against_subclass :test_path_partitioning_works_on_integer_id, FileAttachment + + def test_path_partitioning_with_string_id_works_by_generating_hash(klass = FileAttachmentWithStringId) + attachment_model klass + + # Create a random attachment object, doesn't matter what. + attachment = upload_file :filename => '/files/rails.png' + old_id = attachment.id + attachment.id = "hello world some long string" + hash = Digest::SHA512.hexdigest("hello world some long string") + + begin + assert_equal [ + hash[0..31], + hash[32..63], + hash[64..95], + hash[96..127], + "bar.txt" + ], attachment.send(:partitioned_path, "bar.txt") + ensure + attachment.id = old_id + end + end + + test_against_subclass :test_path_partitioning_with_string_id_works_by_generating_hash, FileAttachmentWithStringId + + def test_path_partition_string_id_hashing_is_turned_off_if_id_is_uuid(klass = FileAttachmentWithUuid) + attachment_model klass + + # Create a random attachment object, doesn't matter what. + attachment = upload_file :filename => '/files/rails.png' + old_id = attachment.id + attachment.id = "0c0743b698483569dc65909a8cdb3bf9" + + begin + assert_equal [ + "0c0743b698483569", + "dc65909a8cdb3bf9", + "bar.txt" + ], attachment.send(:partitioned_path, "bar.txt") + ensure + attachment.id = old_id + end + end + + test_against_subclass :test_path_partition_string_id_hashing_is_turned_off_if_id_is_uuid, FileAttachmentWithUuid +end test/backends/file_system_test.rb @@ -31,7 +31,7 @@ module BaseAttachmentTests assert_valid attachment assert attachment.size > 0, "no data was set" - attachment.temp_data = 'wtf' + attachment.set_temp_data 'wtf' assert attachment.save_attachment? attachment.save! @@ -45,7 +45,7 @@ module BaseAttachmentTests assert_valid attachment assert attachment.size > 0, "no data was set" - attachment.temp_data = nil + attachment.set_temp_data nil assert !attachment.save_attachment? end end @@ -55,7 +55,7 @@ module BaseAttachmentTests assert_not_created do # no new db_file records use_temp_file 'files/rails.png' do |file| attachment.filename = 'rails2.png' - attachment.temp_path = File.join(fixture_path, file) + attachment.temp_paths.unshift File.join(fixture_path, file) attachment.save! end end test/base_attachment_tests.rb @@ -24,8 +24,8 @@ class BasicTest < Test::Unit::TestCase def test_should_normalize_content_types_to_array assert_equal %w(pdf), PdfAttachment.attachment_options[:content_type] assert_equal %w(pdf doc txt), DocAttachment.attachment_options[:content_type] - assert_equal ['image/jpeg', 'image/pjpeg', 'image/gif', 'image/png', 'image/x-png', 'image/jpg'], ImageAttachment.attachment_options[:content_type] - assert_equal ['pdf', 'image/jpeg', 'image/pjpeg', 'image/gif', 'image/png', 'image/x-png', 'image/jpg'], ImageOrPdfAttachment.attachment_options[:content_type] + assert_equal Technoweenie::AttachmentFu.content_types, ImageAttachment.attachment_options[:content_type] + assert_equal ['pdf'] + Technoweenie::AttachmentFu.content_types, ImageOrPdfAttachment.attachment_options[:content_type] end def test_should_sanitize_content_type @@ -67,4 +67,4 @@ class BasicTest < Test::Unit::TestCase klass.has_attachment :thumbnails => [] end end -end \ No newline at end of file +end test/basic_test.rb @@ -35,7 +35,7 @@ end class ImageWithThumbsAttachment < Attachment has_attachment :thumbnails => { :thumb => [50, 50], :geometry => 'x50' }, :resize_to => [55,55] after_resize do |record, img| - record.aspect_ratio = img.columns.to_f / img.rows.to_f + # record.aspect_ratio = img.columns.to_f / img.rows.to_f end end @@ -44,6 +44,38 @@ class FileAttachment < ActiveRecord::Base validates_as_attachment end +class FileAttachmentWithStringId < ActiveRecord::Base + set_table_name 'file_attachments_with_string_id' + has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files', :processor => :rmagick + validates_as_attachment + + before_validation :auto_generate_id + before_save :auto_generate_id + @@last_id = 0 + + private + def auto_generate_id + @@last_id += 1 + self.id = "id_#{@@last_id}" + end +end + +class FileAttachmentWithUuid < ActiveRecord::Base + set_table_name 'file_attachments_with_string_id' + has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files', :processor => :rmagick, :uuid_primary_key => true + validates_as_attachment + + before_validation :auto_generate_id + before_save :auto_generate_id + @@last_id = 0 + + private + def auto_generate_id + @@last_id += 1 + self.id = "%0127dx" % @@last_id + end +end + class ImageFileAttachment < FileAttachment has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files', :content_type => :image, :resize_to => [50,50] @@ -53,7 +85,7 @@ class ImageWithThumbsFileAttachment < FileAttachment has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files', :thumbnails => { :thumb => [50, 50], :geometry => 'x50' }, :resize_to => [55,55] after_resize do |record, img| - record.aspect_ratio = img.columns.to_f / img.rows.to_f + # record.aspect_ratio = img.columns.to_f / img.rows.to_f end end @@ -130,9 +162,44 @@ begin has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files', :processor => :mini_magick, :thumbnails => { :thumb => [50, 51], :geometry => '31>' }, :resize_to => 55 end + class ImageThumbnailCrop < MiniMagickAttachment + has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files', + :thumbnails => { :square => "50x50c", :vertical => "30x60c", :horizontal => "60x30c"} + + # TODO this is a bad duplication, this method is in the MiniMagick Processor + def self.calculate_offset(image_width,image_height,image_aspect,thumb_width,thumb_height,thumb_aspect) + # only crop if image is not smaller in both dimensions + + # special cases, image smaller in one dimension then thumbsize + if image_width < thumb_width + offset = (image_height / 2) - (thumb_height / 2) + command = "#{image_width}x#{thumb_height}+0+#{offset}" + elsif image_height < thumb_height + offset = (image_width / 2) - (thumb_width / 2) + command = "#{thumb_width}x#{image_height}+#{offset}+0" + + # normal thumbnail generation + # calculate height and offset y, width is fixed + elsif (image_aspect <= thumb_aspect or image_width < thumb_width) and image_height > thumb_height + height = image_width / thumb_aspect + offset = (image_height / 2) - (height / 2) + command = "#{image_width}x#{height}+0+#{offset}" + # calculate width and offset x, height is fixed + else + width = image_height * thumb_aspect + offset = (image_width / 2) - (width / 2) + command = "#{width}x#{image_height}+#{offset}+0" + end + # crop image + command + end + end + rescue MissingSourceFile end + + begin class S3Attachment < ActiveRecord::Base has_attachment :storage => :s3, :processor => :rmagick, :s3_config_path => File.join(File.dirname(__FILE__), '../amazon_s3.yml') test/fixtures/attachment.rb @@ -23,6 +23,13 @@ class GeometryTest < Test::Unit::TestCase "100" => [100, 128] end + def test_should_resize_no_height_with_x + assert_geometry 50, 64, + "50x" => [50, 64], + "60x" => [60, 77], + "100x" => [100, 128] + end + def test_should_resize_with_percent assert_geometry 50, 64, "50x50%" => [25, 32], test/geometry_test.rb @@ -23,9 +23,81 @@ class MiniMagickTest < Test::Unit::TestCase assert_equal 31, geo.width assert_equal 40, geo.height end + + def test_should_crop_image(klass = ImageThumbnailCrop) + attachment_model klass + attachment = upload_file :filename => '/files/rails.png' + assert_valid attachment + assert attachment.image? + # has_attachment :thumbnails => { :square => "50x50c", :vertical => "30x60c", :horizontal => "60x30c"} + + square = attachment.thumbnails.detect { |t| t.filename =~ /_square/ } + vertical = attachment.thumbnails.detect { |t| t.filename =~ /_vertical/ } + horizontal = attachment.thumbnails.detect { |t| t.filename =~ /_horizontal/ } + + # test excat resize + assert_equal 50, square.width + assert_equal 50, square.height + + assert_equal 30, vertical.width + assert_equal 60, vertical.height + + assert_equal 60, horizontal.width + assert_equal 30, horizontal.height + end + + # tests the first step in resize, crop the image in original size to right format + def test_should_crop_image_right(klass = ImageThumbnailCrop) + @@testcases.collect do |testcase| + image_width, image_height, thumb_width, thumb_height = testcase[:data] + image_aspect, thumb_aspect = image_width/image_height, thumb_width/thumb_height + crop_comand = klass.calculate_offset(image_width, image_height, image_aspect, thumb_width, thumb_height,thumb_aspect) + # pattern matching on crop command + if testcase.has_key?(:height) + assert crop_comand.match(/^#{image_width}x#{testcase[:height]}\+0\+#{testcase[:yoffset]}$/) + else + assert crop_comand.match(/^#{testcase[:width]}x#{image_height}\+#{testcase[:xoffset]}\+0$/) + end + end + end + else def test_flunk puts "MiniMagick not loaded, tests not running" end end + + @@testcases = [ + # image_aspect <= 1 && thumb_aspect >= 1 + {:data => [10.0,40.0,2.0,1.0], :height => 5.0, :yoffset => 17.5}, # 1b + {:data => [10.0,40.0,1.0,1.0], :height => 10.0, :yoffset => 15.0}, # 1b + + # image_aspect < 1 && thumb_aspect < 1 + {:data => [10.0,40.0,1.0,2.0], :height => 20.0, :yoffset => 10.0}, # 1a + {:data => [2.0,3.0,1.0,2.0], :width => 1.5, :xoffset => 0.25}, # 1a + + # image_aspect = thumb_aspect + {:data => [10.0,10.0,1.0,1.0], :height => 10.0, :yoffset => 0.0}, # QUADRAT 1c + + # image_aspect >= 1 && thumb_aspect > 1 && image_aspect < thumb_aspect + {:data => [6.0,3.0,4.0,1.0], :height => 1.5, :yoffset => 0.75}, # 2b + {:data => [6.0,6.0,4.0,1.0], :height => 1.5, :yoffset => 2.25}, # 2b + + # image_aspect > 1 && thumb_aspect > 1 && image_aspect > thumb_aspect + {:data => [9.0,3.0,2.0,1.0], :width => 6.0, :xoffset => 1.5}, # 2a + + # image_aspect > 1 && thumb_aspect < 1 && image_aspect < thumb_aspect + {:data => [10.0,5.0,0.1,2.0], :width => 0.25, :xoffset => 4.875}, # 4 + {:data => [10.0,5.0,1.0,2.0], :width => 2.5, :xoffset => 3.75}, # 4 + + # image_aspect > 1 && thumb_aspect > 1 && image_aspect > thumb_aspect + {:data => [9.0,3.0,2.0,1.0], :width => 6.0, :xoffset => 1.5}, # 3a + # image_aspect > 1 && thumb_aspect > 1 && image_aspect < thumb_aspect + {:data => [9.0,3.0,5.0,1.0], :height => 1.8, :yoffset => 0.6} # 3a + ] + + + + + end test/processors/mini_magick_test.rb @@ -181,7 +181,7 @@ class RmagickTest < Test::Unit::TestCase assert_not_created do use_temp_file "files/rails.png" do |file| attachment.filename = 'rails2.png' - attachment.temp_path = File.join(fixture_path, file) + attachment.temp_paths.unshift File.join(fixture_path, file) attachment.save new_filenames = [attachment.reload.full_filename] + attachment.thumbnails.collect { |t| t.reload.full_filename } new_filenames.each { |f| assert File.exists?(f), "#{f} does not exist" } @@ -224,7 +224,7 @@ class RmagickTest < Test::Unit::TestCase # #temp_path calls #full_filename, which is not getting mixed into the attachment. Maybe we don't need to # set temp_path at all? # - # attachment.temp_path = File.join(fixture_path, file) + # attachment.temp_paths.unshift File.join(fixture_path, file) attachment.save! end end test/processors/rmagick_test.rb @@ -22,6 +22,19 @@ ActiveRecord::Schema.define(:version => 0) do t.column :type, :string t.column :aspect_ratio, :float end + + create_table :file_attachments_with_string_id, :id => false, :force => true do |t| + t.column :id, :string + t.column :parent_id, :string + t.column :thumbnail, :string + t.column :filename, :string, :limit => 255 + t.column :content_type, :string, :limit => 255 + t.column :size, :integer + t.column :width, :integer + t.column :height, :integer + t.column :type, :string + t.column :aspect_ratio, :float + end create_table :gd2_attachments, :force => true do |t| t.column :parent_id, :integer @@ -105,4 +118,4 @@ ActiveRecord::Schema.define(:version => 0) do t.column :type, :string t.column :aspect_ratio, :float end -end \ No newline at end of file +end test/schema.rb 09eb7a29d252c9a109f9d2b01ae815350224347e ab1e4f7b0b9de85e0c9decf061d2ef5c1dc0feaa Isaac Feliu isaac@vesne.com http://github.com/isaacfeliu/attachment_fu/commit/e992baab05e75764ccca166af64d47f5b662d2a3 e992baab05e75764ccca166af64d47f5b662d2a3 2009-03-13T06:02:21-07:00 2009-03-13T06:02:21-07:00 Merge with technoweenie 87a64ca28d4d4cdc1dc59f49e1b1d73866edf64d Isaac Feliu isaac@vesne.com