kt-paperclip 5.4.0 → 6.2.0

data/lib/paperclip/media_type_spoof_detector.rb

@@ -11,7 +11,7 @@ module Paperclip
     end
 
     def spoofed?
-      if has_name? && has_extension? && media_type_mismatch? && mapping_override_mismatch?
+      if has_name? && 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
@@ -30,22 +30,24 @@ module Paperclip
     end
 
     def media_type_mismatch?
-      supplied_type_mismatch? || calculated_type_mismatch?
+      extension_type_mismatch? || calculated_type_mismatch?
     end
 
-    def supplied_type_mismatch?
-      supplied_media_type.present? && !media_types_from_name.include?(supplied_media_type)
+    def extension_type_mismatch?
+      supplied_media_type.present? &&
+        has_extension? &&
+        !media_types_from_name.include?(supplied_media_type)
     end
 
     def calculated_type_mismatch?
-      !media_types_from_name.include?(calculated_media_type)
+      supplied_media_type.present? &&
+        !calculated_content_type.include?(supplied_media_type)
     end
 
     def mapping_override_mismatch?
       !Array(mapped_content_type).include?(calculated_content_type)
     end
 
-
     def supplied_content_type
       @content_type
     end
@@ -71,12 +73,10 @@ module Paperclip
     end
 
     def type_from_file_command
-      begin
-        Paperclip.run("file", "-b --mime :file", file: @file.path).
-          split(/[:;\s]+/).first
-      rescue Terrapin::CommandLineError
-        ""
-      end
+      Paperclip.run("file", "-b --mime :file", file: @file.path).
+        split(/[:;\s]+/).first
+    rescue Terrapin::CommandLineError
+      ""
     end
 
     def mapped_content_type
@@ -84,7 +84,7 @@ module Paperclip
     end
 
     def filename_extension
-      File.extname(@name.to_s.downcase).sub(/^\./, '').to_sym
+      File.extname(@name.to_s.downcase).sub(/^\./, "").to_sym
     end
   end
 end

data/lib/paperclip/missing_attachment_styles.rb

@@ -1,11 +1,11 @@
-require 'paperclip/attachment_registry'
-require 'set'
+require "paperclip/attachment_registry"
+require "set"
 
 module Paperclip
   class << self
     attr_writer :registered_attachments_styles_path
     def registered_attachments_styles_path
-      @registered_attachments_styles_path ||= Rails.root.join('public/system/paperclip_attachments.yml').to_s
+      @registered_attachments_styles_path ||= Rails.root.join("public/system/paperclip_attachments.yml").to_s
     end
   end
 
@@ -18,7 +18,7 @@ module Paperclip
   private_class_method :get_registered_attachments_styles
 
   def self.save_current_attachments_styles!
-    File.open(Paperclip.registered_attachments_styles_path, 'w') do |f|
+    File.open(Paperclip.registered_attachments_styles_path, "w") do |f|
       YAML.dump(current_attachments_styles, f)
     end
   end
@@ -36,7 +36,8 @@ module Paperclip
     Hash.new.tap do |current_styles|
       Paperclip::AttachmentRegistry.each_definition do |klass, attachment_name, attachment_attributes|
         # TODO: is it even possible to take into account Procs?
-        next if attachment_attributes[:styles].kind_of?(Proc)
+        next if attachment_attributes[:styles].is_a?(Proc)
+
         attachment_attributes[:styles].try(:keys).try(:each) do |style_name|
           klass_sym = klass.to_s.to_sym
           current_styles[klass_sym] ||= Hash.new
@@ -63,7 +64,11 @@ 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 []
+          registered = begin
+                         registered_styles[klass][attachment_name] || []
+                       rescue StandardError
+                         []
+                       end
           missed = styles - registered
           if missed.present?
             klass_sym = klass.to_s.to_sym

data/lib/paperclip/processor.rb

@@ -21,29 +21,36 @@ module Paperclip
   class Processor
     attr_accessor :file, :options, :attachment
 
