paperclip 3.5.4 → 4.3.7

data/lib/paperclip/io_adapters/attachment_adapter.rb

@@ -20,11 +20,11 @@ module Paperclip
       @size = @tempfile.size || @target.size
     end
 
-    def copy_to_tempfile(src)
-      if src.respond_to? :copy_to_local_file
-        src.copy_to_local_file(@style, destination.path)
+    def copy_to_tempfile(source)
+      if source.staged?
+        FileUtils.cp(source.staged_path(@style), destination.path)
       else
-        FileUtils.cp(src.path(@style), destination.path)
+        source.copy_to_local_file(@style, destination.path)
       end
       destination
     end

data/lib/paperclip/io_adapters/data_uri_adapter.rb

@@ -1,22 +1,17 @@
 module Paperclip
   class DataUriAdapter < StringioAdapter
 
-    REGEXP = /\Adata:([-\w]+\/[-\w\+]+);base64,(.*)/m
+    REGEXP = /\Adata:([-\w]+\/[-\w\+\.]+)?;base64,(.*)/m
 
     def initialize(target_uri)
-      @target_uri = target_uri
-      cache_current_values
-      @tempfile = copy_to_tempfile
+      super(extract_target(target_uri))
     end
 
     private
 
-    def cache_current_values
-      self.original_filename = 'base64.txt'
-      data_uri_parts ||= @target_uri.match(REGEXP) || []
-      @content_type = data_uri_parts[1] || 'text/plain'
-      @target = StringIO.new(Base64.decode64(data_uri_parts[2] || ''))
-      @size = @target.size
+    def extract_target(uri)
+      data_uri_parts = uri.match(REGEXP) || []
+      StringIO.new(Base64.decode64(data_uri_parts[2] || ''))
     end
 
   end

data/lib/paperclip/io_adapters/stringio_adapter.rb

@@ -3,7 +3,6 @@ module Paperclip
     def initialize(target)
       @target = target
       cache_current_values
-      @tempfile = copy_to_tempfile
     end
 
     attr_writer :content_type
@@ -11,18 +10,15 @@ module Paperclip
     private
 
     def cache_current_values
-      @original_filename = @target.original_filename if @target.respond_to?(:original_filename)
-      @original_filename ||= "stringio.txt"
-      self.original_filename = @original_filename.strip
-
-      @content_type = @target.content_type if @target.respond_to?(:content_type)
-      @content_type ||= "text/plain"
-
+      self.original_filename = @target.original_filename if @target.respond_to?(:original_filename)
+      self.original_filename ||= "data"
+      @tempfile = copy_to_tempfile(@target)
+      @content_type = ContentTypeDetector.new(@tempfile.path).detect
       @size = @target.size
     end
 
-    def copy_to_tempfile
-      while data = @target.read(16*1024)
+    def copy_to_tempfile(source)
+      while data = source.read(16*1024)
         destination.write(data)
       end
       destination.rewind

data/lib/paperclip/io_adapters/uri_adapter.rb

@@ -2,6 +2,8 @@ require 'open-uri'
 
 module Paperclip
   class UriAdapter < AbstractAdapter
+    attr_writer :content_type
+
     def initialize(target)
       @target = target
       @content = download_content
@@ -9,23 +11,40 @@ module Paperclip
       @tempfile = copy_to_tempfile(@content)
     end
 
-    attr_writer :content_type
-
     private
 
-    def download_content
-      open(@target)
+    def cache_current_values
+      self.content_type = content_type_from_content || "text/html"
+
+      self.original_filename = filename_from_content_disposition ||
+                               filename_from_path ||
+                               default_filename
+      @size = @content.size
     end
 
-    def cache_current_values
-      @original_filename = @target.path.split("/").last
-      @original_filename ||= "index.html"
-      self.original_filename = @original_filename.strip
+    def content_type_from_content
+      if @content.respond_to?(:content_type)
+        @content.content_type
+      end
+    end
 
-      @content_type = @content.content_type if @content.respond_to?(:content_type)
-      @content_type ||= "text/html"
+    def filename_from_content_disposition
+      if @content.meta.has_key?("content-disposition")
+        @content.meta["content-disposition"].
+          match(/filename="([^"]*)"/)[1]
+      end
+    end
 
-      @size = @content.size
+    def filename_from_path
+      @target.path.split("/").last
+    end
+
+    def default_filename
+      "index.html"
+    end
+
+    def download_content
+      open(@target)
     end
 
     def copy_to_tempfile(src)

