durran-carrierwave 0.3.2.3 → 0.4.3

data/lib/carrierwave/test/matchers.rb

@@ -61,23 +61,23 @@ module CarrierWave
         def matches?(actual)
           @actual = actual
           # Satisfy expectation here. Return false or raise an error if it's not met.
-          require 'RMagick'
-          img = ::Magick::Image.read(@actual.path).first
+          img = ::Magick::Image.read(@actual.current_path).first
           @actual_width = img.columns
           @actual_height = img.rows
           @actual_width <= @width && @actual_height <= @height
         end
 
         def failure_message
-          "expected #{@actual.inspect} to be no larger than #{@width} by #{@height}, but it was #{@actual_height} by #{@actual_width}."
+          "expected #{@actual.current_path.inspect} to be no larger than #{@width} by #{@height}, but it was #{@actual_width} by #{@actual_height}."
         end
 
         def negative_failure_message
-          "expected #{@actual.inspect} to be larger than #{@width} by #{@height}, but it wasn't."
+          "expected #{@actual.current_path.inspect} to be larger than #{@width} by #{@height}, but it wasn't."
         end
       end
 
       def be_no_larger_than(width, height)
+        load_rmagick
         BeNoLargerThan.new(width, height)
       end
 
@@ -89,25 +89,39 @@ module CarrierWave
         def matches?(actual)
           @actual = actual
           # Satisfy expectation here. Return false or raise an error if it's not met.
-          require 'RMagick'
-          img = ::Magick::Image.read(@actual.path).first
+          img = ::Magick::Image.read(@actual.current_path).first
           @actual_width = img.columns
           @actual_height = img.rows
           @actual_width == @width && @actual_height == @height
         end
 
         def failure_message
-          "expected #{@actual.inspect} to have an exact size of #{@width} by #{@height}, but it was #{@actual_height} by #{@actual_width}."
+          "expected #{@actual.current_path.inspect} to have an exact size of #{@width} by #{@height}, but it was #{@actual_width} by #{@actual_height}."
         end
 
         def negative_failure_message
-          "expected #{@actual.inspect} not to have an exact size of #{@width} by #{@height}, but it did."
+          "expected #{@actual.current_path.inspect} not to have an exact size of #{@width} by #{@height}, but it did."
         end
       end
 
       def have_dimensions(width, height)
+        load_rmagick
         HaveDimensions.new(width, height)
       end
+
+    private
+    
+      def load_rmagick
+        unless defined? Magick 
+          begin
+            require 'rmagick'
+          rescue LoadError
+            require 'RMagick'
+          rescue LoadError
+            puts "WARNING: Failed to require rmagick, image processing may fail!"
+          end
+        end
+      end
       
     end # SpecHelper
   end # Test

data/lib/carrierwave/uploader.rb

@@ -25,7 +25,6 @@ module CarrierWave
     class Base
       attr_reader :file
 
-      use CarrierWave::Uploader::Paths
       use CarrierWave::Uploader::Callbacks
       use CarrierWave::Uploader::Proxy
       use CarrierWave::Uploader::Url
@@ -34,9 +33,10 @@ module CarrierWave
       use CarrierWave::Uploader::Store
       use CarrierWave::Uploader::Remove
       use CarrierWave::Uploader::ExtensionWhitelist
-      use CarrierWave::Uploader::DefaultPath
       use CarrierWave::Uploader::Processing
       use CarrierWave::Uploader::Versions
+      use CarrierWave::Uploader::DefaultUrl
+      use CarrierWave::Uploader::Configuration
     end # Base
 
   end # Uploader

data/lib/carrierwave/uploader/cache.rb

@@ -1,11 +1,29 @@
 # encoding: utf-8
 
 module CarrierWave
+
+  class FormNotMultipart < UploadError
+    def message
+      "You tried to assign a String or a Pathname to an uploader, for security reasons, this is not allowed.\n\n If this is a file upload, please check that your upload form is multipart encoded."
+    end
+  end
+  
+  ##
+  # Generates a unique cache id for use in the caching system
+  #
+  # === Returns
+  #
+  # [String] a cache id in the format YYYYMMDD-HHMM-PID-RND
+  #
+  def self.generate_cache_id
+    Time.now.strftime('%Y%m%d-%H%M') + '-' + Process.pid.to_s + '-' + ("%04d" % rand(9999))
+  end
+
   module Uploader
     module Cache
 
-      depends_on CarrierWave::Uploader::Paths
       depends_on CarrierWave::Uploader::Callbacks
+      depends_on CarrierWave::Uploader::Configuration
 
       ##
       # Returns true if the uploader has been cached
@@ -18,17 +36,6 @@ module CarrierWave
         @cache_id
       end
 
-      ##
-      # Override this in your Uploader to change the directory where files are cached.
-      #
-      # === Returns
-      #
-      # [String] a directory
-      #
-      def cache_dir
-        CarrierWave.config[:cache_dir]
-      end
-
       ##
       # Returns a String which uniquely identifies the currently cached file for later retrieval
       #
