kt-paperclip 7.2.2 → 8.0.0

data/lib/paperclip/storage/fog.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Paperclip
   module Storage
     # fog is a modern and versatile cloud computing library for Ruby.
@@ -44,8 +46,7 @@ module Paperclip
           begin
             require "fog"
           rescue LoadError => e
-            e.message << " (You may need to install the fog gem)"
-            raise e
+            raise("#{e.message} (You may need to install the fog gem)")
           end
         end
 
@@ -214,9 +215,9 @@ module Paperclip
       def find_credentials(creds)
         case creds
         when File
-          YAML::safe_load(ERB.new(File.read(creds.path)).result)
+          load_credentials_from_file(creds.path)
         when String, Pathname
-          YAML::safe_load(ERB.new(File.read(creds)).result)
+          load_credentials_from_file(creds)
         when Hash
           creds
         else
@@ -228,6 +229,14 @@ module Paperclip
         end
       end
 
+      def load_credentials_from_file(path)
+        if Gem::Version.new(Psych::VERSION) >= Gem::Version.new("3.1.0")
+          YAML::safe_load(ERB.new(File.read(path)).result, aliases: true)
+        else
+          YAML::safe_load(ERB.new(File.read(path)).result, [], [], true)
+        end
+      end
+
       def connection
         @connection ||= ::Fog::Storage.new(fog_credentials)
       end

data/lib/paperclip/storage/s3.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Paperclip
   module Storage
     # Amazon's S3 file hosting service is a scalable, easy place to store files for
@@ -125,8 +127,7 @@ module Paperclip
         begin
           require "aws-sdk-s3"
         rescue LoadError => e
-          e.message << " (You may need to install the aws-sdk-s3 gem)"
-          raise e
+          raise("#{e.message} (You may need to install the aws-sdk-s3 gem)")
         end
 
         base.instance_eval do
@@ -280,6 +281,16 @@ module Paperclip
         s3_bucket.object style_name_as_path(style_name)
       end
 
+      def s3_transfer_manager
+        @s3_transfer_manager ||= begin
+          if ::Aws::S3.const_defined?(:TransferManager, false)
+            ::Aws::S3::TransferManager.new(client: s3_interface.client)
+          else
+            nil
+          end
+        end
+      end
+
       def use_accelerate_endpoint?
         !!@use_accelerate_endpoint
       end
@@ -386,7 +397,12 @@ module Paperclip
             write_options[:metadata] = @s3_metadata unless @s3_metadata.empty?
             write_options.merge!(@s3_headers)
 
-            s3_object(style).upload_file(file.path, write_options)
+            if s3_transfer_manager
+              destination = style_name_as_path(style)
+              s3_transfer_manager.upload_file(file.path, **write_options, bucket: bucket_name, key: destination)
+            else
+              s3_object(style).upload_file(file.path, write_options)
+            end
           rescue ::Aws::S3::Errors::NoSuchBucket
             create_bucket
             retry
@@ -422,7 +438,13 @@ module Paperclip
 
       def copy_to_local_file(style, local_dest_path)
         log("copying #{path(style)} to local file #{local_dest_path}")
-        s3_object(style).download_file(local_dest_path)
+        
+        if s3_transfer_manager
+          source = style_name_as_path(style)
+          s3_transfer_manager.download_file(local_dest_path, bucket: bucket_name, key: source)
+        else
+          s3_object(style).download_file(local_dest_path)
+        end
       rescue Aws::Errors::ServiceError => e
         warn("#{e} - cannot copy #{path(style)} to local file #{local_dest_path}")
         false
@@ -433,7 +455,7 @@ module Paperclip
       def find_credentials(creds)
         case creds
         when File
-          load_credentials_from_file(creds.path)
+           load_credentials_from_file(creds.path)
         when String, Pathname
           load_credentials_from_file(creds)
         when Hash

data/lib/paperclip/storage.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "paperclip/storage/filesystem"
 require "paperclip/storage/fog"
 require "paperclip/storage/s3"

data/lib/paperclip/style.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Paperclip
   # The Style class holds the definition of a thumbnail style,  applying
   # whatever processing is required to normalize the definition and delaying

