paperclip-cloudfiles 2.3.2 → 2.3.8

data/lib/paperclip/storage.rb

@@ -1,371 +1,3 @@
-module Paperclip
-  module Storage
-
-    # The default place to store attachments is in the filesystem. Files on the local
-    # filesystem can be very easily served by Apache without requiring a hit to your app.
-    # They also can be processed more easily after they've been saved, as they're just
-    # normal files. There is one Filesystem-specific option for has_attached_file.
-    # * +path+: The location of the repository of attachments on disk. This can (and, in
-    #   almost all cases, should) be coordinated with the value of the +url+ option to
-    #   allow files to be saved into a place where Apache can serve them without
-    #   hitting your app. Defaults to
-    #   ":rails_root/public/:attachment/:id/:style/:basename.:extension"
-    #   By default this places the files in the app's public directory which can be served
-    #   directly. If you are using capistrano for deployment, a good idea would be to
-    #   make a symlink to the capistrano-created system directory from inside your app's
-    #   public directory.
-    #   See Paperclip::Attachment#interpolate for more information on variable interpolaton.
-    #     :path => "/var/app/attachments/:class/:id/:style/:basename.:extension"
-    module Filesystem
-      def self.extended base
-      end
-
-      def exists?(style_name = default_style)
-        if original_filename
-          File.exist?(path(style_name))
-        else
-          false
-        end
-      end
-
-      # Returns representation of the data of the file assigned to the given
-      # style, in the format most representative of the current storage.
-      def to_file style_name = default_style
-        @queued_for_write[style_name] || (File.new(path(style_name), 'rb') if exists?(style_name))
-      end
-
-      def flush_writes #:nodoc:
-        @queued_for_write.each do |style_name, file|
-          file.close
-          FileUtils.mkdir_p(File.dirname(path(style_name)))
-          log("saving #{path(style_name)}")
-          FileUtils.mv(file.path, path(style_name))
-          FileUtils.chmod(0644, path(style_name))
-        end
-        @queued_for_write = {}
-      end
-
-      def flush_deletes #:nodoc:
-        @queued_for_delete.each do |path|
-          begin
-            log("deleting #{path}")
-            FileUtils.rm(path) if File.exist?(path)
-          rescue Errno::ENOENT => e
-            # ignore file-not-found, let everything else pass
-          end
-          begin
-            while(true)
-              path = File.dirname(path)
-              FileUtils.rmdir(path)
-            end
-          rescue Errno::EEXIST, Errno::ENOTEMPTY, Errno::ENOENT, Errno::EINVAL, Errno::ENOTDIR
-            # Stop trying to remove parent directories
-          rescue SystemCallError => e
-            log("There was an unexpected error while deleting directories: #{e.class}")
-            # Ignore it
-          end
-        end
-        @queued_for_delete = []
-      end
-    end
-
-    # Amazon's S3 file hosting service is a scalable, easy place to store files for
-    # distribution. You can find out more about it at http://aws.amazon.com/s3
-    # There are a few S3-specific options for has_attached_file:
-    # * +s3_credentials+: Takes a path, a File, or a Hash. The path (or File) must point
-    #   to a YAML file containing the +access_key_id+ and +secret_access_key+ that Amazon
-    #   gives you. You can 'environment-space' this just like you do to your
-    #   database.yml file, so different environments can use different accounts:
-    #     development:
-    #       access_key_id: 123...
-    #       secret_access_key: 123...
-    #     test:
-    #       access_key_id: abc...
-    #       secret_access_key: abc...
-    #     production:
-    #       access_key_id: 456...
-    #       secret_access_key: 456...
-    #   This is not required, however, and the file may simply look like this:
-    #     access_key_id: 456...
-    #     secret_access_key: 456...
-    #   In which case, those access keys will be used in all environments. You can also
-    #   put your bucket name in this file, instead of adding it to the code directly.
-    #   This is useful when you want the same account but a different bucket for
-    #   development versus production.
-    # * +s3_permissions+: This is a String that should be one of the "canned" access
-    #   policies that S3 provides (more information can be found here:
-    #   http://docs.amazonwebservices.com/AmazonS3/2006-03-01/RESTAccessPolicy.html#RESTCannedAccessPolicies)
-    #   The default for Paperclip is :public_read.
-    # * +s3_protocol+: The protocol for the URLs generated to your S3 assets. Can be either
-    #   'http' or 'https'. Defaults to 'http' when your :s3_permissions are :public_read (the
-    #   default), and 'https' when your :s3_permissions are anything else.
-    # * +s3_headers+: A hash of headers such as {'Expires' => 1.year.from_now.httpdate}
-    # * +bucket+: This is the name of the S3 bucket that will store your files. Remember
-    #   that the bucket must be unique across all of Amazon S3. If the bucket does not exist
-    #   Paperclip will attempt to create it. The bucket name will not be interpolated.
-    #   You can define the bucket as a Proc if you want to determine it's name at runtime.
-    #   Paperclip will call that Proc with attachment as the only argument.
-    # * +s3_host_alias+: The fully-qualified domain name (FQDN) that is the alias to the
-    #   S3 domain of your bucket. Used with the :s3_alias_url url interpolation. See the
-    #   link in the +url+ entry for more information about S3 domains and buckets.
-    # * +url+: There are three options for the S3 url. You can choose to have the bucket's name
-    #   placed domain-style (bucket.s3.amazonaws.com) or path-style (s3.amazonaws.com/bucket).
-    #   Lastly, you can specify a CNAME (which requires the CNAME to be specified as
-    #   :s3_alias_url. You can read more about CNAMEs and S3 at
-    #   http://docs.amazonwebservices.com/AmazonS3/latest/index.html?VirtualHosting.html
-    #   Normally, this won't matter in the slightest and you can leave the default (which is
-    #   path-style, or :s3_path_url). But in some cases paths don't work and you need to use
-    #   the domain-style (:s3_domain_url). Anything else here will be treated like path-style.
-    #   NOTE: If you use a CNAME for use with CloudFront, you can NOT specify https as your
-    #   :s3_protocol; This is *not supported* by S3/CloudFront. Finally, when using the host
-    #   alias, the :bucket parameter is ignored, as the hostname is used as the bucket name
-    #   by S3.
-    # * +path+: This is the key under the bucket in which the file will be stored. The
-    #   URL will be constructed from the bucket and the path. This is what you will want
-    #   to interpolate. Keys should be unique, like filenames, and despite the fact that
-    #   S3 (strictly speaking) does not support directories, you can still use a / to
-    #   separate parts of your file name.
-    module S3
-      def self.extended base
-        begin
-          require 'aws/s3'
-        rescue LoadError => e
-          e.message << " (You may need to install the aws-s3 gem)"
-          raise e
-        end
-
-        base.instance_eval do
-          @s3_credentials = parse_credentials(@options[:s3_credentials])
-          @bucket         = @options[:bucket]         || @s3_credentials[:bucket]
-          @bucket         = @bucket.call(self) if @bucket.is_a?(Proc)
-          @s3_options     = @options[:s3_options]     || {}
-          @s3_permissions = @options[:s3_permissions] || :public_read
-          @s3_protocol    = @options[:s3_protocol]    || (@s3_permissions == :public_read ? 'http' : 'https')
-          @s3_headers     = @options[:s3_headers]     || {}
-          @s3_host_alias  = @options[:s3_host_alias]
-          @url            = ":s3_path_url" unless @url.to_s.match(/^:s3.*url$/)
-          AWS::S3::Base.establish_connection!( @s3_options.merge(
-            :access_key_id => @s3_credentials[:access_key_id],
-            :secret_access_key => @s3_credentials[:secret_access_key]
-          ))
-        end
-        Paperclip.interpolates(:s3_alias_url) do |attachment, style|
-          "#{attachment.s3_protocol}://#{attachment.s3_host_alias}/#{attachment.path(style).gsub(%r{^/}, "")}"
-        end
-        Paperclip.interpolates(:s3_path_url) do |attachment, style|
-          "#{attachment.s3_protocol}://s3.amazonaws.com/#{attachment.bucket_name}/#{attachment.path(style).gsub(%r{^/}, "")}"
-        end
-        Paperclip.interpolates(:s3_domain_url) do |attachment, style|
-          "#{attachment.s3_protocol}://#{attachment.bucket_name}.s3.amazonaws.com/#{attachment.path(style).gsub(%r{^/}, "")}"
-        end
-      end
-
-      def expiring_url(time = 3600)
-        AWS::S3::S3Object.url_for(path, bucket_name, :expires_in => time )
-      end
-
-      def bucket_name
-        @bucket
-      end
-
-      def s3_host_alias
-        @s3_host_alias
-      end
-
-      def parse_credentials creds
-        creds = find_credentials(creds).stringify_keys
-        (creds[Rails.env] || creds).symbolize_keys
-      end
-
-      def exists?(style = default_style)
-        if original_filename
-          AWS::S3::S3Object.exists?(path(style), bucket_name)
-        else
-          false
-        end
-      end
-
-      def s3_protocol
-        @s3_protocol
-      end
-
-      # Returns representation of the data of the file assigned to the given
-      # style, in the format most representative of the current storage.
-      def to_file style = default_style
-        return @queued_for_write[style] if @queued_for_write[style]
-        file = Tempfile.new(path(style))
-        file.write(AWS::S3::S3Object.value(path(style), bucket_name))
-        file.rewind
-        return file
-      end
-
-      def flush_writes #:nodoc:
-        @queued_for_write.each do |style, file|
-          begin
-            log("saving #{path(style)}")
-            AWS::S3::S3Object.store(path(style),
-                                    file,
-                                    bucket_name,
-                                    {:content_type => instance_read(:content_type),
-                                     :access => @s3_permissions,
-                                    }.merge(@s3_headers))
-          rescue AWS::S3::ResponseError => e
-            raise
-          end
-        end
-        @queued_for_write = {}
-      end
-
-      def flush_deletes #:nodoc:
-        @queued_for_delete.each do |path|
-          begin
-            log("deleting #{path}")
-            AWS::S3::S3Object.delete(path, bucket_name)
-          rescue AWS::S3::ResponseError
-            # Ignore this.
-          end
-        end
-        @queued_for_delete = []
-      end
-
-      def find_credentials creds
-        case creds
-        when File
-          YAML::load(ERB.new(File.read(creds.path)).result)
-        when String, Pathname
-          YAML::load(ERB.new(File.read(creds)).result)
-        when Hash
-          creds
-        else
-          raise ArgumentError, "Credentials are not a path, file, or hash."
-        end
-      end
-      private :find_credentials
-
-    end
-    
-    # Rackspace's Cloud Files service is a scalable, easy place to store files for
-    # distribution, and is integrated into the Limelight CDN. You can find out more about 
-    # it at http://www.rackspacecloud.com/cloud_hosting_products/files
-    #
-    # To install the Cloud Files gem, add the Gemcutter gem source ("gem sources -a http://gemcutter.org"), then
-    # do a "gem install cloudfiles".  For more information, see the github repository at http://github.com/rackspace/ruby-cloudfiles/
-    #
-    # There are a few Cloud Files-specific options for has_attached_file:
-    # * +cloudfiles_credentials+: Takes a path, a File, or a Hash. The path (or File) must point
-    #   to a YAML file containing the +username+ and +api_key+ that Rackspace
-    #   gives you. Rackspace customers using the cloudfiles gem >= 1.4.1 can also set a servicenet
-    #   variable to true to send traffic over the unbilled internal Rackspace service network.
-    #   You can 'environment-space' this just like you do to your
-    #   database.yml file, so different environments can use different accounts:
-    #     development:
-    #       username: hayley
-    #       api_key: a7f... 
-    #     test:
-    #       username: katherine
-    #       api_key: 7fa... 
-    #     production:
-    #       username: minter
-    #       api_key: 87k... 
-    #       servicenet: true
-    #   This is not required, however, and the file may simply look like this:
-    #     username: minter...
-    #     api_key: 11q... 
-    #   In which case, those access keys will be used in all environments. You can also
-    #   put your container name in this file, instead of adding it to the code directly.
-    #   This is useful when you want the same account but a different container for 
-    #   development versus production.
-    # * +container+: This is the name of the Cloud Files container that will store your files. 
-    #   This container should be marked "public" so that the files are available to the world at large.
-    #   If the container does not exist, it will be created and marked public.
-    # * +path+: This is the path under the container in which the file will be stored. The
-    #   CDN URL will be constructed from the CDN identifier for the container and the path. This is what 
-    #   you will want to interpolate. Keys should be unique, like filenames, and despite the fact that
-    #   Cloud Files (strictly speaking) does not support directories, you can still use a / to
-    #   separate parts of your file name, and they will show up in the URL structure.
-    module CloudFile
-      def self.extended base
-        require 'cloudfiles'
-        @@container ||= {}
-        base.instance_eval do
-          @cloudfiles_credentials = parse_credentials(@options[:cloudfiles_credentials])
-          @container_name         = @options[:container]              || @cloudfiles_credentials[:container]
-          @container_name         = @container_name.call(self) if @container_name.is_a?(Proc)
-          @cloudfiles_options     = @options[:cloudfiles_options]     || {}
-          @@cdn_url               = cloudfiles_container.cdn_url
-          @path_filename          = ":cf_path_filename" unless @url.to_s.match(/^:cf.*filename$/)
-          @url = @@cdn_url + "/#{URI.encode(@path_filename).gsub(/&/,'%26')}"
-          @path = (Paperclip::Attachment.default_options[:path] == @options[:path]) ? ":attachment/:id/:style/:basename.:extension" : @options[:path]
-        end
-          Paperclip.interpolates(:cf_path_filename) do |attachment, style|
-            attachment.path(style)
-          end
-      end
-      
-      def cloudfiles
-        @@cf ||= CloudFiles::Connection.new(@cloudfiles_credentials[:username], @cloudfiles_credentials[:api_key], true, @cloudfiles_credentials[:servicenet])
-      end
-
-      def create_container
-        container = cloudfiles.create_container(@container_name)
-        container.make_public
-        container
-      end
-      
-      def cloudfiles_container
-        @@container[@container_name] ||= create_container
-      end
-
-      def container_name
-        @container_name
-      end
-
-      def parse_credentials creds
-        creds = find_credentials(creds).stringify_keys
-        (creds[RAILS_ENV] || creds).symbolize_keys
-      end
-      
-      def exists?(style = default_style)
-        cloudfiles_container.object_exists?(path(style))
-      end
-
-      # Returns representation of the data of the file assigned to the given
-      # style, in the format most representative of the current storage.
-      def to_file style = default_style
-        @queued_for_write[style] || cloudfiles_container.create_object(path(style))
-      end
-      alias_method :to_io, :to_file
-
-      def flush_writes #:nodoc:
-        @queued_for_write.each do |style, file|
-            object = cloudfiles_container.create_object(path(style),false)
-            object.write(file)
-        end
-        @queued_for_write = {}
-      end
-
-      def flush_deletes #:nodoc:
-        @queued_for_delete.each do |path|
-          cloudfiles_container.delete_object(path)
-        end
-        @queued_for_delete = []
-      end
-      
-      def find_credentials creds
-        case creds
-        when File
-          YAML.load_file(creds.path)
-        when String
-          YAML.load_file(creds)
-        when Hash
-          creds
-        else
-          raise ArgumentError, "Credentials are not a path, file, or hash."
-        end
-      end
-      private :find_credentials
-
-    end
-    
-  end
-end
+require "paperclip/storage/filesystem"
+require "paperclip/storage/s3"
+require "paperclip/storage/cloud_files"