@@ -62,11 +69,7 @@ module CarrierWave
             @filename = new_file.filename
             self.original_filename = new_file.filename
 
-            if CarrierWave.config[:cache_to_cache_dir]
-              @file = new_file.copy_to(cache_path, CarrierWave.config[:permissions])
-            else
-              @file = new_file
-            end
+            @file = new_file.copy_to(cache_path, permissions)
           end
         end
       end
@@ -93,7 +96,7 @@ module CarrierWave
     private
 
       def cache_path
-        File.expand_path(File.join(cache_dir, cache_name), public)
+        File.expand_path(File.join(cache_dir, cache_name), root)
       end
 
       attr_reader :cache_id, :original_filename

data/lib/carrierwave/uploader/configuration.rb

@@ -0,0 +1,122 @@
+module CarrierWave
+
+  module Uploader
+    module Configuration
+      setup do
+        add_config :root
+        add_config :permissions
+        add_config :storage_engines
+        add_config :s3_access # for aws/s3
+        add_config :s3_access_policy # for right_aws
+        add_config :s3_bucket
+        add_config :s3_access_key_id
+        add_config :s3_secret_access_key
+        add_config :s3_cnamed
+        add_config :grid_fs_database
+        add_config :grid_fs_host
+        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
+
+        # Mounting
+        add_config :ignore_integrity_errors
+        add_config :ignore_processing_errors
+        add_config :validate_integrity
+        add_config :validate_processing
+        add_config :mount_on
+        
+        configure do |config|
+          config.permissions = 0644
+          config.storage_engines = {
+            :file => "CarrierWave::Storage::File",
+            :s3 => "CarrierWave::Storage::S3",
+            :grid_fs => "CarrierWave::Storage::GridFS",
+            :right_s3 => "CarrierWave::Storage::RightS3"
+          }
+          config.storage = :file
+          config.s3_access = :public_read
+          config.s3_access_policy = 'public-read'
+          config.grid_fs_database = 'carrierwave'
+          config.grid_fs_host = 'localhost'
+          config.store_dir = 'uploads'
+          config.cache_dir = 'uploads/tmp'
+          config.ignore_integrity_errors = true
+          config.ignore_processing_errors = true
+          config.validate_integrity = true
+          config.validate_processing = true
+          config.root = CarrierWave.root
+          config.enable_processing = true
+        end
+      end
+
+      module ClassMethods
+
+        ##
+        # Sets the storage engine to be used when storing files with this uploader.
+        # Can be any class that implements a #store!(CarrierWave::SanitizedFile) and a #retrieve!
+        # method. See lib/carrierwave/storage/file.rb for an example. Storage engines should
+        # be added to CarrierWave::Uploader::Base.storage_engines so they can be referred
+        # to by a symbol, which should be more convenient
+        #
+        # If no argument is given, it will simply return the currently used storage engine.
+        #
+        # === Parameters
+        #
+        # [storage (Symbol, Class)] The storage engine to use for this uploader
+        #
+        # === Returns
+        #
+        # [Class] the storage engine to be used with this uploader
+        #
+        # === Examples
+        #
+        #     storage :file
+        #     storage CarrierWave::Storage::File
+        #     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
+          end
+          return @storage
+        end
+        alias_method :storage=, :storage
+
+
+        def add_config(name)
+          class_eval <<-RUBY, __FILE__, __LINE__ + 1
+            def self.#{name}(value=nil)
+              @#{name} = value if value
+              return @#{name} if self.object_id == #{self.object_id} || defined?(@#{name})
+              name = superclass.#{name}
+              return nil if name.nil? && !instance_variable_defined?("@#{name}")
+              @#{name} = name && !name.is_a?(Module) && !name.is_a?(Symbol) && !name.is_a?(Numeric) && !name.is_a?(TrueClass) && !name.is_a?(FalseClass) ? name.dup : name
+            end
+
+            def self.#{name}=(value)
+              @#{name} = value
+            end
+
+            def #{name}
+              self.class.#{name}
+            end
+          RUBY
+        end
+
+        def configure
+          yield self
+        end
+      end
+
+    end
+  end
+end
+

data/lib/carrierwave/uploader/default_url.rb

@@ -0,0 +1,19 @@
+# encoding: utf-8
+
+module CarrierWave
+  module Uploader
+    module DefaultUrl
+
+      def url(*args)
+        super || default_url
+      end
+
+      ##
+      # Override this method in your uploader to provide a default url
+      # in case no file has been cached/stored yet.
+      #
+      def default_url; end
+
+    end # DefaultPath
+  end # Uploader
+end # CarrierWave

data/lib/carrierwave/uploader/processing.rb

@@ -71,8 +71,10 @@ module CarrierWave
       # Apply all process callbacks added through CarrierWave.process
       #
       def process!(new_file=nil)
