carrierwave 0.9.0 → 0.10.0

data/lib/carrierwave/orm/activerecord.rb

@@ -28,6 +28,7 @@ module CarrierWave
       after_save :"store_#{column}!"
       before_save :"write_#{column}_identifier"
       after_commit :"remove_#{column}!", :on => :destroy
+      after_commit :"mark_remove_#{column}_false", :on => :update
       before_update :"store_previous_model_for_#{column}"
       after_save :"remove_previously_stored_#{column}"
 

data/lib/carrierwave/processing/mime_types.rb

@@ -27,6 +27,7 @@ module CarrierWave
     extend ActiveSupport::Concern
 
     included do
+      CarrierWave::Utilities::Deprecation.new "0.11.0", "CarrierWave::MimeTypes is deprecated and will be removed in the future, get the content_type from the SanitizedFile object directly."
       begin
         require "mime/types"
       rescue LoadError => e

data/lib/carrierwave/processing/mini_magick.rb

@@ -258,12 +258,19 @@ module CarrierWave
     def manipulate!
       cache_stored_file! if !cached?
       image = ::MiniMagick::Image.open(current_path)
-      image.format(@format.to_s.downcase) if @format
-      image = yield(image)
-      image.write(current_path)
-      ::MiniMagick::Image.open(current_path)
+
+      begin
+        image.format(@format.to_s.downcase) if @format
+        image = yield(image)
+        image.write(current_path)
+        image.run_command("identify", current_path)
+      ensure
+        image.destroy!
+      end
     rescue ::MiniMagick::Error, ::MiniMagick::Invalid => e
-      raise CarrierWave::ProcessingError, I18n.translate(:"errors.messages.mini_magick_processing_error", :e => e, :default => I18n.translate(:"errors.messages.mini_magick_processing_error", :e => e, :locale => :en))
+      default = I18n.translate(:"errors.messages.mini_magick_processing_error", :e => e, :locale => :en)
+      message = I18n.translate(:"errors.messages.mini_magick_processing_error", :e => e, :default => default)
+      raise CarrierWave::ProcessingError, message
     end
 
   end # MiniMagick

data/lib/carrierwave/processing/rmagick.rb

@@ -62,8 +62,6 @@ module CarrierWave
 
     included do
       begin
-        require "rmagick"
-      rescue LoadError
         require "RMagick"
       rescue LoadError => e
         e.message << " (You may need to install the rmagick gem)"
@@ -215,7 +213,7 @@ module CarrierWave
     def resize_and_pad(width, height, background=:transparent, gravity=::Magick::CenterGravity)
       manipulate! do |img|
         img.resize_to_fit!(width, height)
-        new_img = ::Magick::Image.new(width, height) { self.background_color = 'rgba(255,255,255,0)' }
+        new_img = ::Magick::Image.new(width, height) { self.background_color = background == :transparent ? 'rgba(255,255,255,0)' : background.to_s }
         if background == :transparent
           filled = new_img.matte_floodfill(1, 1)
         else
@@ -315,23 +313,13 @@ module CarrierWave
 
       read_block = create_info_block(options[:read])
       image = ::Magick::Image.read(current_path, &read_block)
+      frames = ::Magick::ImageList.new
 
-      frames = if image.size > 1
-        list = ::Magick::ImageList.new
-        image.each_with_index do |frame, index|
-          processed_frame = if block_given?
-            yield *[frame, index, options].take(block.arity)
-          else
-            frame
-          end
-          list << processed_frame if processed_frame
-        end
-        block_given? ? list : list.append(true)
-      else
-        frame = image.first
-        frame = yield( *[frame, 0, options].take(block.arity) ) if block_given?
-        frame
+      image.each_with_index do |frame, index|
+        frame = yield *[frame, index, options].take(block.arity) if block_given?
+        frames << frame if frame
       end
+      frames.append(true) if block_given?
 
       write_block = create_info_block(options[:write])
       if options[:format] || @format

data/lib/carrierwave/sanitized_file.rb

@@ -2,6 +2,7 @@
 
 require 'pathname'
 require 'active_support/core_ext/string/multibyte'
