attacheable 1.3 → 1.4

data/README

@@ -42,7 +42,7 @@ This goes to your ActiveRecord:
 
 	class Image < ActiveRecord::Base
 	  has_attachment :thumbnails => {:medium => "120x", :large => "800x600", :preview => "100x100"},
-	    :croppable_thumbnails => %w(preview)
+	    :croppable_thumbnails => %w(preview), :path_prefix => 'public/assets/images', :autocreate => true
 	  validates_as_attachment
 	end
 
@@ -54,6 +54,14 @@ In your view (view a record):
 
 	<%= image_tag @image.public_filename(:preview) %>
 
+Note that if you're migrating from acts_as_attachment, you may need to specify partitioned_path like this:
+
+  class Image
+    def partitioned_path(*args)
+      [id.to_s] + args
+    end
+  end
+  
 You can use regenerate_thumbnails! method to regenerate all thumbnails for an image, like this:
 
   Image.regenerate_thumbnails!(:preview)

data/README.ru

@@ -42,7 +42,7 @@
 
 	class Image < ActiveRecord::Base
 	  has_attachment :thumbnails => {:medium => "120x", :large => "800x600", :preview => "100x100"},
-	    :croppable_thumbnails => %w(preview)
+	    :croppable_thumbnails => %w(preview), :path_prefix => 'public/assets/images', :autocreate => true
 	  validates_as_attachment
 	end
 
@@ -51,4 +51,11 @@
 
 	<%= image_tag @image.public_filename(:preview) %>
 
+Если мигрируете с acts_as_attachment, то полезно будет перекрыть метод partitioned_path:
+
+	class Image
+	  def partitioned_path(*args)
+	    [id.to_s] + args
+	  end
+	end
 

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/gempackagetask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'attacheable'
-  s.version = '1.3'
+  s.version = '1.4'
   s.summary = 'Library to handle image uploads'
   s.autorequire = 'attacheable'
   s.author  = "Max Lapshin"
@@ -34,7 +34,7 @@ Rake::GemPackageTask.new(spec) do |package|
 end
 
 
