locomotive_carrierwave 0.5.0.1 → 0.5.4.beta1

data/lib/carrierwave/storage/grid_fs.rb

@@ -11,7 +11,7 @@ module CarrierWave
     # connection or you reuse an existing connection.
     #
     # Creating a connection looks something like this:
-    # 
+    #
     #     CarrierWave.configure do |config|
     #       config.storage = :grid_fs
     #       config.grid_fs_host = "your-host.com"
@@ -23,7 +23,7 @@ module CarrierWave
     #     end
     #
     #   In the above example your documents url will look like:
-    #   
+    #
     #      http://your-app.com/images/:document-identifier-here
     #
     # When you already have a Mongo connection object (for example through Mongoid)
@@ -45,7 +45,7 @@ module CarrierWave
         end
 
         def path
-          nil
+          @path
         end
 
         def url
@@ -61,7 +61,7 @@ module CarrierWave
         end
 
         def write(file)
-          grid.open(@uploader.store_path, 'w', :content_type => file.content_type) do |f| 
+          grid.open(@uploader.store_path, 'w', :content_type => file.content_type) do |f|
             f.write(file.read)
           end
         end
@@ -73,7 +73,7 @@ module CarrierWave
         def content_type
           grid.open(@path, 'r').content_type
         end
-        
+
         def file_length
           grid.open(@path, 'r').file_length
         end
@@ -92,7 +92,7 @@ module CarrierWave
             db
           end
         end
-        
+
         def grid
           @grid ||= Mongo::GridFileSystem.new(database)
         end

data/lib/carrierwave/storage/s3.rb

@@ -53,6 +53,19 @@ module CarrierWave
     #
     #     http://bucketname.domain.tld.s3.amazonaws.com/path/to/file
     #
+    # You can specify a region. US Standard "us-east-1" is the default.
+    #
+    #     CarrierWave.configure do |config|
+    #       config.s3_region = 'eu-west-1'
+    #     end
+    #
+    # Available options are defined in Fog Storage[http://github.com/geemus/fog/blob/master/lib/fog/aws/storage.rb]
+    #
+    #     'eu-west-1' => 's3-eu-west-1.amazonaws.com'
+    #     'us-east-1' => 's3.amazonaws.com'
+    #     'ap-southeast-1' => 's3-ap-southeast-1.amazonaws.com'
+    #     'us-west-1' => 's3-us-west-1.amazonaws.com'
+    #
     class S3 < Abstract
 
       class File
@@ -94,17 +107,6 @@ module CarrierWave
           connection.delete_object(bucket, @path)
         end
 
-        def rename(new_path)
-          file = connection.put_object(bucket, new_path, read,
-            {
-              'x-amz-acl' => access_policy.to_s.gsub('_', '-'),
-              'Content-Type' => content_type
-            }.merge(@uploader.s3_headers)
-          )
-          delete
-          file
-        end
-
         ##
         # Returns the url on Amazon's S3 service
         #
@@ -121,15 +123,16 @@ module CarrierWave
         end
 
         def public_url
+          scheme = use_ssl? ? 'https' : 'http'
           if cnamed?
-            ["http://#{bucket}", path].compact.join('/')
+            ["#{scheme}://#{bucket}", path].compact.join('/')
           else
-            ["http://#{bucket}.s3.amazonaws.com", path].compact.join('/')
+            ["#{scheme}://#{bucket}.s3.amazonaws.com", path].compact.join('/')
           end
         end
 
         def authenticated_url
-          connection.get_object_url(bucket, path, Time.now + 60 * 10)
+          connection.get_object_url(bucket, path, Time.now + authentication_timeout)
         end
 
         def store(file)
@@ -165,6 +168,10 @@ module CarrierWave
 
       private
 
+        def use_ssl?
+          @uploader.s3_use_ssl
+        end
+
         def cnamed?
           @uploader.s3_cnamed
         end
@@ -177,6 +184,10 @@ module CarrierWave
           @uploader.s3_bucket
         end
 
+        def authentication_timeout
+          @uploader.s3_authentication_timeout
+        end
+
         def connection
           @base.connection
         end
@@ -214,30 +225,16 @@ module CarrierWave
         CarrierWave::Storage::S3::File.new(uploader, self, uploader.store_path(identifier))
       end
 
-      ##
-      # Rename a file on S3
-      #
-      # === Parameters
-      #
-      # [file (CarrierWave::Storage::S3::File)] the file to rename
-      #
-      # === Returns
-      #
-      # [CarrierWave::Storage::S3::File] the renamed file
-      #
-      def rename!(file)
-        path = uploader.store_path
-        file.rename(path)
-        CarrierWave::Storage::S3::File.new(uploader, self, path)
-      end
-
       def connection
-        @connection ||= Fog::AWS::Storage.new(
-          :aws_access_key_id => uploader.s3_access_key_id,
-          :aws_secret_access_key => uploader.s3_secret_access_key
+        @connection ||= ::Fog::Storage.new(
+          :aws_access_key_id      => uploader.s3_access_key_id,
+          :aws_secret_access_key  => uploader.s3_secret_access_key,
+          :provider               => 'AWS',
+          :region                 => uploader.s3_region
         )
       end
 
     end # S3
   end # Storage
 end # CarrierWave
+

data/lib/carrierwave/test/matchers.rb

@@ -154,7 +154,7 @@ module CarrierWave
         end
 
         def initialize(filename)
-          @image = ::MiniMagick::Image.from_file(filename)
+          @image = ::MiniMagick::Image.open(filename)
         end
       end
 

data/lib/carrierwave/uploader.rb

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

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 - (60*60*24))
+            if time < (Time.now.utc - seconds)
               FileUtils.rm_rf(dir)
             end
           end
