cloudfuji_paperclip 2.4.6 → 3.0.3

data/lib/paperclip/logger.rb

@@ -0,0 +1,21 @@
+module Paperclip
+  module Logger
+    # Log a paperclip-specific line. This will log to STDOUT
+    # by default. Set Paperclip.options[:log] to false to turn off.
+    def log message
+      logger.info("[paperclip] #{message}") if logging?
+    end
+
+    def logger #:nodoc:
+      @logger ||= options[:logger] || ::Logger.new(STDOUT)
+    end
+
+    def logger=(logger)
+      @logger = logger
+    end
+
+    def logging? #:nodoc:
+      options[:log]
+    end
+  end
+end

data/lib/paperclip/matchers/validate_attachment_content_type_matcher.rb

@@ -33,7 +33,7 @@ module Paperclip
 
         def matches? subject
           @subject = subject
-          @subject = @subject.class unless Class === @subject
+          @subject = @subject.new if @subject.class == Class
           @allowed_types && @rejected_types &&
           allowed_types_allowed? && rejected_types_rejected?
         end
@@ -61,11 +61,11 @@ module Paperclip
         protected
 
         def type_allowed?(type)
-          file = StringIO.new(".")
+          file = Paperclip.io_adapters.for(StringIO.new("."))
           file.content_type = type
-          (subject = @subject.new).attachment_for(@attachment_name).assign(file)
-          subject.valid?
-          subject.errors[:"#{@attachment_name}_content_type"].blank?
+          @subject.attachment_for(@attachment_name).assign(file)
+          @subject.valid?
+          @subject.errors[:"#{@attachment_name}_content_type"].blank?
         end
 
         def allowed_types_allowed?

data/lib/paperclip/matchers/validate_attachment_presence_matcher.rb

@@ -18,7 +18,7 @@ module Paperclip
 
         def matches? subject
           @subject = subject
-          @subject = @subject.class unless Class === @subject
+          @subject = subject.new if subject.class == Class
           error_when_not_valid? && no_error_when_valid?
         end
 
@@ -37,16 +37,16 @@ module Paperclip
         protected
 
         def error_when_not_valid?
-          (subject = @subject.new).send(@attachment_name).assign(nil)
-          subject.valid?
-          not subject.errors[:"#{@attachment_name}_file_name"].blank?
+          @subject.send(@attachment_name).assign(nil)
+          @subject.valid?
+          @subject.errors[:"#{@attachment_name}"].present?
         end
 
         def no_error_when_valid?
           @file = StringIO.new(".")
-          (subject = @subject.new).send(@attachment_name).assign(@file)
-          subject.valid?
-          subject.errors[:"#{@attachment_name}_file_name"].blank?
+          @subject.send(@attachment_name).assign(@file)
+          @subject.valid?
+          @subject.errors[:"#{@attachment_name}"].blank?
         end
       end
     end

data/lib/paperclip/matchers/validate_attachment_size_matcher.rb

@@ -18,7 +18,6 @@ module Paperclip
       class ValidateAttachmentSizeMatcher
         def initialize attachment_name
           @attachment_name = attachment_name
-          @low, @high = 0, (1.0/0)
         end
 
         def less_than size
@@ -38,7 +37,7 @@ module Paperclip
 
         def matches? subject
           @subject = subject
-          @subject = @subject.class unless Class === @subject
+          @subject = @subject.new if @subject.class == Class
           lower_than_low? && higher_than_low? && lower_than_high? && higher_than_high?
         end
 
@@ -67,27 +66,28 @@ module Paperclip
           override_method(file, :size){ new_size }
           override_method(file, :to_tempfile){ file }
 
-          (subject = @subject.new).send(@attachment_name).assign(file)
-          subject.valid?
-          subject.errors[:"#{@attachment_name}_file_size"].blank?
+          @subject.send(@attachment_name).post_processing = false
+          @subject.send(@attachment_name).assign(file)
+          @subject.valid?
+          @subject.errors[:"#{@attachment_name}_file_size"].blank?
+        ensure
+          @subject.send(@attachment_name).post_processing = true
         end
 
         def lower_than_low?