data/lib/paperclip/style.rb

@@ -3,7 +3,7 @@ module Paperclip
   # The Style class holds the definition of a thumbnail style,  applying
   # whatever processing is required to normalize the definition and delaying
   # the evaluation of block parameters until useful context is available.
-  
+
   class Style
 
     attr_reader :name, :attachment, :format
@@ -25,7 +25,7 @@ module Paperclip
       end
       @format  = nil if @format.blank?
     end
-    
+
     # retrieves from the attachment the processors defined in the has_attached_file call
     # (which method (in the attachment) will call any supplied procs)
     # There is an important change of interface here: a style rule can set its own processors
@@ -33,17 +33,17 @@ module Paperclip
     def processors
       @processors || attachment.processors
     end
-    
+
     # retrieves from the attachment the whiny setting
     def whiny
       attachment.whiny
     end
-    
+
     # returns true if we're inclined to grumble
     def whiny?
       !!whiny
     end
-    
+
     def convert_options
       attachment.send(:extra_options_for, name)
     end
@@ -55,7 +55,7 @@ module Paperclip
     end
 
     # Supplies the hash of options that processors expect to receive as their second argument
-    # Arguments other than the standard geometry, format etc are just passed through from 
+    # Arguments other than the standard geometry, format etc are just passed through from
     # initialization and any procs are called here, just before post-processing.
     def processor_options
       args = {}