data/lib/paperclip/locales/de.yml

@@ -0,0 +1,18 @@
+de:
+  errors:
+    messages:
+      in_between: "muss zwischen %{min} und %{max} sein"
+      spoofed_media_type: "trägt eine Dateiendung, die nicht mit dem Inhalt der Datei übereinstimmt"
+
+  number:
+    human:
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one:   "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"

data/lib/paperclip/locales/en.yml

@@ -2,6 +2,7 @@ en:
   errors:
     messages:
       in_between: "must be in between %{min} and %{max}"
+      spoofed_media_type: "has contents that are not what they are reported to be"
 
   number:
     human:

data/lib/paperclip/locales/es.yml

@@ -0,0 +1,18 @@
+es:
+  errors:
+    messages:
+      in_between: "debe estar entre %{min} y %{max}"
+      spoofed_media_type: "tiene una extensión que no coincide con su contenido"
+
+  number:
+    human:
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one:   "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"

data/lib/paperclip/locales/ja.yml

@@ -0,0 +1,18 @@
+ja:
+  errors:
+    messages:
+      in_between: "の容量は%{min}以上%{max}以下にしてください。"
+      spoofed_media_type: "の拡張子と内容が一致していません。"
+
+  number:
+    human:
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one:   "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"

data/lib/paperclip/locales/pt-BR.yml

@@ -0,0 +1,18 @@
+pt-BR:
+  errors:
+    messages:
+      in_between: "deve ter entre %{min} e %{max}"
+      spoofed_media_type: "tem uma extensão que não corresponde ao seu conteúdo"
+
+  number:
+    human:
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one:   "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"

data/lib/paperclip/locales/zh-CN.yml

@@ -0,0 +1,18 @@
+zh-CN:
+  errors:
+    messages:
+      in_between: "文件大小必须介于 %{min} 到 %{max} 之间"
+      spoofed_media_type: "扩展名与内容类型不符"
+
+  number:
+    human:
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one:   "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"

data/lib/paperclip/locales/zh-HK.yml

@@ -0,0 +1,18 @@
+zh-HK:
+  errors:
+    messages:
+      in_between: "必須介於%{min}到%{max}之間"
+      spoofed_media_type: "副檔名與內容類型不匹配"
+
+  number:
+    human:
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one:   "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"

data/lib/paperclip/locales/zh-TW.yml

@@ -0,0 +1,18 @@
+zh-TW:
+  errors:
+    messages:
+      in_between: "檔案大小必須介於 %{min} 到 %{max} 之間"
+      spoofed_media_type: "副檔名與內容類型不符"
+
+  number:
+    human:
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one:   "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"

data/lib/paperclip/matchers/have_attached_file_matcher.rb

@@ -27,9 +27,10 @@ module Paperclip
           "Should have an attachment named #{@attachment_name}"
         end
 
-        def negative_failure_message
+        def failure_message_when_negated
           "Should not have an attachment named #{@attachment_name}"
         end
+        alias negative_failure_message failure_message_when_negated
 
         def description
           "have an attachment named #{@attachment_name}"

data/lib/paperclip/matchers/validate_attachment_presence_matcher.rb

@@ -26,9 +26,10 @@ module Paperclip
           "Attachment #{@attachment_name} should be required"
         end
 
-        def negative_failure_message
+        def failure_message_when_negated
           "Attachment #{@attachment_name} should not be required"
         end
+        alias negative_failure_message failure_message_when_negated
 
         def description
           "require presence of attachment #{@attachment_name}"

data/lib/paperclip/matchers/validate_attachment_size_matcher.rb

@@ -45,9 +45,10 @@ module Paperclip
           "Attachment #{@attachment_name} must be between #{@low} and #{@high} bytes"
         end
 
-        def negative_failure_message
+        def failure_message_when_negated
           "Attachment #{@attachment_name} cannot be between #{@low} and #{@high} bytes"
         end
+        alias negative_failure_message failure_message_when_negated
 
         def description
           "validate the size of attachment #{@attachment_name}"

data/lib/paperclip/media_type_spoof_detector.rb

