durran-carrierwave 0.3.2.3 → 0.4.3

data/lib/carrierwave/processing/rmagick.rb

@@ -1,10 +1,12 @@
 # encoding: utf-8
 
-unless Module.const_defined?('Magick')
+unless defined? Magick 
   begin
     require 'rmagick'
   rescue LoadError
     require 'RMagick'
+  rescue LoadError
+    puts "WARNING: Failed to require rmagick, image processing may fail!"
   end
 end
 
@@ -175,8 +177,6 @@ module CarrierWave
       end
     end
 
-    alias_method :resize, :resize_to_fit
-
     ##
     # From the RMagick documentation: "Resize the image to fit within the
     # specified dimensions while retaining the aspect ratio of the original
@@ -195,14 +195,12 @@ module CarrierWave
     #
     def resize_to_fill(width, height)
       manipulate! do |img|
-        img.resize_to_fill!(width, height)
+        img.crop_resized!(width, height)
         img = yield(img) if block_given?
         img
       end
     end
 
-    alias_method :crop_resized, :resize_to_fill
-
     ##
     # Resize the image to fit within the specified dimensions while retaining
     # the original aspect ratio. If necessary, will pad the remaining area

data/lib/carrierwave/sanitized_file.rb

@@ -254,18 +254,19 @@ module CarrierWave
       return name.downcase
     end
 
-    def split_extension(fn)
+    def split_extension(filename)
       # regular expressions to try for identifying extensions
