carrierwave 0.5.8 → 0.6.0

data/lib/carrierwave.rb

@@ -4,13 +4,7 @@ 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'
 
 module CarrierWave
 
@@ -44,10 +38,6 @@ module CarrierWave
     autoload :Abstract, 'carrierwave/storage/abstract'
     autoload :File, 'carrierwave/storage/file'
     autoload :Fog, 'carrierwave/storage/fog'
-    autoload :S3, 'carrierwave/storage/s3'
-    autoload :GridFS, 'carrierwave/storage/grid_fs'
-    autoload :RightS3, 'carrierwave/storage/right_s3'
-    autoload :CloudFiles, 'carrierwave/storage/cloud_files'
   end
 
   module Uploader
@@ -65,6 +55,7 @@ module CarrierWave
     autoload :Url, 'carrierwave/uploader/url'
     autoload :Mountable, 'carrierwave/uploader/mountable'
     autoload :Configuration, 'carrierwave/uploader/configuration'
+    autoload :Serialization, 'carrierwave/uploader/serialization'
   end
 
   module Compatibility
@@ -104,13 +95,17 @@ elsif defined?(Rails)
   end
 
 elsif defined?(Sinatra)
-
-  CarrierWave.root = if Sinatra::Application.respond_to?(:public_folder)
-    # Sinatra >= 1.3
-    Sinatra::Application.public_folder
+  if defined?(Padrino)
+    CarrierWave.root = File.join(PADRINO_ROOT, "public")
   else
-    # Sinatra < 1.3
-    Sinatra::Application.public
+
+    CarrierWave.root = if Sinatra::Application.respond_to?(:public_folder)
+      # Sinatra >= 1.3
+      Sinatra::Application.public_folder
+    else
+      # Sinatra < 1.3
+      Sinatra::Application.public
+    end
   end
 
 end

data/lib/carrierwave/mount.rb

@@ -281,8 +281,6 @@ module CarrierWave
     # this is an internal class, used by CarrierWave::Mount so that
     # we don't pollute the model with a lot of methods.
     class Mounter #:nodoc:
-      extend ActiveSupport::Memoizable
-
       attr_reader :column, :record, :remote_url, :integrity_error, :processing_error
       attr_accessor :remove
 
@@ -369,12 +367,14 @@ module CarrierWave
         option(:mount_on) || column
       end
 
+      attr_accessor :uploader_options
+
     private
 
       def option(name)
-        record.class.uploader_option(column, name)
+        self.uploader_options ||= {}
+        self.uploader_options[name] ||= record.class.uploader_option(column, name)
       end
-      memoize :option
 
     end # Mounter
 

data/lib/carrierwave/orm/activerecord.rb

@@ -36,6 +36,22 @@ module CarrierWave
           send(:"\#{column}_will_change!")
           super
         end
