kt-paperclip 5.4.0 → 7.1.1

data/lib/paperclip/helpers.rb

@@ -4,7 +4,7 @@ module Paperclip
       yield(self) if block_given?
     end
 
-    def interpolates key, &block
+    def interpolates(key, &block)
       Paperclip::Interpolations[key] = block
     end
 
@@ -30,7 +30,7 @@ module Paperclip
       terrapin_path_array = Terrapin::CommandLine.path.try(:split, Terrapin::OS.path_separator)
       Terrapin::CommandLine.path = [terrapin_path_array, command_path].flatten.compact.uniq
       if logging? && (options[:log_command] || local_options[:log_command])
-        local_options = local_options.merge(:logger => logger)
+        local_options = local_options.merge(logger: logger)
       end
       Terrapin::CommandLine.new(cmd, arguments, local_options).run(interpolation_values)
     end
@@ -44,7 +44,7 @@ module Paperclip
     end
 
     def class_for(class_name)
-      class_name.split('::').inject(Object) do |klass, partial_class_name|
+      class_name.split("::").inject(Object) do |klass, partial_class_name|
         if klass.const_defined?(partial_class_name)
           klass.const_get(partial_class_name, false)
         else

data/lib/paperclip/interpolations.rb

@@ -5,31 +5,32 @@ module Paperclip
   # Paperclip.interpolates method.
   module Interpolations
     extend self
+    ID_PARTITION_LIMIT = 1_000_000_000
 
     # Hash assignment of interpolations. Included only for compatibility,
     # and is not intended for normal use.
-    def self.[]= name, block
+    def self.[]=(name, block)
       define_method(name, &block)
       @interpolators_cache = nil
     end
 
     # Hash access of interpolations. Included only for compatibility,
     # and is not intended for normal use.
-    def self.[] name
+    def self.[](name)
       method(name)
     end
 
     # Returns a sorted list of all interpolations.
     def self.all
-      self.instance_methods(false).sort!
+      instance_methods(false).sort!
     end
 
     # Perform the actual interpolation. Takes the pattern to interpolate
     # and the arguments to pass, which are the attachment and style name.
     # You can pass a method name on your record as a symbol, which should turn
     # an interpolation pattern for Paperclip to use.
-    def self.interpolate pattern, *args
-      pattern = args.first.instance.send(pattern) if pattern.kind_of? Symbol
+    def self.interpolate(pattern, *args)
+      pattern = args.first.instance.send(pattern) if pattern.is_a? Symbol
       result = pattern.dup
       interpolators_cache.each do |method, token|
         result.gsub!(token) { send(method, *args) } if result.include?(token)
@@ -46,17 +47,17 @@ module Paperclip
     end
 
     # Returns the filename, the same way as ":basename.:extension" would.
-    def filename attachment, style_name
-      [ basename(attachment, style_name), extension(attachment, style_name) ].delete_if(&:empty?).join(".".freeze)
+    def filename(attachment, style_name)
+      [basename(attachment, style_name), extension(attachment, style_name)].delete_if(&:empty?).join(".")
     end
 
     # Returns the interpolated URL. Will raise an error if the url itself
     # contains ":url" to prevent infinite recursion. This interpolation
     # is used in the default :path to ease default specifications.
-    RIGHT_HERE = "#{__FILE__.gsub(%r{\A\./}, "")}:#{__LINE__ + 3}"
-    def url attachment, style_name
-      raise Errors::InfiniteInterpolationError if caller.any?{|b| b.index(RIGHT_HERE) }
-      attachment.url(style_name, :timestamp => false, :escape => false)
+    RIGHT_HERE = "#{__FILE__.gsub(%r{\A\./}, '')}:#{__LINE__ + 3}"
+    def url(attachment, style_name)
+      raise Errors::InfiniteInterpolationError if caller.any? { |b| b.index(RIGHT_HERE) }
+      attachment.url(style_name, timestamp: false, escape: false)
     end
 
     # Returns the timestamp as defined by the <attachment>_updated_at field
@@ -64,23 +65,23 @@ module Paperclip
     # to false.  Note that a Rails.config.time_zone change will still
     # invalidate any path or URL that uses :timestamp.  For a
     # time_zone-agnostic timestamp, use #updated_at.