-    def initialize file, options = {}, attachment = nil
+    def initialize(file, options = {}, attachment = nil)
       @file = file
       @options = options
       @attachment = attachment
     end
 
-    def make
-    end
+    def make; end
 
-    def self.make file, options = {}, attachment = nil
+    def self.make(file, options = {}, attachment = nil)
       new(file, options, attachment).make
     end
 
     # The convert method runs the convert binary with the provided arguments.
     # See Paperclip.run for the available options.
     def convert(arguments = "", local_options = {})
-      Paperclip.run('convert', arguments, local_options)
+      Paperclip.run(
+        Paperclip.options[:is_windows] ? "magick convert" : "convert",
+        arguments,
+        local_options
+      )
     end
 
     # The identify method runs the identify binary with the provided arguments.
     # See Paperclip.run for the available options.
     def identify(arguments = "", local_options = {})
-      Paperclip.run('identify', arguments, local_options)
+      Paperclip.run(
+        Paperclip.options[:is_windows] ? "magick identify" : "identify",
+        arguments,
+        local_options
+      )
     end
   end
 end

data/lib/paperclip/processor_helpers.rb

@@ -26,7 +26,9 @@ module Paperclip
           file_exists
         end
 
-        raise LoadError, "Could not find the '#{name}' processor in any of these paths: #{directories.join(', ')}" unless required.any?
+        unless required.any?
+          raise LoadError, "Could not find the '#{name}' processor in any of these paths: #{directories.join(', ')}"
+        end
       end
     end
 

data/lib/paperclip/rails_environment.rb

@@ -5,11 +5,7 @@ module Paperclip
     end
 
     def get
-      if rails_exists? && rails_environment_exists?
-        Rails.env
-      else
-        nil
-      end
+      Rails.env if rails_exists? && rails_environment_exists?
     end
 
     private

data/lib/paperclip/railtie.rb

@@ -1,11 +1,11 @@
-require 'paperclip'
-require 'paperclip/schema'
+require "paperclip"
+require "paperclip/schema"
 
 module Paperclip
-  require 'rails'
+  require "rails"
 
   class Railtie < Rails::Railtie
-    initializer 'paperclip.insert_into_active_record' do |app|
+    initializer "paperclip.insert_into_active_record" do |app|
       ActiveSupport.on_load :active_record do
         Paperclip::Railtie.insert
       end
@@ -24,7 +24,7 @@ module Paperclip
 
       if defined?(ActiveRecord)
         Paperclip.options[:logger] = ActiveRecord::Base.logger
-        ActiveRecord::Base.send(:include, Paperclip::Glue)
+        ActiveRecord::Base.include Paperclip::Glue
       end
     end
   end

data/lib/paperclip/schema.rb

@@ -1,36 +1,40 @@
-require 'active_support/deprecation'
+require "active_support/deprecation"
 
 module Paperclip
   # Provides helper methods that can be used in migrations.
   module Schema
-    COLUMNS = {:file_name    => :string,
-               :content_type => :string,
-               :file_size    => :integer,
-               :updated_at   => :datetime}
+    COLUMNS = { file_name: :string,
+                content_type: :string,
+                file_size: :bigint,
+                updated_at: :datetime }.freeze
 
-    def self.included(base)
-      ActiveRecord::ConnectionAdapters::Table.send :include, TableDefinition
-      ActiveRecord::ConnectionAdapters::TableDefinition.send :include, TableDefinition
-      ActiveRecord::ConnectionAdapters::AbstractAdapter.send :include, Statements
-      ActiveRecord::Migration::CommandRecorder.send :include, CommandRecorder
+    def self.included(_base)
+      ActiveRecord::ConnectionAdapters::Table.include TableDefinition
+      ActiveRecord::ConnectionAdapters::TableDefinition.include TableDefinition
+      ActiveRecord::ConnectionAdapters::AbstractAdapter.include Statements
+      ActiveRecord::Migration::CommandRecorder.include CommandRecorder
     end
 
     module Statements
       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?