+
+        def remote_#{column}_url=(url)
+          column = _mounter(:#{column}).serialization_column
+          send(:"\#{column}_will_change!")
+          super
+        end
+
+        def serializable_hash(options=nil)
+          hash = {}
+          self.class.uploaders.each do |column, uploader|
+            if (!options[:only] && !options[:except]) || (options[:only] && options[:only].include?(column)) || (options[:except] && !options[:except].include?(column))
+              hash[column.to_s] = _mounter(:#{column}).uploader.serializable_hash
+            end
+          end
+          super(options).merge(hash)
+        end
       RUBY
 
     end

data/lib/carrierwave/processing/mime_types.rb

@@ -47,7 +47,7 @@ module CarrierWave
         if file.respond_to?(:content_type=)
           file.content_type = new_content_type
         else
-          file.set_instance_variable(:@content_type, new_content_type)
+          file.instance_variable_set(:@content_type, new_content_type)
         end
       end
     rescue ::MIME::InvalidContentType => e

data/lib/carrierwave/processing/mini_magick.rb

@@ -70,8 +70,8 @@ module CarrierWave
         process :resize_to_fit => [width, height]
       end
 
-      def resize_to_fill(width, height)
-        process :resize_to_fill => [width, height]
+      def resize_to_fill(width, height, gravity='Center')
+        process :resize_to_fill => [width, height, gravity]
       end
 
       def resize_and_pad(width, height, background=:transparent, gravity=::Magick::CenterGravity)
@@ -158,6 +158,7 @@ module CarrierWave
     #
     # [width (Integer)] the width to scale the image to
     # [height (Integer)] the height to scale the image to
+    # [gravity (String)] the current gravity suggestion (default: 'Center'; options: 'NorthWest', 'North', 'NorthEast', 'West', 'Center', 'East', 'SouthWest', 'South', 'SouthEast')
     #
     # === Yields
     #
@@ -174,6 +175,7 @@ module CarrierWave
             cmd.resize "#{cols}x#{rows}"
           end
           cmd.gravity gravity
+          cmd.background "rgba(255,255,255,0.0)"
           cmd.extent "#{width}x#{height}" if cols != width || rows != height
         end
         img = yield(img) if block_given?
@@ -206,7 +208,7 @@ module CarrierWave
         img.combine_options do |cmd|
           cmd.thumbnail "#{width}x#{height}>"
           if background == :transparent
-            cmd.background "rgba(0, 0, 0, 0.0)"
+            cmd.background "rgba(255, 255, 255, 0.0)"
           else
             cmd.background background
           end

data/lib/carrierwave/processing/rmagick.rb

@@ -250,9 +250,9 @@ module CarrierWave
       frames = if image.size > 1
         list = ::Magick::ImageList.new
         image.each do |frame|
-          list << yield( frame )
+          list << (block_given? ? yield( frame ) : frame)
         end
-        list
+        block_given? ? list : list.append(true)
       else
         frame = image.first
         frame = yield( frame ) if block_given?

data/lib/carrierwave/sanitized_file.rb

@@ -132,7 +132,7 @@ module CarrierWave
     # [Boolean] whether the file is valid and has a non-zero size
     #
     def empty?
-      @file.nil? || self.size.nil? || self.size.zero?
+      @file.nil? || self.size.nil? || (self.size.zero? && ! self.exists?)
     end
 
     ##
@@ -238,7 +238,7 @@ module CarrierWave
     #
     def content_type
       return @content_type if @content_type
-      @file.content_type.chomp if @file.respond_to?(:content_type) and @file.content_type
+      @file.content_type.to_s.chomp if @file.respond_to?(:content_type) and @file.content_type
     end
 
     ##

data/lib/carrierwave/storage/file.rb

@@ -13,11 +13,11 @@ module CarrierWave
       ##
       # Move the file to the uploader's store path.
       #
-      # By default, store!() uses copy_to(), which operates by copying the file 
-      # from the cache to the store, then deleting the file from the cache.  
+      # By default, store!() uses copy_to(), which operates by copying the file
+      # from the cache to the store, then deleting the file from the cache.
       # If move_to_store() is overriden to return true, then store!() uses move_to(),
       # which simply moves the file from cache to store.  Useful for large files.
-      # 
+      #
       # === Parameters
       #
       # [file (CarrierWave::SanitizedFile)] the file to store

data/lib/carrierwave/storage/fog.rb

@@ -62,6 +62,11 @@ module CarrierWave
     #     end
     #
     class Fog < Abstract
+      class << self
+        def connection_cache
+          @connection_cache ||= {}
+        end
+      end
 
       ##
       # Store a file
@@ -97,7 +102,8 @@ module CarrierWave
 
       def connection
         @connection ||= begin
-          ::Fog::Storage.new(uploader.fog_credentials)
+          credentials = uploader.fog_credentials
+          self.class.connection_cache[credentials] ||= ::Fog::Storage.new(credentials)
         end
       end
 
@@ -133,12 +139,16 @@ module CarrierWave
         #   or
         # [NilClass] no authenticated url available
         #
-        def authenticated_url
+        def authenticated_url(options = {})
           if ['AWS', 'Google'].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)
-            local_file.url(::Fog::Time.now + @uploader.fog_authenticated_url_expiration)
+            if @uploader.fog_credentials[:provider] == "AWS"
+              local_file.url(::Fog::Time.now + @uploader.fog_authenticated_url_expiration, options)
+            else
+              local_file.url(::Fog::Time.now + @uploader.fog_authenticated_url_expiration)
+            end
           else
             nil
           end
@@ -218,6 +228,16 @@ module CarrierWave
           file.content_length
         end
 
+        ##
+        # Check if the file exists on the remote service
+        #
+        # === Returns
+        #
+        # [Boolean] true if file exists or false
+        def exists?
+          !!directory.files.head(path)
+        end
+
         ##
         # Write file to service
         #
@@ -233,6 +253,7 @@ module CarrierWave
             :key          => path,
             :public       => @uploader.fog_public
           }.merge(@uploader.fog_attributes))