@@ -63,7 +63,7 @@ module Paperclip
         args[k] = v.respond_to?(:call) ? v.call(attachment) : v
       end
       [:processors, :geometry, :format, :whiny, :convert_options].each do |k|
-        (arg = send(k)) && args[k] = arg 
+        (arg = send(k)) && args[k] = arg
       end
       args
     end
@@ -71,13 +71,13 @@ module Paperclip
     # Supports getting and setting style properties with hash notation to ensure backwards-compatibility
     # eg. @attachment.styles[:large][:geometry]@ will still work
     def [](key)
-      if [:name, :convert_options, :whiny, :processors, :geometry, :format].include?(key) 
+      if [:name, :convert_options, :whiny, :processors, :geometry, :format].include?(key)
         send(key)
       elsif defined? @other_args[key]
         @other_args[key]
       end
     end
-    
+
     def []=(key, value)
       if [:name, :convert_options, :whiny, :processors, :geometry, :format].include?(key)
         send("#{key}=".intern, value)
@@ -85,6 +85,6 @@ module Paperclip
         @other_args[key] = value
       end
     end
-    
+
   end
-end
+end

data/lib/paperclip/thumbnail.rb

@@ -9,10 +9,10 @@ module Paperclip
     # which is a "WxH"-style string. +format+ will be inferred from the +file+
     # unless specified. Thumbnail creation will raise no errors unless
     # +whiny+ is true (which it is, by default. If +convert_options+ is