-    def timestamp attachment, style_name
+    def timestamp(attachment, _style_name)
       attachment.instance_read(:updated_at).in_time_zone(attachment.time_zone).to_s
     end
 
     # Returns an integer timestamp that is time zone-neutral, so that paths
     # remain valid even if a server's time zone changes.
-    def updated_at attachment, style_name
+    def updated_at(attachment, _style_name)
       attachment.updated_at
     end
 
     # Returns the Rails.root constant.
-    def rails_root attachment, style_name
+    def rails_root(_attachment, _style_name)
       Rails.root
     end
 
     # Returns the Rails.env constant.
-    def rails_env attachment, style_name
+    def rails_env(_attachment, _style_name)
       Rails.env
     end
 
@@ -88,28 +89,29 @@ module Paperclip
     # e.g. "users" for the User class.
     # NOTE: The arguments need to be optional, because some tools fetch
     # all class names. Calling #class will return the expected class.
-    def class attachment = nil, style_name = nil
+    def class(attachment = nil, style_name = nil)
       return super() if attachment.nil? && style_name.nil?
+
       plural_cache.underscore_and_pluralize_class(attachment.instance.class)
     end
 
     # Returns the basename of the file. e.g. "file" for "file.jpg"
-    def basename attachment, style_name
-      File.basename(attachment.original_filename, ".*".freeze)
+    def basename(attachment, _style_name)
+      File.basename(attachment.original_filename, ".*")
     end
 
     # Returns the extension of the file. e.g. "jpg" for "file.jpg"
     # If the style has a format defined, it will return the format instead
     # of the actual extension.
-    def extension attachment, style_name
+    def extension(attachment, style_name)
       ((style = attachment.styles[style_name.to_s.to_sym]) && style[:format]) ||
-        File.extname(attachment.original_filename).sub(/\A\.+/, "".freeze)
+        File.extname(attachment.original_filename).sub(/\A\.+/, "")
     end
 
     # Returns the dot+extension of the file. e.g. ".jpg" for "file.jpg"
     # If the style has a format defined, it will return the format instead
     # of the actual extension. If the extension is empty, no dot is added.
-    def dotextension attachment, style_name
+    def dotextension(attachment, style_name)
       ext = extension(attachment, style_name)
       ext.empty? ? ext : ".#{ext}"
     end
@@ -121,13 +123,13 @@ module Paperclip
     # Each mime type generally has multiple extensions associated with it, so
     # if the extension from the original filename is one of these extensions,
     # that extension is used, otherwise, the first in the list is used.
-    def content_type_extension attachment, style_name
+    def content_type_extension(attachment, style_name)
       mime_type = MIME::Types[attachment.content_type]
-      extensions_for_mime_type = unless mime_type.empty?
-        mime_type.first.extensions
-      else
-        []
-      end
+      extensions_for_mime_type = if mime_type.empty?
+                                   []
+                                 else
+                                   mime_type.first.extensions
+                                 end
 
       original_extension = extension(attachment, style_name)
       style = attachment.styles[style_name.to_s.to_sym]
@@ -146,23 +148,23 @@ module Paperclip
     end
 
     # Returns the id of the instance.
-    def id attachment, style_name
+    def id(attachment, _style_name)
       attachment.instance.id
     end
 
     # Returns the #to_param of the instance.
-    def param attachment, style_name
+    def param(attachment, _style_name)
       attachment.instance.to_param
     end
 
     # Returns the fingerprint of the instance.
-    def fingerprint attachment, style_name
+    def fingerprint(attachment, _style_name)
       attachment.fingerprint
     end
 
     # Returns a the attachment hash.  See Paperclip::Attachment#hash_key for
     # more details.
-    def hash attachment=nil, style_name=nil
+    def hash(attachment = nil, style_name = nil)
       if attachment && style_name
         attachment.hash_key(style_name)
       else
@@ -172,25 +174,27 @@ module Paperclip
 
     # Returns the id of the instance in a split path form. e.g. returns
     # 000/001/234 for an id of 1234.
-    def id_partition attachment, style_name
+    def id_partition(attachment, _style_name)
       case id = attachment.instance.id
       when Integer
-        ("%09d".freeze % id).scan(/\d{3}/).join("/".freeze)
+        if id < ID_PARTITION_LIMIT
+          ("%09d" % id).scan(/\d{3}/).join("/")
+        else
+          ("%012d" % id).scan(/\d{3}/).join("/")
+        end
       when String