+          fog_file.close if fog_file && !fog_file.closed?
           true
         end
 
@@ -247,13 +268,17 @@ module CarrierWave
         #
         def public_url
           if host = @uploader.fog_host
-            "#{host}/#{path}"
+            if host.respond_to? :call
+              "#{host.call(self)}/#{path}"
+            else
+              "#{host}/#{path}"
+            end
           else
             # AWS/Google optimized for speed over correctness
             case @uploader.fog_credentials[:provider]
             when 'AWS'
               # if directory is a valid subdomain, use that style for access
-              if @uploader.fog_directory.to_s =~ /^(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\.(?![\.\-])|\-(?![\.])){1,61}[a-z0-9]$/
+              if @uploader.fog_directory.to_s =~ /^(?:[a-z]|\d(?!\d{0,2}(?:\d{1,3}){3}$))(?:[a-z0-9]|(?![\-])|\-(?![\.])){1,61}[a-z0-9]$/
                 "https://#{@uploader.fog_directory}.s3.amazonaws.com/#{path}"
               else
                 # directory is not a valid subdomain, so use path style for access
@@ -277,9 +302,9 @@ module CarrierWave
         #   or
         # [NilClass] no url available
         #
-        def url
+        def url(options = {})
           if !@uploader.fog_public
-            authenticated_url
+            authenticated_url(options)
           else
             public_url
           end
@@ -322,7 +347,7 @@ module CarrierWave
         # [Fog::#{provider}::File] file data from remote service
         #
         def file
-          @file ||= directory.files.get(path)
+          @file ||= directory.files.head(path)
         end
 
       end

data/lib/carrierwave/test/matchers.rb

@@ -48,11 +48,11 @@ module CarrierWave
         end
 
         def failure_message
-          "expected #{@actual.inspect} to have permissions #{@expected.to_s(8)}, but they were #{(File.stat(@actual.path).mode & 0777).to_s(8)}"
+          "expected #{@actual.current_path.inspect} to have permissions #{@expected.to_s(8)}, but they were #{(File.stat(@actual.path).mode & 0777).to_s(8)}"
         end
 
         def negative_failure_message
-          "expected #{@actual.inspect} not to have permissions #{@expected.to_s(8)}, but it did"
+          "expected #{@actual.current_path.inspect} not to have permissions #{@expected.to_s(8)}, but it did"
         end
 
         def description
@@ -182,7 +182,7 @@ module CarrierWave
         end
       end
 
-      def be_no_height_than(height)
+      def be_no_taller_than(height)
         BeNoTallerThan.new(height)
       end
 

data/lib/carrierwave/uploader.rb

@@ -38,6 +38,7 @@ module CarrierWave
       include CarrierWave::Uploader::Versions
       include CarrierWave::Uploader::DefaultUrl
       include CarrierWave::Uploader::Configuration
+      include CarrierWave::Uploader::Serialization
     end # Base
 
   end # Uploader

data/lib/carrierwave/uploader/cache.rb

@@ -90,9 +90,9 @@ module CarrierWave
       ##
       # Caches the given file. Calls process! to trigger any process callbacks.
       #
-      # By default, cache!() uses copy_to(), which operates by copying the file 
-      # to the cache, then deleting the original file.  If move_to_cache() is 
-      # overriden to return true, then cache!() uses move_to(), which simply 
+      # By default, cache!() uses copy_to(), which operates by copying the file
+      # to the cache, then deleting the original file.  If move_to_cache() is
+      # overriden to return true, then cache!() uses move_to(), which simply
       # moves the file to the cache.  Useful for large files.
       #
       # === Parameters