+require 'mime/types'
 
 module CarrierWave
 
@@ -244,7 +245,11 @@ module CarrierWave
     #
     def content_type
       return @content_type if @content_type
-      @file.content_type.to_s.chomp if @file.respond_to?(:content_type) and @file.content_type
+      if @file.respond_to?(:content_type) and @file.content_type
+        @content_type = @file.content_type.to_s.chomp
+      elsif path
+        @content_type = ::MIME::Types.type_for(path).first.to_s
+      end
     end
 
     ##

data/lib/carrierwave/storage/fog.rb

@@ -137,13 +137,13 @@ module CarrierWave
         # [NilClass] no authenticated url available
         #
         def authenticated_url(options = {})
-          if ['AWS', 'Google', 'Rackspace'].include?(@uploader.fog_credentials[:provider])
+          if ['AWS', 'Google', 'Rackspace', 'OpenStack'].include?(@uploader.fog_credentials[:provider])
             # avoid a get by using local references
             local_directory = connection.directories.new(:key => @uploader.fog_directory)
             local_file = local_directory.files.new(:key => path)
             if @uploader.fog_credentials[:provider] == "AWS"
               local_file.url(::Fog::Time.now + @uploader.fog_authenticated_url_expiration, options)
-            elsif @uploader.fog_credentials[:provider] == "Rackspace"
+            elsif ['Rackspace', 'OpenStack'].include?(@uploader.fog_credentials[:provider])
               connection.get_object_https_url(@uploader.fog_directory, path, ::Fog::Time.now + @uploader.fog_authenticated_url_expiration)
             else
               local_file.url(::Fog::Time.now + @uploader.fog_authenticated_url_expiration)
@@ -192,10 +192,11 @@ module CarrierWave
         #
         # === Returns
         #
-        # [String] extension of file
+        # [String] extension of file or nil if the file has no extension
         #
         def extension
-          path.split('.').last
+          path_elements = path.split('.')
+          path_elements.last if path_elements.size > 1
         end
 
         ##
@@ -338,7 +339,7 @@ module CarrierWave
         #
         def filename(options = {})
           if file_url = url(options)
-            URI.decode(file_url).gsub(/.*\/(.*?$)/, '\1')
+            URI.decode(file_url).gsub(/.*\/(.*?$)/, '\1').split('?').first
           end
         end
 

data/lib/carrierwave/uploader/configuration.rb

@@ -78,8 +78,14 @@ module CarrierWave
 
         def add_config(name)
           class_eval <<-RUBY, __FILE__, __LINE__ + 1
+            def self.eager_load_fog(fog_credentials)
+              # see #1198. This will hopefully no longer be necessary after fog 2.0
+              Fog::Storage.new(fog_credentials) if fog_credentials.present?
+            end
+
             def self.#{name}(value=nil)
               @#{name} = value if value
+              eager_load_fog(value) if value && '#{name}' == 'fog_credentials'
               return @#{name} if self.object_id == #{self.object_id} || defined?(@#{name})
               name = superclass.#{name}
               return nil if name.nil? && !instance_variable_defined?("@#{name}")
@@ -87,10 +93,12 @@ module CarrierWave
             end
 
             def self.#{name}=(value)
+              eager_load_fog(value) if '#{name}' == 'fog_credentials'
               @#{name} = value
             end
 
             def #{name}=(value)
+              self.class.eager_load_fog(value) if '#{name}' == 'fog_credentials'
               @#{name} = value
             end
 

data/lib/carrierwave/uploader/download.rb

@@ -17,11 +17,12 @@ module CarrierWave
         end
 
         def original_filename