-        id.scan(/.{3}/).first(3).join("/".freeze)
-      else
-        nil
+        id.scan(/.{3}/).first(3).join("/")
       end
     end
 
     # Returns the pluralized form of the attachment name. e.g.
     # "avatars" for an attachment of :avatar
-    def attachment attachment, style_name
+    def attachment(attachment, _style_name)
       plural_cache.pluralize_symbol(attachment.name)
     end
 
     # Returns the style, or the default style if nil is supplied.
-    def style attachment, style_name
+    def style(attachment, style_name)
       style_name || attachment.default_style
     end
   end

data/lib/paperclip/io_adapters/abstract_adapter.rb

@@ -1,11 +1,11 @@
-require 'active_support/core_ext/module/delegation'
+require "active_support/core_ext/module/delegation"
 
 module Paperclip
   class AbstractAdapter
-    OS_RESTRICTED_CHARACTERS = %r{[/:]}
+    OS_RESTRICTED_CHARACTERS = %r{[/:]}.freeze
 
-    attr_reader :content_type, :original_filename, :size
-    delegate :binmode, :binmode?, :close, :close!, :closed?, :eof?, :path, :readbyte, :rewind, :unlink, :to => :@tempfile
+    attr_reader :content_type, :original_filename, :size, :tempfile
+    delegate :binmode, :binmode?, :close, :close!, :closed?, :eof?, :path, :readbyte, :rewind, :unlink, to: :@tempfile
     alias :length :size
 
     def initialize(target, options = {})
@@ -29,11 +29,12 @@ module Paperclip
     end
 
     def inspect
-      "#{self.class}: #{self.original_filename}"
+      "#{self.class}: #{original_filename}"
     end
 
     def original_filename=(new_filename)
       return unless new_filename
+
       @original_filename = new_filename.gsub(OS_RESTRICTED_CHARACTERS, "_")
     end
 
@@ -57,15 +58,16 @@ module Paperclip
     end
 
     def link_or_copy_file(src, dest)
-      Paperclip.log("Trying to link #{src} to #{dest}")
-      FileUtils.ln(src, dest, force: true) # overwrite existing
-      @destination.close
-      @destination.open.binmode
-    rescue Errno::EXDEV, Errno::EPERM, Errno::ENOENT, Errno::EEXIST => e
-      Paperclip.log(
-        "Link failed with #{e.message}; copying link #{src} to #{dest}"
-      )
-      FileUtils.cp(src, dest)
+      begin
+        Paperclip.log("Trying to link #{src} to #{dest}")
+        FileUtils.ln(src, dest, force: true) # overwrite existing
+      rescue Errno::EXDEV, Errno::EPERM, Errno::ENOENT, Errno::EEXIST => e
+        Paperclip.log(
+          "Link failed with #{e.message}; copying link #{src} to #{dest}"
+        )
+        FileUtils.cp(src, dest)
+      end
+
       @destination.close
       @destination.open.binmode
     end

data/lib/paperclip/io_adapters/attachment_adapter.rb

@@ -9,11 +9,11 @@ module Paperclip
     def initialize(target, options = {})
       super
       @target, @style = case target
-      when Paperclip::Attachment
-        [target, :original]
-      when Paperclip::Style
-        [target.attachment, target.name]
-      end
+                        when Paperclip::Attachment
+                          [target, :original]
+                        when Paperclip::Style
+                          [target.attachment, target.name]
+                        end
 
       cache_current_values
     end
@@ -31,7 +31,13 @@ module Paperclip
       if source.staged?
         link_or_copy_file(source.staged_path(@style), destination.path)
       else
-        source.copy_to_local_file(@style, destination.path)
+        begin
+          source.copy_to_local_file(@style, destination.path)
+        rescue Errno::EACCES
+          # clean up lingering tempfile if we cannot access source file
+          destination.close(true)
+          raise
+        end
       end
       destination
     end

data/lib/paperclip/io_adapters/data_uri_adapter.rb

@@ -6,7 +6,7 @@ module Paperclip
       end
     end
 
-    REGEXP = /\Adata:([-\w]+\/[-\w\+\.]+)?;base64,(.*)/m
+    REGEXP = /\Adata:([-\w]+\/[-\w\+\.]+)?;base64,(.*)/m.freeze
 
     def initialize(target_uri, options = {})
       super(extract_target(target_uri), options)

data/lib/paperclip/io_adapters/file_adapter.rb