@@ -63,6 +63,19 @@ module CarrierWave
         @cache_id
       end
 
+      ##
+      # Caches the remotely stored file
+      #
+      # This is useful when about to process images. Most processing solutions
+      # require the file to be stored on the local filesystem.
+      #
+      def cache_stored_file!
+        sanitized = SanitizedFile.new :tempfile => StringIO.new(file.read),
+          :filename => File.basename(path), :content_type => file.content_type
+
+        cache! sanitized
+      end
+
       ##
       # Returns a String which uniquely identifies the currently cached file for later retrieval
       #
@@ -87,12 +100,11 @@ module CarrierWave
       #
       def cache!(new_file)
         new_file = CarrierWave::SanitizedFile.new(new_file)
-        raise CarrierWave::FormNotMultipart if new_file.is_path? && ensure_multipart_form
 
         unless new_file.empty?
-          with_callbacks(:cache, new_file) do
-            @original_file ||= self.file.clone if self.file
+          raise CarrierWave::FormNotMultipart if new_file.is_path? && ensure_multipart_form
 
+          with_callbacks(:cache, new_file) do
             self.cache_id = CarrierWave.generate_cache_id unless cache_id
 
             @filename = new_file.filename
@@ -118,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
 
@@ -139,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/callbacks.rb

@@ -6,33 +6,27 @@ module CarrierWave
       extend ActiveSupport::Concern
 
       included do
-        class_inheritable_accessor :_before_callbacks, :_after_callbacks
+        class_attribute :_before_callbacks, :_after_callbacks,
+          :instance_writer => false
+        self._before_callbacks = Hash.new []
+        self._after_callbacks = Hash.new []
       end
 
       def with_callbacks(kind, *args)
-        self.class._before_callbacks_for(kind).each { |callback| self.send(callback, *args) }
+        self.class._before_callbacks[kind].each { |c| send c, *args }
         yield
-        self.class._after_callbacks_for(kind).each { |callback| self.send(callback, *args) }
+        self.class._after_callbacks[kind].each { |c| send c, *args }
       end
 
       module ClassMethods
-        
-        def _before_callbacks_for(kind) #:nodoc:
-          (self._before_callbacks || { kind => [] })[kind] || []
-        end
-
-        def _after_callbacks_for(kind) #:nodoc:
-          (self._after_callbacks || { kind => [] })[kind] || []
-        end
-
-        def before(kind, callback)          
-          self._before_callbacks ||= {}
-          self._before_callbacks[kind] = _before_callbacks_for(kind) + [callback]
+        def before(kind, callback)
+          self._before_callbacks = self._before_callbacks.
+            merge kind => _before_callbacks[kind] + [callback]
         end
 
         def after(kind, callback)
-          self._after_callbacks ||= {}
-          self._after_callbacks[kind] = _after_callbacks_for(kind) + [callback]
+          self._after_callbacks = self._after_callbacks.
+            merge kind => _after_callbacks[kind] + [callback]
         end
       end # ClassMethods
 

data/lib/carrierwave/uploader/configuration.rb

@@ -5,6 +5,8 @@ module CarrierWave
       extend ActiveSupport::Concern
 
       included do
+        class_inheritable_accessor :_storage, :instance_reader => false, :instance_writer => false
+
         add_config :root
         add_config :permissions
         add_config :storage_engines
@@ -14,10 +16,15 @@ module CarrierWave
         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
@@ -29,6 +36,16 @@ module CarrierWave
         add_config :cache_dir
         add_config :enable_processing
         add_config :ensure_multipart_form
+        add_config :delete_tmp_file_after_storage
+        add_config :remove_previously_stored_files_after_update
+
+        # fog
+        add_config :fog_attributes
+        add_config :fog_credentials
+        add_config :fog_directory
+        add_config :fog_host
+        add_config :fog_public
+        add_config :fog_authenticated_url_expiration
 
         # Mounting
         add_config :ignore_integrity_errors
@@ -37,31 +54,8 @@ module CarrierWave
         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",
-            :cloud_files => "CarrierWave::Storage::CloudFiles"
-          }
-          config.storage = :file
-          config.s3_headers = {}
-          config.s3_access_policy = :public_read
-          config.grid_fs_database = 'carrierwave'
-          config.grid_fs_host = 'localhost'
-          config.grid_fs_port = 27017
-          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
-          config.ensure_multipart_form = true
-        end
+        # set default values
+        reset_config
       end
 
       module ClassMethods
@@ -90,19 +84,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)
@@ -126,6 +114,46 @@ module CarrierWave
         def configure
           yield self
         end
+
+        ##
+        # sets configuration back to default
+        #
+        def reset_config
+          configure do |config|
+            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"
+            }
+            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
+            config.fog_authenticated_url_expiration = 600
+            config.store_dir = 'uploads'
+            config.cache_dir = 'uploads/tmp'
+            config.delete_tmp_file_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
+            config.validate_processing = true
+            config.root = CarrierWave.root
+            config.enable_processing = true
+            config.ensure_multipart_form = true
+          end
+        end
       end
 
     end