-    # set, the options will be appended to the convert command upon image conversion 
+    # set, the options will be appended to the convert command upon image conversion
     def initialize file, options = {}, attachment = nil
       super
-      
+
       geometry             = options[:geometry]
       @file                = file
       @crop                = geometry[-1,1] == '#'
@@ -28,14 +28,14 @@ module Paperclip
 
       @current_format      = File.extname(@file.path)
       @basename            = File.basename(@file.path, @current_format)
-      
+
     end
 
     # Returns true if the +target_geometry+ is meant to crop.
     def crop?
       @crop
     end
-    
+
     # Returns true if the image is meant to make use of additional convert options.
     def convert_options?
       !@convert_options.nil? && !@convert_options.empty?
@@ -45,19 +45,20 @@ module Paperclip
     # that contains the new image.
     def make
       src = @file
-      dst = Tempfile.new([@basename, @format].compact.join("."))
+      dst = Tempfile.new([@basename, @format ? ".#{@format}" : ''])
       dst.binmode
 
       begin
-        options = [
-          source_file_options,
-          "#{ File.expand_path(src.path) }[0]",
-          transformation_command,
-          convert_options,
-          "#{ File.expand_path(dst.path) }"
-        ].flatten.compact
+        parameters = []
+        parameters << source_file_options
+        parameters << ":source"
+        parameters << transformation_command
+        parameters << convert_options
+        parameters << ":dest"
+
+        parameters = parameters.flatten.compact.join(" ").strip.squeeze(" ")
 