@@ -14,9 +14,7 @@ module Paperclip
     private
 
     def cache_current_values
-      if @target.respond_to?(:original_filename)
-        self.original_filename = @target.original_filename
-      end
+      self.original_filename = @target.original_filename if @target.respond_to?(:original_filename)
       self.original_filename ||= File.basename(@target.path)
       @tempfile = copy_to_tempfile(@target)
       @content_type = ContentTypeDetector.new(@target.path).detect

data/lib/paperclip/io_adapters/http_url_proxy_adapter.rb

@@ -6,7 +6,7 @@ module Paperclip
       end
     end
 
-    REGEXP = /\Ahttps?:\/\//
+    REGEXP = /\Ahttps?:\/\//.freeze
 
     def initialize(target, options = {})
       escaped = Paperclip::UrlGenerator.escape(target)

data/lib/paperclip/io_adapters/identity_adapter.rb

@@ -6,8 +6,7 @@ module Paperclip
       end
     end
 
-    def initialize
-    end
+    def initialize; end
 
     def new(target, _)
       target

data/lib/paperclip/io_adapters/registry.rb

@@ -24,7 +24,7 @@ module Paperclip
     end
 
     def registered?(target)
-      @registered_handlers.any? do |tester, handler|
+      @registered_handlers.any? do |_tester, handler|
         handler === target
       end
     end

data/lib/paperclip/io_adapters/stringio_adapter.rb

@@ -24,7 +24,7 @@ module Paperclip
     end
 
     def copy_to_tempfile(source)
-      while data = source.read(16*1024)
+      while data = source.read(16 * 1024)
         destination.write(data)
       end
       destination.rewind

data/lib/paperclip/io_adapters/uploaded_file_adapter.rb

@@ -10,11 +10,11 @@ module Paperclip
       super
       cache_current_values
 
-      if @target.respond_to?(:tempfile)
-        @tempfile = copy_to_tempfile(@target.tempfile)
-      else
-        @tempfile = copy_to_tempfile(@target)
-      end
+      @tempfile = if @target.respond_to?(:tempfile)
+                    copy_to_tempfile(@target.tempfile)
+                  else
+                    copy_to_tempfile(@target)
+                  end
     end
 
     class << self
@@ -35,9 +35,7 @@ module Paperclip
 
     def determine_content_type
       content_type = @target.content_type.to_s.strip
-      if content_type_detector
-        content_type = content_type_detector.new(@target.path).detect
-      end
+      content_type = content_type_detector.new(@target.path).detect if content_type_detector
       content_type
     end
   end

data/lib/paperclip/io_adapters/uri_adapter.rb

@@ -28,15 +28,17 @@ module Paperclip
     end
 
     def content_type_from_content
-      if @content.respond_to?(:content_type)
-        @content.content_type
-      end
+      @content.meta["content-type"].presence
     end
 
     def filename_from_content_disposition
-      if @content.meta.key?("content-disposition")
-        matches = @content.meta["content-disposition"].match(/filename="([^"]*)"/)
-        matches[1] if matches
+      if @content.meta.key?("content-disposition") && @content.meta["content-disposition"].match(/filename/i)
+        # can include both filename and filename* values according to RCF6266. filename should come first
+        _, filename = @content.meta["content-disposition"].split(/filename\*?\s*=\s*/i)
+
+        # filename can be enclosed in quotes or not
+        matches = filename.match(/"(.*)"/)
+        matches ? matches[1] : filename.split(";")[0]
       end
     end
 
@@ -48,10 +50,20 @@ module Paperclip
       "index.html"
     end
 
-    def download_content
-      options = { read_timeout: Paperclip.options[:read_timeout] }.compact
+    if RUBY_VERSION < '2.5'
+      def download_content
+        options = { read_timeout: Paperclip.options[:read_timeout] }.compact
 
-      self.open(@target, options)
+        # rubocop:disable Security/Open
+        open(@target, options)
+        # rubocop:enable Security/Open
+      end
+    else
+      def download_content
+        options = { read_timeout: Paperclip.options[:read_timeout] }.compact
+
+        URI.open(@target, options)
+      end
     end
 
     def copy_to_tempfile(src)

data/lib/paperclip/logger.rb

@@ -2,7 +2,7 @@ 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
+    def log(message)
       logger.info("[paperclip] #{message}") if logging?
     end
 

data/lib/paperclip/matchers/have_attached_file_matcher.rb