-          not passes_validation_with_size(@low - 1)
+          @low.nil? || !passes_validation_with_size(@low - 1)
         end
 
         def higher_than_low?
-          passes_validation_with_size(@low + 1)
+          @low.nil? || passes_validation_with_size(@low + 1)
         end
 
         def lower_than_high?
-          return true if @high == (1.0/0)
-          passes_validation_with_size(@high - 1)
+          @high.nil? || @high == Float::INFINITY || passes_validation_with_size(@high - 1)
         end
 
         def higher_than_high?
-          return true if @high == (1.0/0)
-          not passes_validation_with_size(@high + 1)
+          @high.nil? || @high == Float::INFINITY || !passes_validation_with_size(@high + 1)
         end
       end
     end

data/lib/paperclip/missing_attachment_styles.rb

@@ -1,7 +1,6 @@
 
 require 'set'
 module Paperclip
-
   class << self
     attr_accessor :classes_with_attachments
     attr_writer :registered_attachments_styles_path
@@ -12,7 +11,6 @@ module Paperclip
 
   self.classes_with_attachments = Set.new
 
-
   # Get list of styles saved on previous deploy (running rake paperclip:refresh:missing_styles)
   def self.get_registered_attachments_styles
     YAML.load_file(Paperclip.registered_attachments_styles_path)
@@ -49,9 +47,9 @@ module Paperclip
             current_styles[klass_sym][attachment_name.to_sym] ||= Array.new
             current_styles[klass_sym][attachment_name.to_sym] << style_name.to_sym
             current_styles[klass_sym][attachment_name.to_sym].map!(&:to_s).sort!.map!(&:to_sym).uniq!
-          end  
-        end  
-      end  
+          end
+        end
+      end
     end
   end
   private_class_method :current_attachments_styles
@@ -70,8 +68,8 @@ module Paperclip
     Hash.new.tap do |missing_styles|
       current_styles.each do |klass, attachment_definitions|
         attachment_definitions.each do |attachment_name, styles|
-          registered = registered_styles[klass][attachment_name] rescue []
-          missed = styles - registered 
+          registered = registered_styles[klass][attachment_name] || [] rescue []
+          missed = styles - registered
           if missed.present?
             klass_sym = klass.to_s.to_sym
             missing_styles[klass_sym] ||= Hash.new
@@ -80,8 +78,7 @@ module Paperclip
             missing_styles[klass_sym][attachment_name.to_sym].map!(&:to_s).sort!.map!(&:to_sym).uniq!
           end
         end
-      end  
+      end
     end
   end
-
 end

data/lib/paperclip/processor.rb

@@ -34,25 +34,40 @@ module Paperclip
     end
   end
 
-  # Due to how ImageMagick handles its image format conversion and how Tempfile
-  # handles its naming scheme, it is necessary to override how Tempfile makes
-  # its names so as to allow for file extensions. Idea taken from the comments
-  # on this blog post:
-  # http://marsorange.com/archives/of-mogrify-ruby-tempfile-dynamic-class-definitions
-  class Tempfile < ::Tempfile
-    # This is Ruby 1.8.7's implementation.
-    if RUBY_VERSION <= "1.8.6" || RUBY_PLATFORM =~ /java/
-      def make_tmpname(basename, n)
-        case basename
-        when Array
-          prefix, suffix = *basename
-        else
-          prefix, suffix = basename, ''
-        end
+  module ProcessorHelpers
+    def processor(name) #:nodoc:
+      @known_processors ||= {}
+      if @known_processors[name.to_s]
+        @known_processors[name.to_s]
+      else
+        name = name.to_s.camelize
+        load_processor(name) unless Paperclip.const_defined?(name)
+        processor = Paperclip.const_get(name)
+        @known_processors[name.to_s] = processor
+      end
+    end
 