-        success = Paperclip.run("convert", *options)
+        success = Paperclip.run("convert", parameters, :source => "#{File.expand_path(src.path)}[0]", :dest => File.expand_path(dst.path))
       rescue PaperclipCommandLineError => e
         raise PaperclipError, "There was an error processing the thumbnail for #{@basename}" if @whiny
       end
@@ -70,8 +71,8 @@ module Paperclip
     def transformation_command
       scale, crop = @current_geometry.transformation_to(@target_geometry, crop?)
       trans = []
-      trans << "-resize" << scale unless scale.nil? || scale.empty?
-      trans << "-crop" << crop << "+repage" if crop
+      trans << "-resize" << %["#{scale}"] unless scale.nil? || scale.empty?
+      trans << "-crop" << %["#{crop}"] << "+repage" if crop
       trans
     end
   end

data/lib/paperclip/upfile.rb

@@ -17,7 +17,7 @@ module Paperclip
       when "csv", "xml", "css"       then "text/#{type}"
       else
         # On BSDs, `file` doesn't give a result code of 1 if the file doesn't exist.
-        content_type = (Paperclip.run("file", "--mime-type", self.path).split(':').last.strip rescue "application/x-#{type}")
+        content_type = (Paperclip.run("file", "-b --mime-type :file", :file => self.path).split(':').last.strip rescue "application/x-#{type}")
         content_type = "application/x-#{type}" if content_type.match(/\(.*?\)/)
         content_type
       end
@@ -37,17 +37,19 @@ end
 
 if defined? StringIO
   class StringIO
-    attr_accessor :original_filename, :content_type
+    attr_accessor :original_filename, :content_type, :fingerprint
     def original_filename
       @original_filename ||= "stringio.txt"
     end
     def content_type
       @content_type ||= "text/plain"
     end
+    def fingerprint
+      @fingerprint ||= Digest::MD5.hexdigest(self.string)
+    end
   end
 end
 
 class File #:nodoc:
   include Paperclip::Upfile
 end
-

data/lib/paperclip/version.rb

@@ -0,0 +1,3 @@
+module Paperclip
+  VERSION = "2.3.8" unless defined? Paperclip::VERSION
+end