carrierwave 0.5.4 → 0.5.5

data/lib/carrierwave.rb

@@ -3,6 +3,12 @@
 require 'fileutils'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/class/attribute'
+
+begin
+  require 'active_support/core_ext/class/inheritable_attributes'
+rescue LoadError
+end
+
 require 'active_support/concern'
 require 'active_support/memoizable'
 
@@ -31,6 +37,7 @@ module CarrierWave
   autoload :RMagick, 'carrierwave/processing/rmagick'
   autoload :ImageScience, 'carrierwave/processing/image_science'
   autoload :MiniMagick, 'carrierwave/processing/mini_magick'
+  autoload :MimeTypes, 'carrierwave/processing/mime_types'
   autoload :VERSION, 'carrierwave/version'
 
   module Storage

data/lib/carrierwave/mount.rb

@@ -65,10 +65,11 @@ module CarrierWave
     #     @user.image.url # => '/some_url.png'
     #
     # It is also possible (but not recommended) to ommit the uploader, which
-    # will create an anonymous uploader class. Passing a block to this method
-    # makes it possible to customize it. This can be convenient for brevity,
-    # but if there is any significatnt logic in the uploader, you should do
-    # the right thing and have it in its own file.
+    # will create an anonymous uploader class.
+    #
+    # Passing a block makes it possible to customize the uploader. This can be
+    # convenient for brevity, but if there is any significatnt logic in the
+    # uploader, you should do the right thing and have it in its own file.
     #
     # === Added instance methods
     #
@@ -97,6 +98,7 @@ module CarrierWave
     # [image_processing_error]  Returns an error object if the last file to be assigned caused a processing error
     #
     # [write_image_identifier]  Uses the write_uploader method to set the identifier.
+    # [image_identifier]        Reads out the identifier of the file
     #
     # === Parameters
     #
@@ -138,9 +140,12 @@ module CarrierWave
     #     end
     #
     def mount_uploader(column, uploader=nil, options={}, &block)
-      unless uploader
-        uploader = Class.new(CarrierWave::Uploader::Base)
+      if block_given?
+        uploader = Class.new(uploader || CarrierWave::Uploader::Base)
         uploader.class_eval(&block)
+        uploader.recursively_apply_block_to_versions(&block)
+      else
+        uploader ||= Class.new(CarrierWave::Uploader::Base)
       end
 
       uploaders[column.to_sym] = uploader