-        t = Time.now.strftime("%y%m%d")
-        path = "#{prefix}#{t}-#{$$}-#{rand(0x100000000).to_s(36)}-#{n}#{suffix}"
+    def load_processor(name)
+      if defined?(Rails.root) && Rails.root
+        require File.expand_path(Rails.root.join("lib", "paperclip_processors", "#{name.underscore}.rb"))
       end
     end
+
+    def clear_processors!
+      @known_processors.try(:clear)
+    end
+
+    # You can add your own processor via the Paperclip configuration. Normally
+    # Paperclip will load all processors from the
+    # Rails.root/lib/paperclip_processors directory, but here you can add any
+    # existing class using this mechanism.
+    #
+    #   Paperclip.configure do |c|
+    #     c.register_processor :watermarker, WatermarkingProcessor.new
+    #   end
+    def register_processor(name, processor)
+      @known_processors ||= {}
+      @known_processors[name.to_s] = processor
+    end
   end
 end

data/lib/paperclip/railtie.rb

@@ -2,30 +2,26 @@ require 'paperclip'
 require 'paperclip/schema'
 
 module Paperclip
-  if defined? Rails::Railtie
-    require 'rails'
-    class Railtie < Rails::Railtie
-      initializer 'paperclip.insert_into_active_record' do
-        ActiveSupport.on_load :active_record do
-          Paperclip::Railtie.insert
-        end
-      end
-      rake_tasks do
-        load "tasks/paperclip.rake"
+  require 'rails'
+
+  class Railtie < Rails::Railtie
+    initializer 'paperclip.insert_into_active_record' do
+      ActiveSupport.on_load :active_record do
+        Paperclip::Railtie.insert
       end
     end
+
+    rake_tasks { load "tasks/paperclip.rake" }
   end
 
   class Railtie
     def self.insert
-      ActiveRecord::Base.send(:include, Paperclip::Glue)
-      File.send(:include, Paperclip::Upfile)
+      Paperclip.options[:logger] = Rails.logger
 
-      Paperclip.options[:logger] = defined?(ActiveRecord) ? ActiveRecord::Base.logger : Rails.logger
-
-      ActiveRecord::ConnectionAdapters::AbstractAdapter.send(:include, Paperclip::Schema)
-      ActiveRecord::ConnectionAdapters::Table.send(:include, Paperclip::Schema)
-      ActiveRecord::ConnectionAdapters::TableDefinition.send(:include, Paperclip::Schema)
+      if defined?(ActiveRecord)
+        Paperclip.options[:logger] = ActiveRecord::Base.logger
+        ActiveRecord::Base.send(:include, Paperclip::Glue)
+      end
     end
   end
 end

data/lib/paperclip/storage/filesystem.rb

@@ -27,22 +27,13 @@ module Paperclip
         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)}")
-          begin
-            FileUtils.mv(file.path, path(style_name))
-          rescue SystemCallError
-            FileUtils.cp(file.path, path(style_name))
-            FileUtils.rm(file.path)
+          File.open(path(style_name), "wb") do |new_file|
+            while chunk = file.read(16 * 1024)
+              new_file.write(chunk)
+            end
           end
           FileUtils.chmod(0666&~File.umask, path(style_name))
         end

data/lib/paperclip/storage/fog.rb

@@ -80,9 +80,10 @@ module Paperclip
           retried = false
           begin
             directory.files.create(fog_file.merge(
-              :body   => file,
-              :key    => path(style),
-              :public => fog_public
+              :body         => file,
+              :key          => path(style),
+              :public       => fog_public,
+              :content_type => file.content_type
             ))
           rescue Excon::Errors::NotFound
             raise if retried
@@ -105,27 +106,14 @@ module Paperclip
         @queued_for_delete = []
       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)