-          if file.meta.include? 'content-disposition'
-            match = file.meta['content-disposition'].match(/filename=(\"?)(.+)\1/)
-            return match[2] unless match.nil?
+          filename = filename_from_header || File.basename(file.base_uri.path)
+          mime_type = MIME::Types[file.content_type].first
+          unless File.extname(filename).present? || mime_type.blank?
+            filename = "#{filename}.#{mime_type.extensions.first}"
           end
-          File.basename(file.base_uri.path)
+          filename
         end
 
         def respond_to?(*args)
@@ -45,6 +46,13 @@ module CarrierWave
           raise CarrierWave::DownloadError, "could not download file: #{e.message}"
         end
 
+        def filename_from_header
+          if file.meta.include? 'content-disposition'
+            match = file.meta['content-disposition'].match(/filename="?([^"]+)/)
+            return match[1] unless match.nil? || match[1].empty?
+          end
+        end
+
         def method_missing(*args, &block)
           file.send(*args, &block)
         end
@@ -58,12 +66,10 @@ module CarrierWave
       # [url (String)] The URL where the remote file is stored
       #
       def download!(uri)
-        unless uri.blank?
-          processed_uri = process_uri(uri)
-          file = RemoteFile.new(processed_uri)
-          raise CarrierWave::DownloadError, "trying to download a file which is not served over HTTP" unless file.http?
-          cache!(file)
-        end
+        processed_uri = process_uri(uri)
+        file = RemoteFile.new(processed_uri)
+        raise CarrierWave::DownloadError, "trying to download a file which is not served over HTTP" unless file.http?
+        cache!(file)
       end
 
       ##

data/lib/carrierwave/uploader/processing.rb

@@ -54,20 +54,14 @@ module CarrierWave
         #     end
         #
         def process(*args)
-          if !args.first.is_a?(Hash) && args.last.is_a?(Hash)
-            conditions = args.pop
-            args.map!{ |arg| {arg => []}.merge(conditions) }
+          new_processors = args.inject({}) do |hash, arg|
+            arg = { arg => [] } unless arg.is_a?(Hash)
+            hash.merge!(arg)
           end
 
-          args.each do |arg|
-            if arg.is_a?(Hash)
-              condition = arg.delete(:if)
-              arg.each do |method, args|
-                self.processors += [[method, args, condition]]
-              end
-            else
-              self.processors += [[arg, [], nil]]
-            end
+          condition = new_processors.delete(:if)
+          new_processors.each do |processor, processor_args|
+            self.processors += [[processor, processor_args, condition]]
           end
         end
 
@@ -77,13 +71,17 @@ module CarrierWave
       # Apply all process callbacks added through CarrierWave.process
       #
       def process!(new_file=nil)
-        if enable_processing
-          self.class.processors.each do |method, args, condition|
-            if(condition)
-              next if !(condition.respond_to?(:call) ? condition.call(self, :args => args, :method => method, :file => new_file) : self.send(condition, new_file))
+        return unless enable_processing
+
+        self.class.processors.each do |method, args, condition|
+          if(condition)
+            if condition.respond_to?(:call)
+              next unless condition.call(self, :args => args, :method => method, :file => new_file)
+            else
+              next unless self.send(condition, new_file)
             end
-            self.send(method, *args)
           end
+          self.send(method, *args)
         end
       end
 

data/lib/carrierwave/uploader/proxy.rb

@@ -72,6 +72,17 @@ module CarrierWave
         size
       end
 
+      ##
+      # Read the content type of the file
+      #
+      # === Returns
+      #
+      # [String] content type of the file
+      #
+      def content_type
+        file.respond_to?(:content_type) ? file.content_type : nil
+      end
+
     end # Proxy
   end # Uploader
 end # CarrierWave

data/lib/carrierwave/uploader/serialization.rb

@@ -8,7 +8,7 @@ module CarrierWave
     module Serialization
       extend ActiveSupport::Concern
 
-      def serializable_hash
+      def serializable_hash(options = nil)
         {"url" => url}.merge Hash[versions.map { |name, version| [name, { "url" => version.url }] }]
       end
 

data/lib/carrierwave/uploader/versions.rb

@@ -50,23 +50,39 @@ module CarrierWave
         #
         def version(name, options = {}, &block)
           name = name.to_sym
-          unless versions[name]
-            uploader = Class.new(self)
-            const_set("Uploader#{uploader.object_id}".gsub('-', '_'), uploader)
-            uploader.versions = {}
+          build_version(name, options) unless versions[name]
 