data/lib/paperclip/tempfile.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Paperclip
   # Overriding some implementation of Tempfile
   class Tempfile < ::Tempfile

data/lib/paperclip/tempfile_factory.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Paperclip
   class TempfileFactory
     def generate(name = random_name)

data/lib/paperclip/thumbnail.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Paperclip
   # Handles thumbnailing images that are uploaded.
   class Thumbnail < Processor
@@ -31,8 +33,8 @@ module Paperclip
 
       geometry             = options[:geometry].to_s
       @crop                = geometry[-1, 1] == "#"
-      @target_geometry     = options.fetch(:string_geometry_parser, Geometry).parse(geometry)
-      @current_geometry    = options.fetch(:file_geometry_parser, Geometry).from_file(@file)
+      @target_geometry     = options.fetch(:string_geometry_parser, Commands::ImageMagick::GeometryParser).parse(geometry)
+      @current_geometry    = options.fetch(:file_geometry_parser, Commands::ImageMagick::GeometryParser).from_file(@file)
       @source_file_options = options[:source_file_options]
       @convert_options     = options[:convert_options]
       @whiny               = options.fetch(:whiny, true)
@@ -84,10 +86,8 @@ module Paperclip
       rescue Terrapin::ExitStatusError => e
         if @whiny
           message = "There was an error processing the thumbnail for #{@basename}:\n" + e.message
-          raise Paperclip::Error, message
+          raise Paperclip::Error.new(message)
         end
-      rescue Terrapin::CommandNotFoundError => e
-        raise Paperclip::Errors::CommandNotFoundError.new("Could not run the `convert` command. Please install ImageMagick.")
       end
 
       dst
@@ -119,13 +119,12 @@ module Paperclip
     # Return true if ImageMagick's +identify+ returns an animated format
     def identified_as_animated?
       if @identified_as_animated.nil?
-        @identified_as_animated = ANIMATED_FORMATS.include? identify("-format %m :file", file: "#{@file.path}[0]").to_s.downcase.strip
+        output = identify("-format %m :file", file: "#{@file.path}[0]").to_s.downcase.strip
+        @identified_as_animated = ANIMATED_FORMATS.include?(output)
       end
       @identified_as_animated
-    rescue Terrapin::ExitStatusError => e
-      raise Paperclip::Error, "There was an error running `identify` for #{@basename}" if @whiny
-    rescue Terrapin::CommandNotFoundError => e
-      raise Paperclip::Errors::CommandNotFoundError.new("Could not run the `identify` command. Please install ImageMagick.")
+    rescue Terrapin::ExitStatusError
+      raise Paperclip::Error.new("There was an error running `identify` for #{@basename}") if @whiny
     end
   end
 end

data/lib/paperclip/url_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "uri"
 require "active_support/core_ext/module/delegation"
 

data/lib/paperclip/validators/attachment_content_type_validator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Paperclip
   module Validators
     class AttachmentContentTypeValidator < ActiveModel::EachValidator

data/lib/paperclip/validators/attachment_file_name_validator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Paperclip
   module Validators
     class AttachmentFileNameValidator < ActiveModel::EachValidator

data/lib/paperclip/validators/attachment_file_type_ignorance_validator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_model/validations/presence"
 
 module Paperclip

data/lib/paperclip/validators/attachment_presence_validator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_model/validations/presence"
 
 module Paperclip

data/lib/paperclip/validators/attachment_size_validator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_model/validations/numericality"
 
 module Paperclip

data/lib/paperclip/validators/media_type_spoof_detection_validator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_model/validations/presence"
 
 module Paperclip

data/lib/paperclip/validators.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_model"
 require "active_support/concern"
 require "active_support/core_ext/array/wrap"

data/lib/paperclip/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Paperclip
-  VERSION = "7.2.2" unless defined?(Paperclip::VERSION)
+  VERSION = "8.0.0" unless defined?(Paperclip::VERSION)
 end