-        if @queued_for_write[style]
-          @queued_for_write[style]
-        else
-          body      = directory.files.get(path(style)).body
-          filename  = path(style)
-          extname   = File.extname(filename)
-          basename  = File.basename(filename, extname)
-          file      = Tempfile.new([basename, extname])
-          file.binmode
-          file.write(body)
-          file.rewind
-          file
-        end
-      end
-
       def public_url(style = default_style)
         if @options[:fog_host]
-          host = (@options[:fog_host] =~ /%d/) ? @options[:fog_host] % (path(style).hash % 4) : @options[:fog_host]
+          host = if @options[:fog_host].respond_to?(:call)
+            @options[:fog_host].call(self)
+          else
+            (@options[:fog_host] =~ /%d/) ? @options[:fog_host] % (path(style).hash % 4) : @options[:fog_host]
+          end
+
           "#{host}/#{path(style)}"
         else
           if fog_credentials[:provider] == 'AWS'
@@ -147,6 +135,17 @@ module Paperclip
         (creds[env] || creds).symbolize_keys
       end
 
+      def copy_to_local_file(style, local_dest_path)
+        log("copying #{path(style)} to local file #{local_dest_path}")
+        local_file = ::File.open(local_dest_path, 'wb')
+        file = directory.files.get(path(style))
+        local_file.write(file.body)
+        local_file.close
+      rescue Fog::Errors::Error => e
+        warn("#{e} - cannot copy #{path(style)} to local file #{local_dest_path}")
+        false
+      end
+
       private
 
       def find_credentials(creds)
@@ -158,7 +157,11 @@ module Paperclip
         when Hash
           creds
         else
-          raise ArgumentError, "Credentials are not a path, file, or hash."
+          if creds.respond_to?(:call)
+            creds.call(self)
+          else
+            raise ArgumentError, "Credentials are not a path, file, hash or proc."
+          end
         end
       end
 
@@ -167,7 +170,13 @@ module Paperclip
       end
 
       def directory
-        @directory ||= connection.directories.new(:key => @options[:fog_directory])
+        dir = if @options[:fog_directory].respond_to?(:call)
+          @options[:fog_directory].call(self)
+        else
+          @options[:fog_directory]
+        end
+        
+        @directory ||= connection.directories.new(:key => dir)
       end
     end
   end

data/lib/paperclip/storage/s3.rb

@@ -41,7 +41,9 @@ module Paperclip
     # * +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}
+    # * +s3_headers+: A hash of headers or a Proc. You may specify a hash such as
+    #   {'Expires' => 1.year.from_now.httpdate}. If you use a Proc, headers are determined at
+    #   runtime. Paperclip will call that Proc with attachment as the only argument.
     # * +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.
@@ -93,12 +95,14 @@ module Paperclip
           @s3_permissions = set_permissions(@options[:s3_permissions])
           @s3_protocol    = @options[:s3_protocol]    ||
             Proc.new do |style, attachment|
-              permission  = (@s3_permissions[style.to_sym] || @s3_permissions[:default])
+              permission  = (@s3_permissions[style.to_s.to_sym] || @s3_permissions[:default])
               permission  = permission.call(attachment, style) if permission.is_a?(Proc)
               (permission == :public_read) ? 'http' : 'https'
             end
           @s3_metadata = @options[:s3_metadata] || {}
-          @s3_headers = (@options[:s3_headers] || {}).inject({}) do |headers,(name,value)|
+          @s3_headers = @options[:s3_headers] || {}
+          @s3_headers = @s3_headers.call(instance) if @s3_headers.is_a?(Proc)
+          @s3_headers = (@s3_headers).inject({}) do |headers,(name,value)|
             case name.to_s
             when /^x-amz-meta-(.*)/i
               @s3_metadata[$1.downcase] = value
@@ -111,6 +115,8 @@ module Paperclip
 
           @s3_headers[:storage_class] = @options[:s3_storage_class] if @options[:s3_storage_class]
 