-        self.class.processors.each do |method, args|
-          self.send(method, *args)
+        if enable_processing
+          self.class.processors.each do |method, args|
+            self.send(method, *args)
+          end
         end
       end
 

data/lib/carrierwave/uploader/remove.rb

@@ -11,7 +11,6 @@ module CarrierWave
       #
       def remove!
         with_callbacks(:remove) do
-          CarrierWave.logger.info 'CarrierWave: removing file'
           @file.delete if @file
           @file = nil
           @cache_id = nil

data/lib/carrierwave/uploader/store.rb

@@ -4,64 +4,10 @@ module CarrierWave
   module Uploader
     module Store
 
-      depends_on CarrierWave::Uploader::Paths
       depends_on CarrierWave::Uploader::Callbacks
+      depends_on CarrierWave::Uploader::Configuration
       depends_on CarrierWave::Uploader::Cache
 
-      module ClassMethods
-
-        ##
-        # Sets the storage engine to be used when storing files with this uploader.
-        # Can be any class that implements a #store!(CarrierWave::SanitizedFile) and a #retrieve!
-        # method. See lib/carrierwave/storage/file.rb for an example. Storage engines should
-        # be added to CarrierWave.config[:storage_engines] so they can be referred
-        # to by a symbol, which should be more convenient
-        #
-        # If no argument is given, it will simply return the currently used storage engine.
-        #
-        # === Parameters
-        #
-        # [storage (Symbol, Class)] The storage engine to use for this uploader
-        #
-        # === Returns
-        #
-        # [Class] the storage engine to be used with this uploader
-        #
-        # === Examples
-        #
-        #     storage :file
-        #     storage CarrierWave::Storage::File
-        #     storage MyCustomStorageEngine
-        #
-        def storage(storage = nil)
-          if storage.is_a?(Symbol)
-            @storage = get_storage_by_symbol(storage)
-            @storage.setup!
-          elsif storage
-            @storage = storage
-            @storage.setup!
-          elsif @storage.nil?
-            # Get the storage from the superclass if there is one
-            @storage = superclass.storage rescue nil
-          end
-          if @storage.nil?
-            # If we were not able to find a store any other way, setup the default store
-            @storage ||= get_storage_by_symbol(CarrierWave.config[:storage])
-            @storage.setup!
-          end
-          return @storage
-        end
-
-        alias_method :storage=, :storage
-
-      private
-
-        def get_storage_by_symbol(symbol)
-          eval(CarrierWave.config[:storage_engines][symbol])
-        end
-
-      end
-
       ##
       # Override this in your Uploader to change the filename.
       #
@@ -80,19 +26,6 @@ module CarrierWave
         @filename
       end
 
-      ##
-      # Override this in your Uploader to change the directory where the file backend stores files.
-      #
-      # Other backends may or may not use this method, depending on their specific needs.
-      #
-      # === Returns
-      #
-      # [String] a directory
-      #
-      def store_dir
-        CarrierWave.config[:store_dir]
-      end
-
       ##
       # Calculates the path where the file should be stored. If +for_file+ is given, it will be
       # used as the filename, otherwise +CarrierWave::Uploader#filename+ is assumed.

data/lib/carrierwave/uploader/url.rb

@@ -13,7 +13,7 @@ module CarrierWave
         if file.respond_to?(:url) and not file.url.blank?
           file.url
         elsif current_path
-          File.expand_path(current_path).gsub(File.expand_path(public), '')
+          File.expand_path(current_path).gsub(File.expand_path(root), '')
         end
       end
 

data/lib/carrierwave/uploader/versions.rb

@@ -4,6 +4,8 @@ module CarrierWave
   module Uploader
     module Versions
 
+      depends_on CarrierWave::Uploader::Callbacks
+
       setup do
         after :cache, :cache_versions!
         after :store, :store_versions!
@@ -128,10 +130,7 @@ module CarrierWave
       end
 
       def remove_versions!
-        versions.each do |name, v|
-          CarrierWave.logger.info "CarrierWave: removing file for version #{v.version_name}"
-          v.remove!
-        end
+        versions.each { |name, v| v.remove! }
       end
 
       def retrieve_versions_from_cache!(cache_name)

data/rails_generators/uploader/templates/uploader.rb

@@ -16,9 +16,9 @@ class <%= class_name %>Uploader < CarrierWave::Uploader::Base
     "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
   end
 
-  # Provide a default path as a default if there hasn't been a file uploaded
-  #     def default_path
-  #       "images/fallback/" + [version_name, "default.png"].compact.join('_')
+  # Provide a default URL as a default if there hasn't been a file uploaded
+  #     def default_url
+  #       "/images/fallback/" + [version_name, "default.png"].compact.join('_')
   #     end
 
   # Process files as they are uploaded.
@@ -41,7 +41,7 @@ class <%= class_name %>Uploader < CarrierWave::Uploader::Base
 
   # Override the filename of the uploaded files
   #     def filename
-  #       "something.jpg"
+  #       "something.jpg" if original_filename
   #     end
 
 end