@@ -8,16 +8,16 @@ module Paperclip
       #   describe User do
       #     it { should have_attached_file(:avatar) }
       #   end
-      def have_attached_file name
+      def have_attached_file(name)
         HaveAttachedFileMatcher.new(name)
       end
 
       class HaveAttachedFileMatcher
-        def initialize attachment_name
+        def initialize(attachment_name)
           @attachment_name = attachment_name
         end
 
-        def matches? subject
+        def matches?(subject)
           @subject = subject
           @subject = @subject.class unless Class === @subject
           responds? && has_column?
@@ -40,7 +40,7 @@ module Paperclip
 
         def responds?
           methods = @subject.instance_methods.map(&:to_s)
-          methods.include?("#{@attachment_name}") &&
+          methods.include?(@attachment_name.to_s) &&
             methods.include?("#{@attachment_name}=") &&
             methods.include?("#{@attachment_name}?")
         end

data/lib/paperclip/matchers/validate_attachment_content_type_matcher.rb

@@ -10,32 +10,32 @@ module Paperclip
       #                   allowing('image/png', 'image/gif').
       #                   rejecting('text/plain', 'text/xml') }
       #   end
-      def validate_attachment_content_type name
+      def validate_attachment_content_type(name)
         ValidateAttachmentContentTypeMatcher.new(name)
       end
 
       class ValidateAttachmentContentTypeMatcher
-        def initialize attachment_name
+        def initialize(attachment_name)
           @attachment_name = attachment_name
           @allowed_types = []
           @rejected_types = []
         end
 
-        def allowing *types
+        def allowing(*types)
           @allowed_types = types.flatten
           self
         end
 
-        def rejecting *types
+        def rejecting(*types)
           @rejected_types = types.flatten
           self
         end
 
-        def matches? subject
+        def matches?(subject)
           @subject = subject
           @subject = @subject.new if @subject.class == Class
           @allowed_types && @rejected_types &&
-          allowed_types_allowed? && rejected_types_rejected?
+            allowed_types_allowed? && rejected_types_rejected?
         end
 
         def failure_message
@@ -54,23 +54,24 @@ module Paperclip
 
         def accepted_types_and_failures
           if @allowed_types.present?
-            "Accept content types: #{@allowed_types.join(", ")}\n".tap do |message|
-              if @missing_allowed_types.present?
-                message << "  #{@missing_allowed_types.join(", ")} were rejected."
-              else
-                message << "  All were accepted successfully."
-              end
+            "Accept content types: #{@allowed_types.join(', ')}\n".tap do |message|
+              message << if @missing_allowed_types.present?
+                           "  #{@missing_allowed_types.join(', ')} were rejected."
+                         else
+                           "  All were accepted successfully."
+                         end
             end
           end
         end
+
         def rejected_types_and_failures
           if @rejected_types.present?
-            "Reject content types: #{@rejected_types.join(", ")}\n".tap do |message|
-              if @missing_rejected_types.present?
-                message << "  #{@missing_rejected_types.join(", ")} were accepted."
-              else
-                message << "  All were rejected successfully."
-              end
+            "Reject content types: #{@rejected_types.join(', ')}\n".tap do |message|
+              message << if @missing_rejected_types.present?
+                           "  #{@missing_rejected_types.join(', ')} were accepted."
+                         else
+                           "  All were rejected successfully."
+                         end
             end
           end
         end

data/lib/paperclip/matchers/validate_attachment_presence_matcher.rb

@@ -7,16 +7,16 @@ module Paperclip
       # describe User do
       #   it { should validate_attachment_presence(:avatar) }
       # end
-      def validate_attachment_presence name
+      def validate_attachment_presence(name)
         ValidateAttachmentPresenceMatcher.new(name)
       end
 
       class ValidateAttachmentPresenceMatcher
-        def initialize attachment_name
+        def initialize(attachment_name)
           @attachment_name = attachment_name
         end
 
-        def matches? subject
+        def matches?(subject)
           @subject = subject
           @subject = subject.new if subject.class == Class
           error_when_not_valid? && no_error_when_valid?
@@ -50,7 +50,7 @@ module Paperclip
           expected_message = [
             @attachment_name.to_s.titleize,
             I18n.t(:blank, scope: [:errors, :messages])
-          ].join(' ')
+          ].join(" ")
           @subject.errors.full_messages.exclude?(expected_message)
         end
       end