@@ -0,0 +1,89 @@
+module Paperclip
+  class MediaTypeSpoofDetector
+    def self.using(file, name, content_type)
+      new(file, name, content_type)
+    end
+
+    def initialize(file, name, content_type)
+      @file = file
+      @name = name
+      @content_type = content_type || ""
+    end
+
+    def spoofed?
+      if has_name? && has_extension? && media_type_mismatch? && mapping_override_mismatch?
+        Paperclip.log("Content Type Spoof: Filename #{File.basename(@name)} (#{supplied_content_type} from Headers, #{content_types_from_name.map(&:to_s)} from Extension), content type discovered from file command: #{calculated_content_type}. See documentation to allow this combination.")
+        true
+      else
+        false
+      end
+    end
+
+    private
+
+    def has_name?
+      @name.present?
+    end
+
+    def has_extension?
+      File.extname(@name).present?
+    end
+
+    def media_type_mismatch?
+      supplied_type_mismatch? || calculated_type_mismatch?
+    end
+
+    def supplied_type_mismatch?
+      supplied_media_type.present? && !media_types_from_name.include?(supplied_media_type)
+    end
+
+    def calculated_type_mismatch?
+      !media_types_from_name.include?(calculated_media_type)
+    end
+
+    def mapping_override_mismatch?
+      !Array(mapped_content_type).include?(calculated_content_type)
+    end
+
+
+    def supplied_content_type
+      @content_type
+    end
+
+    def supplied_media_type
+      @content_type.split("/").first
+    end
+
+    def content_types_from_name
+      @content_types_from_name ||= MIME::Types.type_for(@name)
+    end
+
+    def media_types_from_name
+      @media_types_from_name ||= content_types_from_name.collect(&:media_type)
+    end
+
+    def calculated_content_type
+      @calculated_content_type ||= type_from_file_command.chomp
+    end
+
+    def calculated_media_type
+      @calculated_media_type ||= calculated_content_type.split("/").first
+    end
+
+    def type_from_file_command
+      begin
+        Paperclip.run("file", "-b --mime :file", :file => @file.path).split(/[:;]\s+/).first
+      rescue Cocaine::CommandLineError
+        ""
+      end
+    end
+
+    def mapped_content_type
+      Paperclip.options[:content_type_mappings][filename_extension]
+    end
+
+    def filename_extension
+      File.extname(@name.to_s.downcase).sub(/^\./, '').to_sym
+    end
+  end
+end

data/lib/paperclip/processor.rb

@@ -45,41 +45,4 @@ module Paperclip
       Paperclip.run('identify', arguments, local_options)
     end
   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
-
-    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/processor_helpers.rb

@@ -0,0 +1,50 @@
+module Paperclip
+  module ProcessorHelpers
+    class NoSuchProcessor < StandardError; end
+
+    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
+
+    def load_processor(name)
+      if defined?(Rails.root) && Rails.root
+        filename = "#{name.to_s.underscore}.rb"
+        directories = %w(lib/paperclip lib/paperclip_processors)
+
+        required = directories.map do |directory|
+          pathname = File.expand_path(Rails.root.join(directory, filename))
+          file_exists = File.exist?(pathname)
+          require pathname if file_exists
+          file_exists
+        end
+
+        raise LoadError, "Could not find the '#{name}' processor in any of these paths: #{directories.join(', ')}" unless required.any?
+      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/rails_environment.rb

@@ -0,0 +1,25 @@
+module Paperclip
+  class RailsEnvironment
+    def self.get
+      new.get
+    end
+
+    def get
+      if rails_exists? && rails_environment_exists?
+        Rails.env
+      else
+        nil
+      end
+    end
+
+    private
+
+    def rails_exists?
+      Object.const_defined?(:Rails)
+    end
+
+    def rails_environment_exists?
+      Rails.respond_to?(:env)
+    end
+  end
+end

data/lib/paperclip/schema.rb

@@ -22,9 +22,12 @@ module Paperclip
       def add_attachment(table_name, *attachment_names)
         raise ArgumentError, "Please specify attachment name in your add_attachment call in your migration." if attachment_names.empty?
 
+        options = attachment_names.extract_options!
+
         attachment_names.each do |attachment_name|
           COLUMNS.each_pair do |column_name, column_type|
-            add_column(table_name, "#{attachment_name}_#{column_name}", column_type)
+            column_options = options.merge(options[column_name.to_sym] || {})
+            add_column(table_name, "#{attachment_name}_#{column_name}", column_type, column_options)
           end
         end
       end
@@ -32,8 +35,11 @@ module Paperclip
       def remove_attachment(table_name, *attachment_names)
         raise ArgumentError, "Please specify attachment name in your remove_attachment call in your migration." if attachment_names.empty?
 