@@ -226,8 +231,30 @@ module CarrierWave
           _mounter(:#{column}).write_identifier
         end
 
-      RUBY
+        def #{column}_identifier
+          _mounter(:#{column}).identifier
+        end
+
+        def store_previous_model_for_#{column}
+          serialization_column = _mounter(:#{column}).serialization_column
+
+          if #{column}.remove_previously_stored_files_after_update && send(:"\#{serialization_column}_changed?")
+            @previous_model_for_#{column} ||= self.find_previous_model_for_#{column}
+          end
+        end
+
+        def find_previous_model_for_#{column}
+          self.class.find(to_key.first)
+        end
+
+        def remove_previously_stored_#{column}
+          if @previous_model_for_#{column} && @previous_model_for_#{column}.#{column}.path != #{column}.path
+            @previous_model_for_#{column}.#{column}.remove!
+            @previous_model_for_#{column} = nil
+          end
+        end
 
+      RUBY
     end
 
     module Extension
@@ -342,6 +369,10 @@ module CarrierWave
         uploader.remove!
       end
 
+      def serialization_column
+        option(:mount_on) || column
+      end
+
     private
 
       def option(name)
@@ -349,10 +380,6 @@ module CarrierWave
       end
       memoize :option
 
-      def serialization_column
-        option(:mount_on) || column
-      end
-
     end # Mounter
 
   end # Mount

data/lib/carrierwave/orm/activerecord.rb

@@ -11,7 +11,7 @@ module CarrierWave
     ##
     # See +CarrierWave::Mount#mount_uploader+ for documentation
     #
-    def mount_uploader(column, uploader, options={}, &block)
+    def mount_uploader(column, uploader=nil, options={}, &block)
       super
 
       alias_method :read_uploader, :read_attribute
@@ -27,10 +27,13 @@ module CarrierWave
       after_save :"store_#{column}!"
       before_save :"write_#{column}_identifier"
       after_destroy :"remove_#{column}!"
+      before_update :"store_previous_model_for_#{column}"
+      after_save :"remove_previously_stored_#{column}"
 
       class_eval <<-RUBY, __FILE__, __LINE__+1
         def #{column}=(new_file)
-          #{column}_will_change!
+          column = _mounter(:#{column}).serialization_column
+          send(:"\#{column}_will_change!")
           super
         end
       RUBY

data/lib/carrierwave/orm/mongoid.rb

@@ -9,7 +9,7 @@ module CarrierWave
     ##
     # See +CarrierWave::Mount#mount_uploader+ for documentation
     #
-    def mount_uploader(column, uploader, options={}, &block)
+    def mount_uploader(column, uploader=nil, options={}, &block)
       options[:mount_on] ||= "#{column}_filename"
       field options[:mount_on]
 
@@ -23,11 +23,46 @@ module CarrierWave
       validates_integrity_of  column if uploader_option(column.to_sym, :validate_integrity)
       validates_processing_of column if uploader_option(column.to_sym, :validate_processing)
 
-      after_save "store_#{column}!".to_sym
-      before_save "write_#{column}_identifier".to_sym
-      after_destroy "remove_#{column}!".to_sym
+      after_save      :"store_#{column}!"
+      before_save     :"write_#{column}_identifier"
+      after_destroy   :"remove_#{column}!"
+      before_update   :"store_previous_model_for_#{column}"
+      after_save      :"remove_previously_stored_#{column}"
+
+      class_eval <<-RUBY, __FILE__, __LINE__+1
+        def #{column}=(new_file)
+          column = _mounter(:#{column}).serialization_column
+
+          # Note (Didier L.): equivalent of the <column>_will_change! ActiveModel method
+          begin
+            value = __send__(column)
+            value = value.duplicable? ? value.clone : value
+          rescue TypeError, NoMethodError
+          end
+          setup_modifications
+
+          super.tap do
+            @modifications[column] = [value, __send__(column)]
+          end
+        end
+
+        def #{column}_changed?
+          column = _mounter(:#{column}).serialization_column
+          send(:"\#{column}_changed?")
+        end
+
+        def find_previous_model_for_#{column}
+          if self.embedded?
+            self._parent.reload.send(self.metadata.key).find(to_key.first)
+          else
+            self.class.find(to_key.first)
+          end
+        end
+
+      RUBY
+
     end
   end # Mongoid
 end # CarrierWave
 
-Mongoid::Document::ClassMethods.send(:include, CarrierWave::Mongoid)
+Mongoid::Document::ClassMethods.send(:include, CarrierWave::Mongoid)

data/lib/carrierwave/processing/image_science.rb

@@ -26,8 +26,6 @@ module CarrierWave
     # specified in the smaller dimension but will not be larger than the
     # specified values.
     #
-    # See even http://www.imagemagick.org/RMagick/doc/image3.html#resize_to_fit
-    #
     # === Parameters
     #
     # [width (Integer)] the width to scale the image to
@@ -49,8 +47,6 @@ module CarrierWave
     # the aspect ratio of the original image. If necessary, crop the image in
     # the larger dimension.
     #
-    # See even http://www.imagemagick.org/RMagick/doc/image3.html#resize_to_fill
-    #
     # === Parameters
     #
     # [width (Integer)] the width to scale the image to

data/lib/carrierwave/processing/mime_types.rb

@@ -0,0 +1,58 @@
+require 'mime/types'
+
+module CarrierWave
+
+  ##
+  # This module simplifies the use of the mime-types gem to intelligently
+  # guess and set the content-type of a file. If you want to use this, you'll
+  # need to require this file:
+  #
+  #     require 'carrierwave/processing/mime_types'
+  #
+  # And then include it in your uploader:
+  #
+  #     class MyUploader < CarrierWave::Uploader::Base
+  #       include CarrierWave::MimeTypes
+  #     end
+  #
+  # You can now use the provided helper:
+  #
+  #     class MyUploader < CarrierWave::Uploader::Base
+  #       include CarrierWave::MimeTypes
+  #
+  #       process :set_content_type
+  #     end
+  #
+  module MimeTypes
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def set_content_type(override=false)
+        process :set_content_type => override
+      end
+    end
+
+    ##
+    # Changes the file content_type using the mime-types gem
+    #
+    # === Parameters
+    #
+    # [override (Boolean)] whether or not to override the file's content_type
+    #                      if it is already set and not a generic content-type,
+    #                      false by default
+    #
+    def set_content_type(override=false)
+      if override || file.content_type.blank? || file.content_type == 'application/octet-stream'
+        new_content_type = ::MIME::Types.type_for(file.original_filename).first.to_s
+        if file.respond_to?(:content_type=)
+          file.content_type = new_content_type
+        else
+          file.set_instance_variable(:@content_type, new_content_type)
+        end
+      end
+    rescue ::MIME::InvalidContentType => e
+      raise CarrierWave::ProcessingError.new("Failed to process file with MIME::Types, maybe not valid content-type? Original Error: #{e}")
+    end
+
+  end # MimeTypes
+end # CarrierWave

data/lib/carrierwave/processing/mini_magick.rb

@@ -129,12 +129,9 @@ module CarrierWave
     end
 
     ##
-    # From the RMagick documentation: "Resize the image to fit within the
-    # specified dimensions while retaining the original aspect ratio. The
-    # image may be shorter or narrower than specified in the smaller dimension
-    # but will not be larger than the specified values."
-    #
-    # See even http://www.imagemagick.org/RMagick/doc/image3.html#resize_to_fit
+    # Resize the image to fit within the specified dimensions while retaining
+    # the original aspect ratio. The image may be shorter or narrower than
+    # specified in the smaller dimension but will not be larger than the specified values.
     #
     # === Parameters
     #
@@ -154,15 +151,9 @@ module CarrierWave
     end
 
     ##
-    # From the RMagick documentation: "Resize the image to fit within the
-    # specified dimensions while retaining the aspect ratio of the original
-    # image. If necessary, crop the image in the larger dimension."
-    #
-    # See even http://www.imagemagick.org/RMagick/doc/image3.html#resize_to_fill
-    #
-    # and
-    #
-    # http://www.clipclip.org/clips/detail/4365/jerrett-net-»-crop_resized-in-rmagick
+    # Resize the image to fit within the specified dimensions while retaining
+    # the aspect ratio of the original image. If necessary, crop the image in the
+    # larger dimension.
     #
     # === Parameters
     #
@@ -229,7 +220,7 @@ module CarrierWave
     end
 
     ##
-    # Manipulate the image with RMagick. This method will load up an image
+    # Manipulate the image with MiniMagick. This method will load up an image
     # and then pass each of its frames to the supplied block. It will then
     # save the image to disk.
     #

data/lib/carrierwave/sanitized_file.rb

@@ -17,6 +17,14 @@ module CarrierWave
 
     attr_accessor :file
 
+    class << self
+      attr_writer :sanitize_regexp
+
+      def sanitize_regexp
+        @sanitize_regexp ||= /[^a-zA-Z0-9\.\-\+_]/
+      end
+    end
+
     def initialize(file)
       self.file = file
     end
@@ -127,8 +135,6 @@ module CarrierWave
       @file.nil? || self.size.nil? || self.size.zero?
     end
 
-    alias_method :blank?, :empty?
-
     ##
     # === Returns
     #
@@ -222,6 +228,17 @@ module CarrierWave
       @file.content_type.chomp if @file.respond_to?(:content_type) and @file.content_type
     end
 
+    ##
+    # Sets the content type of the file.
+    #
+    # === Returns
+    #
+    # [String] the content type of the file
+    #
+    def content_type=(type)
+      @content_type = type
+    end
+
     ##
     # Used to sanitize the file name. Public to allow overriding for non-latin characters.
     #
@@ -230,7 +247,7 @@ module CarrierWave
     # [Regexp] the regexp for sanitizing the file name
     #
     def sanitize_regexp
-      /[^a-zA-Z0-9\.\-\+_]/
+      CarrierWave::SanitizedFile.sanitize_regexp
     end
 
   private
@@ -263,7 +280,7 @@ module CarrierWave
       name = name.gsub(sanitize_regexp,"_")
       name = "_#{name}" if name =~ /\A\.+\z/
       name = "unnamed" if name.size == 0
-      return name.mb_chars.downcase.to_s
+      return name.mb_chars.to_s
     end
 
     def split_extension(filename)

data/lib/carrierwave/uploader/cache.rb

@@ -41,11 +41,11 @@ module CarrierWave
         # This only works as long as you haven't done anything funky with your cache_dir.
         # It's recommended that you keep cache files in one place only.
         #
-        def clean_cached_files!
+        def clean_cached_files!(seconds=60*60*24)
           Dir.glob(File.expand_path(File.join(cache_dir, '*'), CarrierWave.root)).each do |dir|
             time = dir.scan(/(\d{4})(\d{2})(\d{2})-(\d{2})(\d{2})/).first.map { |t| t.to_i }
             time = Time.utc(*time)
-            if time < (Time.now.utc - (60*60*24))
+            if time < (Time.now.utc - seconds)
               FileUtils.rm_rf(dir)
             end
           end
@@ -130,7 +130,16 @@ module CarrierWave
         with_callbacks(:retrieve_from_cache, cache_name) do
           self.cache_id, self.original_filename = cache_name.to_s.split('/', 2)
           @filename = original_filename
-          @file = CarrierWave::SanitizedFile.new(cache_path)
+
+          if File.exist?(cache_path) && defined?(MIME::Types)
+            @file = SanitizedFile.new(
+              :tempfile => cache_path,
+              :filename => @filename,
+              :content_type => MIME::Types.of(File.basename(cache_path))[0].content_type
+            )
+          else
+            @file = CarrierWave::SanitizedFile.new(cache_path)
+          end
         end
       end
 
@@ -151,7 +160,7 @@ module CarrierWave
       end
 
       def original_filename=(filename)
-        raise CarrierWave::InvalidParameter, "invalid filename" unless filename =~ /\A[a-z0-9\.\-\+_]+\z/i
+        raise CarrierWave::InvalidParameter, "invalid filename" if filename =~ CarrierWave::SanitizedFile.sanitize_regexp
         @original_filename = filename
       end
 

data/lib/carrierwave/uploader/configuration.rb

@@ -5,6 +5,8 @@ module CarrierWave
       extend ActiveSupport::Concern
 
       included do
+        class_attribute :_storage, :instance_writer => false
+
         add_config :root
         add_config :permissions
         add_config :storage_engines
@@ -35,6 +37,8 @@ module CarrierWave
         add_config :enable_processing
         add_config :ensure_multipart_form
         add_config :delete_tmp_file_after_storage
+        add_config :delete_cache_id_after_storage
+        add_config :remove_previously_stored_files_after_update
 
         # fog
         add_config :fog_attributes
@@ -81,19 +85,13 @@ module CarrierWave
         #     storage MyCustomStorageEngine
         #
         def storage(storage = nil)
-          if storage.is_a?(Symbol)
-            @storage = eval(storage_engines[storage])
-          elsif storage
-            @storage = storage
-          elsif @storage.nil?
-            # Get the storage from the superclass if there is one
-            @storage = superclass.storage rescue nil
+          if storage
+            self._storage = storage.is_a?(Symbol) ? eval(storage_engines[storage]) : storage
           end
-          return @storage
+          _storage
         end
         alias_method :storage=, :storage
 
-
         def add_config(name)
           class_eval <<-RUBY, __FILE__, __LINE__ + 1
             def self.#{name}(value=nil)
@@ -147,6 +145,8 @@ module CarrierWave
             config.store_dir = 'uploads'
             config.cache_dir = 'uploads/tmp'
             config.delete_tmp_file_after_storage = true
+            config.delete_cache_id_after_storage = true
+            config.remove_previously_stored_files_after_update = true
             config.ignore_integrity_errors = true
             config.ignore_processing_errors = true
             config.validate_integrity = true