-task :default => [ :test ]
+#task :default => [ :test ]
 
 desc "Run all tests (requires BlueCloth, RedCloth and Rails for integration tests)"
 Rake::TestTask.new("test") { |t|

data/lib/attacheable.rb

@@ -36,6 +36,7 @@ class ActiveRecord::Base
     
     options.with_indifferent_access
     options[:autocreate] ||= false
+    options[:force_autocreate] ||= false
     options[:thumbnails] ||= {}
     options[:thumbnails].symbolize_keys!.with_indifferent_access
     options[:croppable_thumbnails] ||= []
@@ -75,6 +76,17 @@ module Attacheable
     return File.dirname(__FILE__)+"/../.."
   end
 
+
+  def destroy_thumbnails!(thumbnail = nil)
+    return if filename.blank?
+    if thumbnail
+      FileUtils.rm_f(full_filename_without_creation(thumbnail))
+    else
+      to_remove = Dir["#{File.dirname(full_filename_without_creation)}/*"] - [full_filename_without_creation]
+      FileUtils.rm_f(to_remove)
+    end
+  end
+  
   module ClassMethods
 
     #
@@ -83,15 +95,7 @@ module Attacheable
     def regenerate_thumbnails!(thumbnail = nil)
       connection.select_values("select id from #{table_name}").each do |object_id|
         object = find_by_id(object_id)
-        if object && object.filename
-          if thumbnail
-            FileUtils.rm_f(object.full_filename_without_creation(thumbnail))
-          else
-            to_remove = Dir["#{File.dirname(object.full_filename_without_creation)}/*"] - [object.full_filename_without_creation]
-            FileUtils.rm_f(to_remove)
-          end
-          #object.full_filename_with_creation(thumbnail)
-        end
+        object.destroy_thumbnails!(thumbnail)
       end
     end
   
@@ -121,7 +125,7 @@ module Attacheable
     return "" if filename.blank?
     attachment_options[:autocreate] ? full_filename_with_creation(thumbnail) : full_filename_without_creation(thumbnail)
   end
-
+  
   def full_filename_by_path(path) #:nodoc:
     return if filename.blank?
     thumbnail = path.gsub(%r((^#{Regexp.escape(attachment_basename)}_)(\w+)(#{Regexp.escape(attachment_extname)})$), '\2')
@@ -138,6 +142,14 @@ module Attacheable
     full_filename(thumbnail).gsub %r(^#{Regexp.escape(base_path)}), ''
   end
 
+  def image_width(thumbnail = nil)
+    `identify -format "%w" "#{full_filename(thumbnail)}"`.to_i
+  end
+
+  def image_height(thumbnail = nil)
+    `identify -format "%w" "#{full_filename(thumbnail)}"`.to_i
+  end
+
   protected
 
   # overrwrite this to do your own app-specific partitioning. 
@@ -149,20 +161,21 @@ module Attacheable
   def create_thumbnail_if_required(thumbnail)
     thumbnail_path = full_filename_without_creation(thumbnail)
     return thumbnail_path unless thumbnail
-    return thumbnail_path if File.exists?(thumbnail_path)
-    return unless /image\//.match(content_type)
+    (return thumbnail_path if File.exists?(thumbnail_path)) unless attachment_options[:force_autocreate]
+    return nil unless /image\//.match(content_type)
     if attachment_options[:croppable_thumbnails].include?(thumbnail.to_sym)
       crop_and_thumbnail(thumbnail, thumbnail_path)
     else
       create_thumbnail(thumbnail, thumbnail_path)
     end
+    after_create_thumbnail(thumbnail, thumbnail_path) if respond_to?(:after_create_thumbnail)
     thumbnail_path
   end
 
   def create_thumbnail(thumbnail, thumbnail_path)
     return nil unless File.exists?(full_filename)
     return nil unless attachment_options[:thumbnails][thumbnail.to_sym]
-    `convert -thumbnail #{attachment_options[:thumbnails][thumbnail.to_sym]} "#{full_filename}" "#{thumbnail_path}"`
+    `convert "#{full_filename}" -thumbnail "#{attachment_options[:thumbnails][thumbnail.to_sym]}" "#{thumbnail_path}"`
     thumbnail_path
   end
 
@@ -196,9 +209,7 @@ module Attacheable
 
 
   def crop_and_thumbnail(thumbnail, thumbnail_path)
-    if !respond_to?(:width) || !respond_to?(:height)
-      file_type, width, height = identify_image_properties(full_filename)
-    end
+    file_type, width, height = identify_image_properties(full_filename)
     album_x, album_y = attachment_options[:thumbnails][thumbnail.to_sym].split("x").map &:to_i
     scale_x = width.to_f / album_x
     scale_y = height.to_f / album_y
@@ -228,8 +239,9 @@ module Attacheable
   def rename_file
     return unless @old_filename && @old_filename != full_filename
     if @save_new_attachment && File.exists?(@old_filename)
-      FileUtils.rm @old_filename
+      FileUtils.rm_f(File.dirname(@old_filename)+"/*")
     elsif File.exists?(@old_filename)
+      (Dir[File.dirname(@old_filename)+"/*"]-[@old_filename]).each {|f| FileUtils.rm_f(f)}
       FileUtils.mv @old_filename, full_filename
     end
     @old_filename =  nil

data/lib/attacheable/file_naming.rb

@@ -1,7 +1,7 @@
 module Attacheable
   module FileNaming
     def full_filename_with_creation(thumbnail = nil) #:nodoc:
-      create_thumbnail_if_required(thumbnail)
+      create_thumbnail_if_required(thumbnail) 
     end
 
     def full_filename_without_creation(thumbnail = nil) #:nodoc:

data/lib/attacheable/uploading.rb

@@ -2,7 +2,7 @@ module Attacheable
   module Uploading
     def prepare_uploaded_file(file_data)
       return prepare_merb_uploaded_file(file_data) if file_data.is_a?(Hash) && file_data["tempfile"]
-      return nil if file_data.nil? || !file_data.respond_to?(:original_filename) || !respond_to?(:filename=)
+      return nil if file_data.blank? || !file_data.respond_to?(:original_filename) || !respond_to?(:filename=)
       
       self.filename = file_data.original_filename
       if file_data.is_a?(StringIO)

data/test/attacheable_test.rb

@@ -26,6 +26,16 @@ class Image < ActiveRecord::Base
   has_attachment :thumbnails => {:medium => "120x", :large => "800x600", :preview => "100x100"},
     :croppable_thumbnails => %w(preview)
   validates_as_attachment :message => "Please upload an image file."
+  
+  def callback_called
+    @callback_called
+  end
+  
+  def after_create_thumbnail(thumbnail, thumbnail_path)
+    @callback_called = true
+    FileUtils.cp(thumbnail_path, thumbnail_path+".backup")
+  end
+  
 end
 
 class Photo < Image
@@ -102,6 +112,33 @@ class AttacheableTest < Test::Unit::TestCase
     assert !File.exists?(File.dirname(__FILE__)+"/public/system/images/0000/0001"), "Directory should be cleaned"
   end
   
+  def test_file_renaming
+    Image.attachment_options[:autocreate] = true
+    input = File.open(File.dirname(__FILE__)+"/fixtures/life.jpg")
+    input.extend(TestUploadExtension)
+    assert_equal "life.jpg", input.original_filename, "should look like uploaded file"
+    image = Image.new(:uploaded_data => input)
+    assert_equal "life_medium.jpg", image.send(:thumbnail_name_for, :medium), "should generate right thumbnail filename"
+    assert image.save, "Image should be saved"
+    assert_equal "life", image.attachment_basename
+    assert_equal ".jpg", image.attachment_extname
+    assert_equal "/system/images/0000/0001/life_medium.jpg", image.public_filename(:medium)
+    assert File.exists?(File.dirname(__FILE__)+"/public/system/images/0000/0001/life.jpg"), "File should be saved"
+    assert File.exists?(File.dirname(__FILE__)+"/public/system/images/0000/0001/life_medium.jpg"), "Thumbnails should be generated on demand"
+    
+    image = Image.find(1)
+    image.filename = "nonlife.jpg"
+    image.save
+    assert !File.exists?(File.dirname(__FILE__)+"/public/system/images/0000/0001/life.jpg"), "Old filename should not be kept"
+    assert !File.exists?(File.dirname(__FILE__)+"/public/system/images/0000/0001/life_medium.jpg"), "Thumbnails on renaming should be destroyd"
+    assert File.exists?(File.dirname(__FILE__)+"/public/system/images/0000/0001/nonlife.jpg"), "File should be saved"
+    assert !File.exists?(File.dirname(__FILE__)+"/public/system/images/0000/0001/nonlife_medium.jpg"), "Thumbnails on renaming should not be autocreated"
+    
+    image.destroy
+    assert !File.exists?(File.dirname(__FILE__)+"/public/system/images/0000/0001"), "Directory should be cleaned"
+  end
+  
+  
   def test_image_with_autocreation
     Image.attachment_options[:autocreate] = true
     input = File.open(File.dirname(__FILE__)+"/fixtures/life.jpg")
@@ -193,6 +230,24 @@ class AttacheableTest < Test::Unit::TestCase
     assert !File.exists?(File.dirname(__FILE__)+"/public/system/images/0000/0001"), "Directory should be cleaned"
   end
   
+  def test_after_create_thumbnail
+    input = File.open(File.dirname(__FILE__)+"/fixtures/life.jpg")
+    input.extend(TestUploadExtension)
+    assert_equal "life.jpg", input.original_filename, "should look like uploaded file"
+    image = Image.new(:uploaded_data => input)
+    assert_equal "life_medium.jpg", image.send(:thumbnail_name_for, :medium), "should generate right thumbnail filename"
+    assert image.save, "Image should be saved"
+    assert File.exists?(File.dirname(__FILE__)+"/public/system/images/0000/0001/life.jpg"), "File should be saved"
+    assert !File.exists?(File.dirname(__FILE__)+"/public/system/images/0000/0001/life_medium.jpg"), "Thumbnails should not be autogenerated"
+    photo, data = Image.data_by_path_info(%w(0000 0001 life_medium.jpg))
+    assert photo, "Image should be guessed"
+    assert File.exists?(File.dirname(__FILE__)+"/public/system/images/0000/0001/life_medium.jpg"), "Thumbnails should be generated on demand"
+    assert File.exists?(File.dirname(__FILE__)+"/public/system/images/0000/0001/life_medium.jpg.backup"), "After callback should be called"
+    assert data, "New file should be generated"
+    image.destroy
+    assert !File.exists?(File.dirname(__FILE__)+"/public/system/images/0000/0001"), "Directory should be cleaned"
+  end
+  
   def test_nil_upload
     image = Image.new(:uploaded_data => nil)
     assert image.save, "Image should be saved with empty file"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: attacheable
 version: !ruby/object:Gem::Version 
-  version: "1.3"
+  version: "1.4"
 platform: ruby
 authors: 
 - Max Lapshin
@@ -9,7 +9,7 @@ autorequire: attacheable
 bindir: bin
 cert_chain: []
 
-date: 2008-04-08 00:00:00 +04:00
+date: 2008-07-30 00:00:00 +04:00
 default_executable: 
 dependencies: []
 
@@ -30,6 +30,7 @@ files:
 - lib/attacheable/uploading.rb
 - lib/attacheable.rb
 - MIT-LICENSE
+- pkg
 - Rakefile
 - README
 - README.ru