+        options = attachment_names.extract_options!
+
         attachment_names.each do |attachment_name|
           COLUMNS.each_pair do |column_name, column_type|
+            column_options = options.merge(options[column_name.to_sym] || {})
             remove_column(table_name, "#{attachment_name}_#{column_name}")
           end
         end
@@ -47,9 +53,11 @@ module Paperclip
 
     module TableDefinition
       def attachment(*attachment_names)
+        options = attachment_names.extract_options!
         attachment_names.each do |attachment_name|
           COLUMNS.each_pair do |column_name, column_type|
-            column("#{attachment_name}_#{column_name}", column_type)
+            column_options = options.merge(options[column_name.to_sym] || {})
+            column("#{attachment_name}_#{column_name}", column_type, column_options)
           end
         end
       end

data/lib/paperclip/storage/filesystem.rb

@@ -69,7 +69,7 @@ module Paperclip
             while(true)
               path = File.dirname(path)
               FileUtils.rmdir(path)
-              break if File.exists?(path) # Ruby 1.9.2 does not raise if the removal failed.
+              break if File.exist?(path) # Ruby 1.9.2 does not raise if the removal failed.
             end
           rescue Errno::EEXIST, Errno::ENOTEMPTY, Errno::ENOENT, Errno::EINVAL, Errno::ENOTDIR, Errno::EACCES
             # Stop trying to remove parent directories

data/lib/paperclip/storage/fog.rb

@@ -14,6 +14,7 @@ module Paperclip
     #     aws_secret_access_key: '<your aws_secret_access_key>'
     #     provider: 'AWS'
     #     region: 'eu-west-1'
+    #     scheme: 'https'
     # * +fog_directory+: 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
@@ -32,6 +33,10 @@ module Paperclip
     #   that is the alias to the S3 domain of your bucket, e.g.
     #   'http://images.example.com'. This can also be used in
     #   conjunction with Cloudfront (http://aws.amazon.com/cloudfront)
+    # * +fog_options+: (optional) A hash of options that are passed
+    #   to fog when the file is created. For example, you could set
+    #   the multipart-chunk size to 100MB with a hash:
+    #     { :multipart_chunk_size => 104857600 }
 
     module Fog
       def self.extended base
@@ -97,12 +102,14 @@ module Paperclip
           log("saving #{path(style)}")
           retried = false
           begin
-            directory.files.create(fog_file.merge(
+            attributes = fog_file.merge(
               :body         => file,
               :key          => path(style),
               :public       => fog_public(style),
               :content_type => file.content_type
-            ))
+            )
+            attributes.merge!(@options[:fog_options]) if @options[:fog_options]
+            directory.files.create(attributes)
           rescue Excon::Errors::NotFound
             raise if retried
             retried = true
@@ -131,7 +138,7 @@ module Paperclip
           "#{dynamic_fog_host_for_style(style)}/#{path(style)}"
         else
           if fog_credentials[:provider] == 'AWS'
-            "https://#{host_name_for_directory}/#{path(style)}"
+            "#{scheme}://#{host_name_for_directory}/#{path(style)}"
           else
             directory.files.new(:key => path(style)).public_url
           end
@@ -140,8 +147,9 @@ module Paperclip
 
       def expiring_url(time = (Time.now + 3600), style_name = default_style)
         time = convert_time(time)
-        if path(style_name) && directory.files.respond_to?(:get_http_url)
-          expiring_url = directory.files.get_http_url(path(style_name), time)
+        http_url_method = "get_#{scheme}_url"
+        if path(style_name) && directory.files.respond_to?(http_url_method)
+          expiring_url = directory.files.public_send(http_url_method, path(style_name), time)
 
           if @options[:fog_host]
             expiring_url.gsub!(/#{host_name_for_directory}/, dynamic_fog_host_for_style(style_name))
@@ -155,8 +163,7 @@ module Paperclip
 
       def parse_credentials(creds)
         creds = find_credentials(creds).stringify_keys
-        env = Object.const_defined?(:Rails) ? Rails.env : nil
-        (creds[env] || creds).symbolize_keys
+        (creds[RailsEnvironment.get] || creds).symbolize_keys
       end
 
       def copy_to_local_file(style, local_dest_path)
@@ -225,6 +232,10 @@ module Paperclip
 
         @directory ||= connection.directories.new(:key => dir)
       end
+
+      def scheme
+        @scheme ||= fog_credentials[:scheme] || 'https'
+      end
     end
   end
 end