+        if attachment_names.empty?
+          raise ArgumentError, "Please specify attachment name in your add_attachment call in your migration."
+        end
 
         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] || {})
-            add_column(table_name, "#{attachment_name}_#{column_name}", column_type, **column_options)
+            add_column(table_name, "#{attachment_name}_#{column_name}", column_type, column_options)
           end
         end
       end
 
       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?
+        if attachment_names.empty?
+          raise ArgumentError, "Please specify attachment name in your remove_attachment call in your migration."
+        end
 
         attachment_names.each do |attachment_name|
           COLUMNS.keys.each do |column_name|
@@ -51,7 +55,7 @@ module Paperclip
         attachment_names.each do |attachment_name|
           COLUMNS.each_pair do |column_name, column_type|
             column_options = options.merge(options[column_name.to_sym] || {})
-            column("#{attachment_name}_#{column_name}", column_type, **column_options)
+            column("#{attachment_name}_#{column_name}", column_type, column_options)
           end
         end
       end

data/lib/paperclip/storage/filesystem.rb

@@ -19,11 +19,10 @@ module Paperclip
     #   saved by paperclip. If you set this to an explicit octal value (0755, 0644, etc) then
     #   that value will be used to set the permissions for an uploaded file. The default is 0666.
     #   If you set :override_file_permissions to false, the chmod will be skipped. This allows
-    #   you to use paperclip on filesystems that don't understand unix file permissions, and has the 
+    #   you to use paperclip on filesystems that don't understand unix file permissions, and has the
     #   added benefit of using the storage directories default umask on those that do.
     module Filesystem
-      def self.extended base
-      end
+      def self.extended(base); end
 
       def exists?(style_name = default_style)
         if original_filename
@@ -46,8 +45,8 @@ module Paperclip
             end
           end
           unless @options[:override_file_permissions] == false
-            resolved_chmod = (@options[:override_file_permissions] & ~0111) || (0666 & ~File.umask)
-            FileUtils.chmod( resolved_chmod, path(style_name) )
+            resolved_chmod = (@options[:override_file_permissions] & ~0o111) || (0o666 & ~File.umask)
+            FileUtils.chmod(resolved_chmod, path(style_name))
           end
           file.rewind
         end
@@ -66,7 +65,7 @@ module Paperclip
             # ignore file-not-found, let everything else pass
           end
           begin
-            while(true)
+            loop do
               path = File.dirname(path)
               FileUtils.rmdir(path)
               break if File.exist?(path) # Ruby 1.9.2 does not raise if the removal failed.
@@ -96,6 +95,5 @@ module Paperclip
         end
       end
     end
-
   end
 end

data/lib/paperclip/storage/fog.rb

@@ -19,7 +19,7 @@ module Paperclip
     #   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.
-    # * +fog_file*: This can be hash or lambda returning hash. The
+    # * +fog_file+: This can be hash or lambda returning hash. The
     #   value is used as base properties for new uploaded file.
     # * +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
@@ -39,26 +39,30 @@ module Paperclip
     #     { :multipart_chunk_size => 104857600 }
 
     module Fog
-      def self.extended base
-        begin
-          require 'fog'
-        rescue LoadError => e
-          e.message << " (You may need to install the fog gem)"
-          raise e
-        end unless defined?(Fog)
+      def self.extended(base)
+        unless defined?(Fog)
+          begin
+            require "fog"
+          rescue LoadError => e
+            e.message << " (You may need to install the fog gem)"
+            raise e
+          end
+        end
 
         base.instance_eval do
           unless @options[:url].to_s.match(/\A:fog.*url\z/)