+          @s3_server_side_encryption = @options[:s3_server_side_encryption]
+
           unless @options[:url].to_s.match(/^:s3.*url$/) || @options[:url] == ":asset_host"
             @options[:path] = @options[:path].gsub(/:url/, @options[:url]).gsub(/^:rails_root\/public\/system/, '')
             @options[:url]  = ":s3_path_url"
@@ -135,7 +141,8 @@ module Paperclip
 
       def expiring_url(time = 3600, style_name = default_style)
         if path
-          s3_object(style_name).url_for(:read, :expires => time, :secure => use_secure_protocol?(style_name)).to_s
+          base_options = { :expires => time, :secure => use_secure_protocol?(style_name) }
+          s3_object(style_name).url_for(:read, base_options.merge(s3_url_options)).to_s
         end
       end
 
@@ -153,6 +160,12 @@ module Paperclip
         @s3_host_alias
       end
 
+      def s3_url_options
+        s3_url_options = @options[:s3_url_options] || {}
+        s3_url_options = s3_url_options.call(instance) if s3_url_options.is_a?(Proc)
+        s3_url_options
+      end
+
       def bucket_name
         @bucket = @options[:bucket] || s3_credentials[:bucket]
         @bucket = @bucket.call(self) if @bucket.is_a?(Proc)
@@ -221,6 +234,7 @@ module Paperclip
       end
 
       def parse_credentials creds
+        creds = creds.respond_to?('call') ? creds.call(self) : creds
         creds = find_credentials(creds).stringify_keys
         env = Object.const_defined?(:Rails) ? Rails.env : nil
         (creds[env] || creds).symbolize_keys
@@ -232,6 +246,8 @@ module Paperclip
         else
           false
         end
+      rescue AWS::Errors::Base => e
+        false
       end
 
       def s3_permissions(style = default_style)
@@ -248,20 +264,6 @@ module Paperclip
         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 = default_style
-        return @queued_for_write[style] if @queued_for_write[style]
-        filename = path(style)
-        extname  = File.extname(filename)
-        basename = File.basename(filename, extname)
-        file = Tempfile.new([basename, extname])
-        file.binmode
-        file.write(s3_object(style).read)
-        file.rewind
-        return file
-      end
-
       def create_bucket
         s3_interface.buckets.create(bucket_name)
       end
@@ -273,10 +275,13 @@ module Paperclip
             acl = @s3_permissions[style] || @s3_permissions[:default]
             acl = acl.call(self, style) if acl.respond_to?(:call)
             write_options = {
-              :content_type => file.content_type.to_s.strip,
+              :content_type => file.content_type,
               :acl => acl
             }
             write_options[:metadata] = @s3_metadata unless @s3_metadata.empty?
+            unless @s3_server_side_encryption.blank?
+              write_options[:server_side_encryption] = @s3_server_side_encryption
+            end
             write_options.merge!(@s3_headers)
             s3_object(style).write(file, write_options)
           rescue AWS::S3::Errors::NoSuchBucket => e
@@ -302,6 +307,17 @@ module Paperclip
         @queued_for_delete = []
       end
 
+      def copy_to_local_file(style, local_dest_path)
+        log("copying #{path(style)} to local file #{local_dest_path}")
+        local_file = ::File.open(local_dest_path, 'wb')
+        file = s3_object(style)
+        local_file.write(file.read)
+        local_file.close
+      rescue AWS::Errors::Base => e
+        warn("#{e} - cannot copy #{path(style)} to local file #{local_dest_path}")
+        false
+      end
+
       def find_credentials creds
         case creds
         when File
@@ -311,19 +327,11 @@ module Paperclip
         when Hash
           creds
         else
-          raise ArgumentError, "Credentials are not a path, file, or hash."
+          raise ArgumentError, "Credentials are not a path, file, proc, or hash."
         end
       end
       private :find_credentials
 
-      def establish_connection!
-        @connection ||= 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
-      private :establish_connection!
-
       def use_secure_protocol?(style_name)
         s3_protocol(style_name) == "https"
       end