-      ext_regexps = [
-        /\A(.+)\.([^\.]{1,3}\.[^\.]{1,4})\z/, # matches "something.tar.gz"
+      extension_matchers = [
+        /\A(.+)\.(tar\.gz)\z/, # matches "something.tar.gz"
         /\A(.+)\.([^\.]+)\z/ # matches "something.jpg"
       ]
-      ext_regexps.each do |regexp|
-        if fn =~ regexp
+
+      extension_matchers.each do |regexp|
+        if filename =~ regexp
           return $1, $2
         end
       end
-      return fn, "" # In case we weren't able to split the extension
+      return filename, "" # In case we weren't able to split the extension
     end
 
   end # SanitizedFile

data/lib/carrierwave/storage/abstract.rb

@@ -15,8 +15,6 @@ module CarrierWave
         @uploader = uploader
       end
 
-      def self.setup!; end
-
       def identifier
         uploader.filename
       end

data/lib/carrierwave/storage/file.rb

@@ -22,9 +22,8 @@ module CarrierWave
       # [CarrierWave::SanitizedFile] a sanitized file
       #
       def store!(file)
-        path = ::File.join(uploader.store_path)
-        path = ::File.expand_path(path, uploader.public)
-        file.move_to(path, CarrierWave.config[:permissions])
+        path = ::File.expand_path(uploader.store_path, uploader.root)
+        file.move_to(path, uploader.permissions)
         file
       end
 
@@ -40,8 +39,7 @@ module CarrierWave
       # [CarrierWave::SanitizedFile] a sanitized file
       #
       def retrieve!(identifier)
-        path = ::File.join(uploader.store_path(identifier))
-        path = ::File.expand_path(path, uploader.public)
+        path = ::File.expand_path(uploader.store_path(identifier), uploader.root)
         CarrierWave::SanitizedFile.new(path)
       end
 

data/lib/carrierwave/storage/grid_fs.rb

@@ -0,0 +1,92 @@
+# encoding: utf-8
+require 'mongo'
+require 'mongo/gridfs'
+
+module CarrierWave
+  module Storage
+
+    ##
+    # The GridFS store uses MongoDB's GridStore file storage system to store files
+    #
+    class GridFS < Abstract
+
+      class File
+
+        def initialize(uploader, database, path)
+          @database = database
+          @path = path
+          @uploader = uploader
+        end
+
+        def path
+          nil
+        end
+
+        def url
+          unless @uploader.grid_fs_access_url
+            nil
+          else
+            [@uploader.grid_fs_access_url, @path].join("/")
+          end
+        end
+
+        def read
+          ::GridFS::GridStore.read(@database, @path)
+        end
+
+        def delete
+          ::GridFS::GridStore.unlink(@database, @path)
+        end
+
+      end
+
+      ##
+      # Store the file in MongoDB's GridFS GridStore
+      #
+      # === Parameters
+      #
+      # [file (CarrierWave::SanitizedFile)] the file to store
+      #
+      # === Returns
+      #
+      # [CarrierWave::SanitizedFile] a sanitized file
+      #
+      def store!(file)
+        ::GridFS::GridStore.open(database, uploader.store_path, 'w') do |f|
+          f.write file.read
+        end
+        CarrierWave::Storage::GridFS::File.new(uploader, database, uploader.store_path)
+      end
+
+      ##
+      # Retrieve the file from MongoDB's GridFS GridStore
+      #
+      # === Parameters
+      #
+      # [identifier (String)] the filename of the file
+      #
+      # === Returns
+      #
+      # [CarrierWave::Storage::GridFS::File] a sanitized file
+      #
+      def retrieve!(identifier)
+        CarrierWave::Storage::GridFS::File.new(uploader, database, uploader.store_path(identifier))
+      end
+
+    private
+
+      def database
+        @connection ||= begin
+          host = uploader.grid_fs_host
+          database = uploader.grid_fs_database
+          username = uploader.grid_fs_username
+          password = uploader.grid_fs_password
+          db = Mongo::Connection.new(host).db(database)
+          db.authenticate(username, password) if username && password
+          db
+        end
+      end
+
+    end # File
+  end # Storage
+end # CarrierWave

data/lib/carrierwave/storage/right_s3.rb

@@ -0,0 +1,183 @@
+# encoding: utf-8
+require 'right_aws'
+
+module CarrierWave
+  module Storage
+
+    ##
+    # Uploads things to Amazon S3 webservices using the RightAWS libraries (right_aws gem). 
+    # In order for CarrierWave to connect to Amazon S3, you'll need to specify an access key id, secret key
+    # and bucket
+    #
+    #     CarrierWave.configure do |config|
+    #       config.s3_access_key_id = "xxxxxx"
+    #       config.s3_secret_access_key = "xxxxxx"
+    #       config.s3_bucket = "my_bucket_name"
+    #     end
+    #
+    # The RightAWS::S3Interface is used directly as opposed to the normal RightAWS::S3::Bucket et.al. classes.
+    # This gives much improved performance and avoids unnecessary requests.
+    #
+    # You can set the access policy for the uploaded files:
+    #
+    #     CarrierWave.configure do |config|
+    #       config.s3_access_policy = 'public-read'
+    #     end
+    #
+    # The default is 'public-read'. For more options see:
+    #
+    # http://docs.amazonwebservices.com/AmazonS3/latest/RESTAccessPolicy.html#RESTCannedAccessPolicies
+    #
+    # You can change the generated url to a cnamed domain by setting the cnamed config:
+    #
+    #     CarrierWave.configure do |config|
+    #       config.s3_cnamed = true
+    #       config.s3_bucket = 'bucketname.domain.tld'
+    #     end
+    #
+    # Now the resulting url will be
+    #     
+    #     http://bucketname.domain.tld/path/to/file
+    #
+    # instead of
+    #
+    #     http://bucketname.domain.tld.s3.amazonaws.com/path/to/file
+    #
+    class RightS3 < Abstract
+
+      class File
+
+        def initialize(uploader, base, path)
+          @uploader = uploader
+          @path = path
+          @base = base
+        end
+
+        ##
+        # Returns the current path of the file on S3
+        #
+        # === Returns
+        #
+        # [String] A path
+        #
+        def path
+          @path
+        end
+
+        ##
+        # Reads the contents of the file from S3
+        #
+        # === Returns
+        #
+        # [String] contents of the file
+        #
+        def read
+          result = connection.get(bucket, @path)
+          headers["content-type"] = result[:headers]["content-type"]
+          result[:object]
+        end
+
+        ##
+        # Remove the file from Amazon S3
+        #
+        def delete
+          connection.delete(bucket, @path)
+        end
+
+        ##
+        # Returns the url on Amazon's S3 service
+        #
+        # === Returns
+        #
+        # [String] file's url
+        #
+        def url
+          if @uploader.s3_cnamed
+            ["http://", @uploader.s3_bucket, @path].compact.join('/')
+          else
+            ["http://#{@uploader.s3_bucket}.s3.amazonaws.com", @path].compact.join('/')
+          end
+        end
+
+        #def about
+        #  s3_object.about
+        #end
+
+        #def metadata
+        #  s3_object.metadata
+        #end
+
+        def content_type
+          headers["content-type"]
+        end
+
+        def content_type=(new_content_type)
+          headers["content-type"] = new_content_type
+        end
+
+        #def content_disposition
+        #  s3_object.content_disposition
+        #end
+
+        #def content_disposition=(new_disposition)
+        #  s3_object.content_disposition = new_disposition
+        #end
+
+        def store(data)
+          connection.put(bucket, @path, data, headers)
+        end
+
+        private
+
+          def headers
+            @headers ||= { 'x-amz-acl' => @uploader.s3_access_policy }
+          end
+
+          def bucket
+            @uploader.s3_bucket
+          end
+
+          def connection
+            @base.connection
+          end
+
+      end
+
+      ##
+      # Store the file on S3
+      #
+      # === Parameters
+      #
+      # [file (CarrierWave::SanitizedFile)] the file to store
+      #
+      # === Returns
+      #
+      # [CarrierWave::Storage::RightS3::File] the stored file
+      #
+      def store!(file)
+        f = CarrierWave::Storage::RightS3::File.new(uploader, self, uploader.store_path)
+        f.store(file.read)
+        f
+      end
+
+      # Do something to retrieve the file
+      #
+      # @param [String] identifier uniquely identifies the file
+      #
+      # [identifier (String)] uniquely identifies the file
+      #
+      # === Returns
+      #
+      # [CarrierWave::Storage::RightS3::File] the stored file
+      #
+      def retrieve!(identifier)
+        CarrierWave::Storage::RightS3::File.new(uploader, self, uploader.store_path(identifier))
+      end
+
+      def connection
+        @connection ||= RightAws::S3Interface.new(uploader.s3_access_key_id, uploader.s3_secret_access_key)
+      end
+
+    end # RightS3
+  end # Storage
+end # CarrierWave

data/lib/carrierwave/storage/s3.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+require 'aws/s3'
 
 module CarrierWave
   module Storage
@@ -8,13 +9,17 @@ module CarrierWave
     # CarrierWave to connect to Amazon S3, you'll need to specify an access key id, secret key
     # and bucket
     #
-    #     CarrierWave.config[:s3][:access_key_id] = "xxxxxx"
-    #     CarrierWave.config[:s3][:secret_access_key] = "xxxxxx"
-    #     CarrierWave.config[:s3][:bucket] = "my_bucket_name"
+    #     CarrierWave.configure do |config|
+    #       config.s3_access_key_id = "xxxxxx"
+    #       config.s3_secret_access_key = "xxxxxx"
+    #       config.s3_bucket = "my_bucket_name"
+    #     end
     #
     # You can also set the access policy for the uploaded files:
     #
-    #     CarrierWave.config[:s3][:access] = :public_read
+    #     CarrierWave.configure do |config|
+    #       config.s3_access = :public
+    #     end
     #
     # Possible values are the 'canned access control policies' provided in the aws/s3 gem,
     # they are:
@@ -31,23 +36,26 @@ module CarrierWave
     #
     # You can change the generated url to a cnamed domain by setting the cnamed config:
     #
-    #     CarrierWave.config[:s3][:cnamed] = true
+    #     CarrierWave.configure do |config|
+    #       config.s3_cnamed = true
+    #       config.s3_bucket = 'bucketname.domain.tld'
+    #     end
     #
-    # No the resulting url will be
+    # Now the resulting url will be
     #     
-    #     http://bucket_name.domain.tld/path/to/file
+    #     http://bucketname.domain.tld/path/to/file
     #
     # instead of
     #
-    #     http://s3.amazonaws.com/bucket_name.domain.tld/path/to/file
+    #     http://s3.amazonaws.com/bucketname.domain.tld/path/to/file
     #
     class S3 < Abstract
 
       class File
 
-        def initialize(path, identifier)
+        def initialize(uploader, path)
+          @uploader = uploader
           @path = path
-          @identifier = identifier
         end
 
         ##
@@ -61,17 +69,6 @@ module CarrierWave
           @path
         end
 
-        ##
-        # Returns the filename on S3
-        #
-        # === Returns
-        #
-        # [String] path to the file
-        #
-        def identifier
-          @identifier
-        end
-
         ##
         # Reads the contents of the file from S3
         #
@@ -80,14 +77,14 @@ module CarrierWave
         # [String] contents of the file
         #
         def read
-          AWS::S3::S3Object.value @path, bucket
+          AWS::S3::S3Object.value @path, @uploader.s3_bucket
         end
 
         ##
         # Remove the file from Amazon S3
         #
         def delete
-          AWS::S3::S3Object.delete @path, bucket
+          AWS::S3::S3Object.delete @path, @uploader.s3_bucket
         end
 
         ##
@@ -98,10 +95,10 @@ module CarrierWave
         # [String] file's url
         #
         def url
-          if CarrierWave::config[:s3][:cnamed]
-            ["http://", bucket, @path].compact.join('/')
+          if @uploader.s3_cnamed 
+            ["http://", @uploader.s3_bucket, "/", @path].compact.join
           else
-            ["http://s3.amazonaws.com", bucket, @path].compact.join('/')
+            ["http://s3.amazonaws.com", @uploader.s3_bucket, @path].compact.join('/')
           end
         end
 
@@ -137,46 +134,6 @@ module CarrierWave
           @s3_object ||= AWS::S3::S3Object.find(@path, bucket)
         end
 
-
-      private
-
-        def bucket
-          CarrierWave::Storage::S3.bucket
-        end
-
-        def access
-          CarrierWave::Storage::S3.access
-        end
-
-      end
-
-      ##
-      # === Returns
-      #
-      # [String] the bucket set in the config options
-      #
-      def self.bucket
-        CarrierWave.config[:s3][:bucket]
-      end
-
-      ##
-      # === Returns
-      #
-      # [Symbol] the access priviliges the uploaded files should have
-      #
-      def self.access
-        CarrierWave.config[:s3][:access]
-      end
-
-      ##
-      # Connect to Amazon S3
-      #
-      def self.setup!
-        require 'aws/s3'
-        AWS::S3::Base.establish_connection!(
-          :access_key_id     => CarrierWave.config[:s3][:access_key_id],
-          :secret_access_key => CarrierWave.config[:s3][:secret_access_key]
-        )
       end
 
       ##
@@ -191,8 +148,9 @@ module CarrierWave
       # [CarrierWave::Storage::S3] the stored file
       #
       def store!(file)
-        AWS::S3::S3Object.store(::File.join(uploader.store_path), file.read, self.class.bucket, :access => self.class.access)
-        CarrierWave::Storage::S3::File.new(uploader.store_path, uploader.filename)
+        connect!(uploader)
+        AWS::S3::S3Object.store(uploader.store_path, file.read, uploader.s3_bucket, :access => uploader.s3_access)
+        CarrierWave::Storage::S3::File.new(uploader, uploader.store_path)
       end
 
       # Do something to retrieve the file
@@ -207,7 +165,17 @@ module CarrierWave
       # [CarrierWave::Storage::S3::File] the stored file
       #
       def retrieve!(identifier)
-        CarrierWave::Storage::S3::File.new(uploader.store_path(identifier), identifier)
+        connect!(uploader)
+        CarrierWave::Storage::S3::File.new(uploader, uploader.store_path(identifier))
+      end
+
+    private
+
+      def connect!(uploader)
+        AWS::S3::Base.establish_connection!(
+          :access_key_id     => uploader.s3_access_key_id,
+          :secret_access_key => uploader.s3_secret_access_key
+        )
       end
 
     end # S3