data/lib/carrierwave/uploader/configuration.rb

@@ -11,28 +11,6 @@ module CarrierWave
         add_config :base_path
         add_config :permissions
         add_config :storage_engines
-        add_config :s3_access_policy
-        add_config :s3_bucket
-        add_config :s3_access_key_id
-        add_config :s3_secret_access_key
-        add_config :s3_cnamed
-        add_config :s3_headers
-        add_config :s3_region
-        add_config :s3_use_ssl
-        add_config :s3_authentication_timeout
-        add_config :cloud_files_username
-        add_config :cloud_files_api_key
-        add_config :cloud_files_container
-        add_config :cloud_files_cdn_host
-        add_config :cloud_files_auth_url
-        add_config :cloud_files_snet
-        add_config :grid_fs_connection
-        add_config :grid_fs_database
-        add_config :grid_fs_host
-        add_config :grid_fs_port
-        add_config :grid_fs_username
-        add_config :grid_fs_password
-        add_config :grid_fs_access_url
         add_config :store_dir
         add_config :cache_dir
         add_config :enable_processing
@@ -109,7 +87,8 @@ module CarrierWave
             end
 
             def #{name}
-              self.class.#{name}
+              value = self.class.#{name}
+              value.instance_of?(Proc) ? value.call : value
             end
           RUBY
         end
@@ -126,20 +105,9 @@ module CarrierWave
             config.permissions = 0644
             config.storage_engines = {
               :file => "CarrierWave::Storage::File",
-              :fog => "CarrierWave::Storage::Fog",
-              :s3 => "CarrierWave::Storage::S3",
-              :grid_fs => "CarrierWave::Storage::GridFS",
-              :right_s3 => "CarrierWave::Storage::RightS3",
-              :cloud_files => "CarrierWave::Storage::CloudFiles"
+              :fog  => "CarrierWave::Storage::Fog"
             }
             config.storage = :file
-            config.s3_headers = {}
-            config.s3_access_policy = :public_read
-            config.s3_region = 'us-east-1'
-            config.s3_authentication_timeout = 600
-            config.grid_fs_database = 'carrierwave'
-            config.grid_fs_host = 'localhost'
-            config.grid_fs_port = 27017
             config.fog_attributes = {}
             config.fog_credentials = {}
             config.fog_public = true
@@ -154,7 +122,7 @@ module CarrierWave
             config.ignore_processing_errors = true
             config.validate_integrity = true
             config.validate_processing = true
-            config.root = CarrierWave.root
+            config.root = lambda { CarrierWave.root }
             config.base_path = CarrierWave.base_path
             config.enable_processing = true
             config.ensure_multipart_form = true

data/lib/carrierwave/uploader/download.rb

@@ -67,7 +67,7 @@ module CarrierWave
       # [url (String)] The URL where the remote file is stored
       #
       def process_uri(uri)
-        URI.parse(URI.escape(URI.unescape(uri)))
+        URI.parse(URI.escape(URI.unescape(uri)).gsub("[", "%5B").gsub("]", "%5D"))
       end
 
     end # Download

data/lib/carrierwave/uploader/mountable.rb

@@ -7,7 +7,7 @@ module CarrierWave
       attr_reader :model, :mounted_as
 
       ##
-      # If a model is given as the first parameter, it will stored in the uploader, and
+      # If a model is given as the first parameter, it will be stored in the uploader, and
       # available throught +#model+. Likewise, mounted_as stores the name of the column
       # where this instance of the uploader is mounted. These values can then be used inside
       # your uploader.
@@ -36,4 +36,4 @@ module CarrierWave
 
     end # Mountable
   end # Uploader
-end # CarrierWave
+end # CarrierWave

data/lib/carrierwave/uploader/processing.rb

@@ -79,7 +79,9 @@ module CarrierWave
       def process!(new_file=nil)
         if enable_processing
           self.class.processors.each do |method, args, condition|
-            next if condition && !self.send(condition, new_file)
+            if(condition)
+              next if !(condition.respond_to?(:call) ? condition.call(self, :args => args, :method => method, :file => new_file) : self.send(condition, new_file))
+            end
             self.send(method, *args)
           end
         end