-            @options[:path]  = @options[:path].gsub(/:url/, @options[:url]).gsub(/\A:rails_root\/public\/system\//, '')
-            @options[:url]   = ':fog_public_url'
+            @options[:path]  = @options[:path].gsub(/:url/, @options[:url]).gsub(/\A:rails_root\/public\/system\//, "")
+            @options[:url]   = ":fog_public_url"
+          end
+          unless Paperclip::Interpolations.respond_to? :fog_public_url
+            Paperclip.interpolates(:fog_public_url) do |attachment, style|
+              attachment.public_url(style)
+            end
           end
-          Paperclip.interpolates(:fog_public_url) do |attachment, style|
-            attachment.public_url(style)
-          end unless Paperclip::Interpolations.respond_to? :fog_public_url
         end
       end
 
-      AWS_BUCKET_SUBDOMAIN_RESTRICTON_REGEX = /\A(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}\z))(?:[a-z0-9]|\.(?![\.\-])|\-(?![\.])){1,61}[a-z0-9]\z/
+      AWS_BUCKET_SUBDOMAIN_RESTRICTON_REGEX = /\A(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}\z))(?:[a-z0-9]|\.(?![\.\-])|\-(?![\.])){1,61}[a-z0-9]\z/.freeze
 
       def exists?(style = default_style)
         if original_filename
@@ -101,20 +105,21 @@ module Paperclip
       end
 
       def flush_writes
-        for style, file in @queued_for_write do
+        @queued_for_write.each do |style, file|
           log("saving #{path(style)}")
           retried = false
           begin
             attributes = fog_file.merge(
-              :body         => file,
-              :key          => path(style),
-              :public       => fog_public(style),
-              :content_type => file.content_type
+              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
             directory.save
             file.rewind
@@ -130,9 +135,9 @@ module Paperclip
       end
 
       def flush_deletes
-        for path in @queued_for_delete do
+        @queued_for_delete.each do |path|
           log("deleting #{path}")
-          directory.files.new(:key => path).destroy
+          directory.files.new(key: path).destroy
         end
         @queued_for_delete = []
       end
@@ -141,10 +146,10 @@ module Paperclip
         if @options[:fog_host]
           "#{dynamic_fog_host_for_style(style)}/#{path(style)}"
         else
-          if fog_credentials[:provider] == 'AWS'
+          if fog_credentials[:provider] == "AWS"
             "#{scheme}://#{host_name_for_directory}/#{path(style)}"
           else
-            directory.files.new(:key => path(style)).public_url
+            directory.files.new(key: path(style)).public_url
           end
         end
       end
@@ -162,7 +167,7 @@ module Paperclip
           expiring_url = url(style_name)
         end
 
-        return expiring_url
+        expiring_url
       end
 
       def parse_credentials(creds)
@@ -172,9 +177,10 @@ module Paperclip
 
       def copy_to_local_file(style, local_dest_path)
         log("copying #{path(style)} to local file #{local_dest_path}")
-        ::File.open(local_dest_path, 'wb') do |local_file|
+        ::File.open(local_dest_path, "wb") do |local_file|
           file = directory.files.get(path(style))
           return false unless file
+
           local_file.write(file.body)
         end
       rescue ::Fog::Errors::Error => e
@@ -185,9 +191,7 @@ module Paperclip
       private
 
       def convert_time(time)
-        if time.is_a?(Integer)
-          time = Time.now + time
-        end
+        time = Time.now + time if time.is_a?(Integer)
         time
       end
 
@@ -195,7 +199,7 @@ module Paperclip
         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]
+          @options[:fog_host] =~ /%d/ ? @options[:fog_host] % (path(style).hash % 4) : @options[:fog_host]
         end
       end
 
@@ -210,9 +214,9 @@ module Paperclip
       def find_credentials(creds)
         case creds
         when File
-          YAML::load(ERB.new(File.read(creds.path)).result)
+          YAML::safe_load(ERB.new(File.read(creds.path)).result)
         when String, Pathname
-          YAML::load(ERB.new(File.read(creds)).result)
+          YAML::safe_load(ERB.new(File.read(creds)).result)
         when Hash
           creds
         else
@@ -241,7 +245,7 @@ module Paperclip
       end
 
       def scheme
-        @scheme ||= fog_credentials[:scheme] || 'https'
+        @scheme ||= fog_credentials[:scheme] || "https"
       end
     end
   end