+          versions[name][:uploader].class_eval(&block) if block
+          versions[name]
+        end
+
+        def recursively_apply_block_to_versions(&block)
+          versions.each do |name, version|
+            version[:uploader].class_eval(&block)
+            version[:uploader].recursively_apply_block_to_versions(&block)
+          end
+        end
+
+      private
+
+        def build_version(name, options)
+          uploader = Class.new(self)
+          const_set("Uploader#{uploader.object_id}".gsub('-', '_'), uploader)
+          uploader.version_names += [name]
+          uploader.versions = {}
+          uploader.processors = []
+
+          uploader.class_eval <<-RUBY, __FILE__, __LINE__ + 1
             # Define the enable_processing method for versions so they get the
             # value from the parent class unless explicitly overwritten
-            uploader.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-              def self.enable_processing(value=nil)
-                self.enable_processing = value if value
-                if !@enable_processing.nil?
-                  @enable_processing
-                else
-                  superclass.enable_processing
-                end
+            def self.enable_processing(value=nil)
+              self.enable_processing = value if value
+              if !@enable_processing.nil?
+                @enable_processing
+              else
+                superclass.enable_processing
               end
-            RUBY
+            end
 
             # Regardless of what is set in the parent uploader, do not enforce the
             # move_to_cache config option on versions because it moves the original
@@ -81,42 +97,27 @@ module CarrierWave
             #   end
             # end
             #
-            uploader.class_eval <<-RUBY
-              def move_to_cache
-                false
-              end
-            RUBY
+            def move_to_cache
+              false
+            end
+          RUBY
+
+          class_eval <<-RUBY
+            def #{name}
+              versions[:#{name}]
+            end
+          RUBY
 
-            # Add the current version hash to class attribute :versions
-            current_version = {}
-            current_version[name] = {
+          # Add the current version hash to class attribute :versions
+          current_version = {
+            name => {
               :uploader => uploader,
               :options  => options
             }
-            self.versions = versions.merge(current_version)
-
-            versions[name][:uploader].version_names += [name]
-
-            class_eval <<-RUBY
-              def #{name}
-                versions[:#{name}]
-              end
-            RUBY
-            # as the processors get the output from the previous processors as their
-            # input we must not stack the processors here
-            versions[name][:uploader].processors = versions[name][:uploader].processors.dup
-            versions[name][:uploader].processors.clear
-          end
-          versions[name][:uploader].class_eval(&block) if block
-          versions[name]
+          }
+          self.versions = versions.merge(current_version)
         end
 
-        def recursively_apply_block_to_versions(&block)
-          versions.each do |name, version|
-            version[:uploader].class_eval(&block)
-            version[:uploader].recursively_apply_block_to_versions(&block)
-          end
-        end
       end # ClassMethods
 
       ##
@@ -199,7 +200,7 @@ module CarrierWave
         if (version = args.first) && version.respond_to?(:to_sym)
           raise ArgumentError, "Version #{version} doesn't exist!" if versions[version.to_sym].nil?
           # recursively proxy to version
-          versions[version.to_sym].url(*args[1..-1]) if version_exists?(version)
+          versions[version.to_sym].url(*args[1..-1])
         elsif args.first
           super(args.first)
         else

data/lib/carrierwave/utilities.rb

@@ -1,8 +1,9 @@
 # encoding: utf-8
 
 require 'carrierwave/utilities/uri'
+require 'carrierwave/utilities/deprecation'
 
 module CarrierWave
   module Utilities
   end
-end
+end

data/lib/carrierwave/utilities/deprecation.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+require 'active_support/deprecation'
+
+module CarrierWave
+  module Utilities
+    module Deprecation
+
+      def self.new version = '0.11.0', message = 'Carrierwave'
+        if ActiveSupport::VERSION::MAJOR < 4
+          ActiveSupport::Deprecation.warn("#{message} (will be removed from version #{version})")
+        else
+          ActiveSupport::Deprecation.new(version, message)
+        end
+      end
+
+    end # Deprecation
+  end # Utilities
+end # CarrierWave