data/lib/paperclip.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Paperclip allows file attachments that are stored in the filesystem. All graphical
 # transformations are done using the Graphics/ImageMagick command line utilities and
 # are stored in Tempfiles until the record is saved. Paperclip does not require a
@@ -29,8 +31,13 @@ require "erb"
 require "digest"
 require "tempfile"
 require "paperclip/version"
-require "paperclip/geometry_parser_factory"
-require "paperclip/geometry_detector_factory"
+require "paperclip/commands/runner"
+require "paperclip/commands/imagemagick"
+require "paperclip/commands/imagemagick/version_detector"
+require "paperclip/commands/imagemagick/geometry_parser"
+require "paperclip/commands/unix_file"
+require "paperclip/geometry_parser_factory" # @deprectated
+require "paperclip/geometry_detector_factory" # @deprectated
 require "paperclip/geometry"
 require "paperclip/processor"
 require "paperclip/processor_helpers"
@@ -43,7 +50,7 @@ require "paperclip/style"
 require "paperclip/attachment"
 require "paperclip/storage"
 require "paperclip/callbacks"
-require "paperclip/file_command_content_type_detector"
+require "paperclip/file_command_content_type_detector" # @deprectated
 require "paperclip/media_type_spoof_detector"
 require "paperclip/content_type_detector"
 require "paperclip/glue"
@@ -77,6 +84,10 @@ module Paperclip
   extend Logger
   extend ProcessorHelpers
 
+  def self.deprecator
+    @deprecator ||= ActiveSupport::Deprecation.new(nil, "Paperclip")
+  end
+
   # Provides configurability to Paperclip. The options available are:
   # * whiny: Will raise an error if Paperclip cannot process thumbnails of
   #   an uploaded image. Defaults to true.
@@ -89,8 +100,11 @@ module Paperclip
   #   image's orientation. Defaults to true.
   def self.options
     @options ||= {
-      command_path: nil,
+      command_path: nil, # @deprecated Will be removed in Paperclip 8.0.
+      file_command_path: nil,
+      imagemagick_path: nil,
       content_type_mappings: {},
+      imagemagick_version: nil,
       log: true,
       log_command: true,
       read_timeout: nil,
@@ -100,6 +114,13 @@ module Paperclip
       is_windows: Gem.win_platform?,
       add_validation_errors_to: :both
     }
+    if @options[:command_path]
+      Paperclip.deprecator.warn(
+        "Paperclip.options[:command_path] will be removed in Paperclip 8.0. Please use " \
+        "Paperclip.options[:imagemagick_path] and/or Paperclip.options[:file_command_path] instead."
+      )
+    end
+    @options
   end
 
   def self.io_adapters=(new_registry)

data/lib/tasks/paperclip.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "paperclip/attachment_registry"
 
 module Paperclip
@@ -25,7 +27,7 @@ module Paperclip
     end
 
     def self.log_error(error)
-      $stderr.puts error
+      warn error
     end
   end
 end
@@ -40,18 +42,21 @@ namespace :paperclip do
       klass = Paperclip::Task.obtain_class
       names = Paperclip::Task.obtain_attachments(klass)
       styles = (ENV["STYLES"] || ENV["styles"] || "").split(",").map(&:to_sym)
+
       names.each do |name|
         Paperclip.each_instance_with_attachment(klass, name) do |instance|
           attachment = instance.send(name)
+
           begin
             attachment.reprocess!(*styles)
           rescue StandardError => e
             Paperclip::Task.log_error("exception while processing #{klass} ID #{instance.id}:")
-            Paperclip::Task.log_error(" " + e.message + "\n")
+            Paperclip::Task.log_error(" #{e.message}\n")
           end
-          unless instance.errors.blank?
+
+          if instance.errors.present?
             Paperclip::Task.log_error("errors while processing #{klass} ID #{instance.id}:")
-            Paperclip::Task.log_error(" " + instance.errors.full_messages.join("\n ") + "\n")
+            Paperclip::Task.log_error(" #{instance.errors.full_messages.join("\n ")}\n")
           end
         end
       end

data/shoulda_macros/paperclip.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "paperclip/matchers"
 
 module Paperclip