kt-paperclip 6.4.2 → 7.2.0

data/.travis.yml

@@ -1,7 +1,6 @@
 language: ruby
 
 rvm:
-  - 2.2
   - 2.3
   - 2.4
   - 2.5
@@ -25,18 +24,19 @@ gemfile:
   - gemfiles/5.1.gemfile
   - gemfiles/5.2.gemfile
   - gemfiles/6.0.gemfile
+  - gemfiles/6.1.gemfile
 
 matrix:
   fast_finish: true
   exclude:
-    - gemfile: gemfiles/5.2.gemfile
-      rvm: 2.2
-    - gemfile: gemfiles/6.0.gemfile
-      rvm: 2.2
     - gemfile: gemfiles/6.0.gemfile
       rvm: 2.3
     - gemfile: gemfiles/6.0.gemfile
       rvm: 2.4
+    - gemfile: gemfiles/6.1.gemfile
+      rvm: 2.3
+    - gemfile: gemfiles/6.1.gemfile
+      rvm: 2.4
     - gemfile: gemfiles/4.2.gemfile
       rvm: 2.7
     - gemfile: gemfiles/5.0.gemfile

data/Appraisals

@@ -22,3 +22,9 @@ appraise "6.0" do
   gem "sqlite3", "~> 1.4", platforms: :ruby
   gem "rails", "~> 6.0.0"
 end
+
+appraise "6.1" do
+  gem "sqlite3", "~> 1.4", platforms: :ruby
+  gem "aruba", "~> 1.0", ">= 1.0.4"
+  gem "rails", "~> 6.1", ">= 6.1.1"
+end

data/CONTRIBUTING.md

@@ -10,8 +10,7 @@ Here's a quick guide for contributing:
 
 1. Fork the repo.
 
-1. Make sure you have ImageMagick and Ghostscript installed. See [this section]
-(./README.md#image-processor) of the README.
+1. Make sure you have ImageMagick and Ghostscript installed. See [this section](./README.md#image-processor) of the README.
 
 1. Run the tests. We only take pull requests with passing tests, and it's great
 to know that you have a clean slate: `bundle && bundle exec rake`
@@ -78,9 +77,9 @@ Syntax
 
 * Two spaces, no tabs.
 * No trailing whitespace. Blank lines should not have any space.
-* Prefer &&/|| over and/or.
-* MyClass.my_method(my_arg) not my_method( my_arg ) or my_method my_arg.
-* a = b and not a=b.
+* Prefer `&&` instead of `and` ; prefer `||` instead of `or`.
+* Use `MyClass.my_method(my_arg)` instead of `MyClass.my_method( my_arg )` or `MyClass.my_method my_arg`.
+* `a = b` rather than `a=b` .
 * Follow the conventions you see used in the source already.
 
 And in case we didn't emphasize it enough: we love tests!

data/Gemfile

@@ -11,9 +11,9 @@ group :development, :test do
   gem "bootsnap", require: false
   gem "builder"
   gem "listen", "~> 3.0.8"
-  gem "mime-types"
   gem "rspec"
-  gem "rubocop", require: false
+  # Hound only supports certain versions of Rubocop -- 1.22.1 is currently the most recent one supported.
+  gem "rubocop", "1.22.1", require: false
   gem "rubocop-rails"
   gem "sprockets", "3.7.2"
 end

data/NEWS

@@ -1,3 +1,34 @@
+[UNRELEASED]
+Issue file delete only once per unique style when nullifying attachment or destroying an object. Avoids triggering a rate limit error on Google Cloud Storage.
+
+7.0.0 (2021-05-28)
+* Replace `mimemagic` gem with `marcel` due to licensing issues. See https://github.com/kreeti/kt-paperclip/pull/54 for details and limitations
+
+6.4.1 (2021-01-30)
+* Improvement: Use URI.open in ruby > 2.5 (PR #45)
+
+6.4.0 (2020-12-14)
+* Improvement: Fix Ruby 2.7 method & syntax deprecation warnings (#38)
+
+6.3.0 (2020-08-10)
+* Feature: Add validation_errors_to option - customize copying of errors (#26)
+* Stability: Dropped support for ruby 2.1
+
+6.2.2 (2020-02-18)
+* Bugfix: Add support for Aliases in S3 credentials YAML (accidentally removed during 6.2.0 upgrade).
+
+6.2.1 (2020-01-30)
+
+* Bugfix: Auto-loading of the gem code (necessitated due to change in gem name).
+
+6.2.0 (2020-01-23):
+
+* Bugfix: Don't do post-processing on invalid attachments (#16).
+* Improvement: Use AWS::S3 built in download_file method (#9).
+* Stability: Rubocop recommended syntax updates (#10, #11, #13, #14).
+* Stability: Testing - replace mocha and bourne with rspec mocks (#6).
+* Stability: Fix test suite to run with Rails 5 and Rails 6 (#19, #20, #7).
+
 6.1.0 (2018-07-27):
 
 * BUGFIX: Don't double-encode URLs (Roderick Monje).

data/README.md

@@ -90,7 +90,7 @@ Requirements
 
 ### Ruby and Rails
 
-Paperclip now requires Ruby version **>= 2.2** and Rails version **>= 4.2**
+Paperclip now requires Ruby version **>= 2.3** and Rails version **>= 4.2**
 (only if you're going to use Paperclip with Ruby on Rails).
 
 ### Image Processor
@@ -171,7 +171,7 @@ Paperclip is distributed as a gem, which is how it should be used in your app.
 Include the gem in your Gemfile:
 
 ```ruby
-gem "kt-paperclip", "~> 6.3"
+gem "kt-paperclip", "~> 6.4", ">= 6.4.1"
 ```
 
 Or, if you want to get the latest, you can get master from the main paperclip repository:
@@ -592,9 +592,9 @@ Storage
 
 Paperclip ships with 3 storage adapters:
 
-* File Storage
-* S3 Storage (via `aws-sdk-s3`)
-* Fog Storage
+* File Storage (`storage: :filesystem`)
+* S3 Storage (via `aws-sdk-s3`) (`storage: :s3`)
+* Fog Storage (`storage: :fog`)
 
 If you would like to use Paperclip with another storage, you can install these
 gems along side with Paperclip:
@@ -1070,5 +1070,6 @@ Thank you to all [the contributors](https://github.com/kreeti/kt-paperclip/graph
 License
 -------
 
-Paperclip is Copyright © 2008-2017 thoughtbot, inc. It is free software, and may be
-redistributed under the terms specified in the MIT-LICENSE file.
+Copyright © 2020-2021 Kreeti Technologies Pvt. Ltd.
+Copyright © 2008-2017 thoughtbot, inc.
+It is free software, and may be redistributed under the terms specified in the MIT-LICENSE file.

data/features/step_definitions/attachment_steps.rb

@@ -23,7 +23,7 @@ When /^I modify my attachment definition to:$/ do |definition|
 end
 
 When /^I upload the fixture "([^"]*)"$/ do |filename|
-  run_simple %(bundle exec rails runner "User.create!(:attachment => File.open('#{fixture_path(filename)}'))")
+  aruba_run_simple %(bundle exec rails runner "User.create!(:attachment => File.open('#{fixture_path(filename)}'))")
 end
 
 Then /^the attachment "([^"]*)" should have a dimension of (\d+x\d+)$/ do |filename, dimension|
@@ -108,3 +108,13 @@ Then /^I should not have attachment columns for "([^"]*)"$/ do |attachment_name|
     expect(columns).not_to include(*expect_columns)
   end
 end
+
+# we have to support different versions of aruba, and this method was renamed for 1.0
+# https://github.com/cucumber/aruba/pull/438
+def aruba_run_simple(*args)
+  if respond_to?(:run_simple)
+    run_simple(*args)
+  elsif respond_to?(:run_command_and_stop)
+    run_command_and_stop(*args)
+  end
+end

data/gemfiles/4.2.gemfile

@@ -11,9 +11,9 @@ group :development, :test do
   gem "bootsnap", require: false
   gem "builder"
   gem "listen", "~> 3.0.8"
-  gem "mime-types"
   gem "rspec"
   gem "rubocop", require: false
+  gem "rubocop-rails"
   gem "sprockets", "3.7.2"
 end
 

data/gemfiles/5.0.gemfile

@@ -11,9 +11,9 @@ group :development, :test do
   gem "bootsnap", require: false
   gem "builder"
   gem "listen", "~> 3.0.8"
-  gem "mime-types"
   gem "rspec"
   gem "rubocop", require: false
+  gem "rubocop-rails"
   gem "sprockets", "3.7.2"
 end
 

data/gemfiles/5.1.gemfile

@@ -11,9 +11,9 @@ group :development, :test do
   gem "bootsnap", require: false
   gem "builder"
   gem "listen", "~> 3.0.8"
-  gem "mime-types"
   gem "rspec"
   gem "rubocop", require: false
+  gem "rubocop-rails"
   gem "sprockets", "3.7.2"
 end
 

data/gemfiles/5.2.gemfile

@@ -11,9 +11,9 @@ group :development, :test do
   gem "bootsnap", require: false
   gem "builder"
   gem "listen", "~> 3.0.8"
-  gem "mime-types"
   gem "rspec"
   gem "rubocop", require: false
+  gem "rubocop-rails"
   gem "sprockets", "3.7.2"
 end
 

data/gemfiles/6.0.gemfile

@@ -11,9 +11,9 @@ group :development, :test do
   gem "bootsnap", require: false
   gem "builder"
   gem "listen", "~> 3.0.8"
-  gem "mime-types"
   gem "rspec"
   gem "rubocop", require: false
+  gem "rubocop-rails"
   gem "sprockets", "3.7.2"
 end
 

data/gemfiles/6.1.gemfile

@@ -0,0 +1,21 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "pry"
+gem "sqlite3", "~> 1.4", platforms: :ruby
+gem "aruba", "~> 1.0", ">= 1.0.4"
+gem "rails", "~> 6.1", ">= 6.1.1"
+
+group :development, :test do
+  gem "activerecord-import"
+  gem "bootsnap", require: false
+  gem "builder"
+  gem "listen", "~> 3.0.8"
+  gem "rspec"
+  gem "rubocop", require: false
+  gem "rubocop-rails"
+  gem "sprockets", "3.7.2"
+end
+
+gemspec path: "../"

data/gemfiles/7.0.gemfile

@@ -0,0 +1,21 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "pry"
+gem "sqlite3", "~> 1.4", platforms: :ruby
+gem "aruba", "~> 1.0", ">= 1.0.4"
+gem "rails", "~> 7.0.0"
+
+group :development, :test do
+  gem "activerecord-import"
+  gem "bootsnap", require: false
+  gem "builder"
+  gem "listen", "~> 3.0.8"
+  gem "rspec"
+  gem "rubocop", require: false
+  gem "rubocop-rails"
+  gem "sprockets", "3.7.2"
+end
+
+gemspec path: "../"

data/lib/paperclip/attachment.rb

@@ -38,7 +38,7 @@ module Paperclip
     end
 
     attr_reader :name, :instance, :default_style, :convert_options, :queued_for_write, :whiny,
-                :options, :interpolator, :source_file_options
+                :options, :interpolator, :source_file_options, :queued_for_delete
     attr_accessor :post_processing
 
     # Creates an Attachment object. +name+ is the name of the attachment,

data/lib/paperclip/content_type_detector.rb

@@ -60,16 +60,21 @@ module Paperclip
     end
 
     def type_from_file_contents
-      type_from_mime_magic || type_from_file_command
+      type_from_marcel || type_from_file_command
     rescue Errno::ENOENT => e
       Paperclip.log("Error while determining content type: #{e}")
       SENSIBLE_DEFAULT
     end
 
-    def type_from_mime_magic
-      @type_from_mime_magic ||= File.open(@filepath) do |file|
-        MimeMagic.by_magic(file).try(:type)
-      end
+    def type_from_marcel
+      return @type_from_marcel if defined? @type_from_marcel
+
+      @type_from_marcel = Marcel::MimeType.for Pathname.new(@filepath),
+                                               name: @filepath
+      # Marcel::MineType returns 'application/octet-stream' if it can't find
+      # a valid type.
+      @type_from_marcel = nil if @type_from_marcel == SENSIBLE_DEFAULT
+      @type_from_marcel
     end
 
     def type_from_file_command

data/lib/paperclip/interpolations.rb

@@ -54,10 +54,14 @@ module Paperclip
     # 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) }
+      if Thread.current.thread_variable_get(:kt_paperclip_no_recursion)
+        raise Errors::InfiniteInterpolationError
+      end
+      Thread.current.thread_variable_set(:kt_paperclip_no_recursion, true)
       attachment.url(style_name, timestamp: false, escape: false)
+    ensure
+      Thread.current.thread_variable_set(:kt_paperclip_no_recursion, false)
     end
 
     # Returns the timestamp as defined by the <attachment>_updated_at field

data/lib/paperclip/media_type_spoof_detector.rb

@@ -76,6 +76,8 @@ module Paperclip
       Paperclip.run("file", "-b --mime :file", file: @file.path).
         split(/[:;\s]+/).first
     rescue Terrapin::CommandLineError
+      Paperclip.log("Problem getting type from `file` command. Possible that `file` doesn't exist on this system. Content Type validations don't work without this.")
+
       ""
     end
 

data/lib/paperclip/schema.rb

@@ -6,7 +6,7 @@ module Paperclip
     COLUMNS = { file_name: :string,
                 content_type: :string,
                 file_size: :bigint,
-                updated_at: :datetime }.freeze
+                updated_at: :datetime }
 
     def self.included(_base)
       ActiveRecord::ConnectionAdapters::Table.include TableDefinition

data/lib/paperclip/storage/filesystem.rb

@@ -57,7 +57,7 @@ module Paperclip
       end
 
       def flush_deletes #:nodoc:
-        @queued_for_delete.each do |path|
+        @queued_for_delete.uniq.each do |path|
           begin
             log("deleting #{path}")
             FileUtils.rm(path) if File.exist?(path)

data/lib/paperclip/storage/fog.rb

@@ -135,7 +135,7 @@ module Paperclip
       end
 
       def flush_deletes
-        @queued_for_delete.each do |path|
+        @queued_for_delete.uniq.each do |path|
           log("deleting #{path}")
           directory.files.new(key: path).destroy
         end

data/lib/paperclip/storage/s3.rb

@@ -137,6 +137,9 @@ module Paperclip
           @s3_headers = {}
           merge_s3_headers(@options[:s3_headers], @s3_headers, @s3_metadata)
 
+          @s3_acl_enabled = @options[:s3_acl_enabled]
+          @s3_acl_enabled = true if @s3_acl_enabled.nil?
+
           @s3_storage_class = set_storage_class(@options[:s3_storage_class])
 
           @s3_server_side_encryption = "AES256"
@@ -359,9 +362,12 @@ module Paperclip
             log("saving #{path(style)}")
             write_options = {
               content_type: file.content_type,
-              acl: s3_permissions(style)
             }
 
+            if @s3_acl_enabled
+              write_options[:acl] = s3_permissions(style)
+            end
+
             # add storage class for this style if defined
             storage_class = s3_storage_class(style)
             write_options.merge!(storage_class: storage_class) if storage_class
@@ -403,7 +409,7 @@ module Paperclip
       end
 
       def flush_deletes #:nodoc:
-        @queued_for_delete.each do |path|
+        @queued_for_delete.uniq.each do |path|
           begin
             log("deleting #{path}")
             s3_bucket.object(path.sub(%r{\A/}, "")).delete
@@ -427,9 +433,9 @@ module Paperclip
       def find_credentials(creds)
         case creds
         when File
-          YAML::safe_load(ERB.new(File.read(creds.path)).result, [], [], true)
+          load_credentials_from_file(creds.path)
         when String, Pathname
-          YAML::safe_load(ERB.new(File.read(creds)).result, [], [], true)
+          load_credentials_from_file(creds)
         when Hash
           creds
         when NilClass
@@ -439,6 +445,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 use_secure_protocol?(style_name)
         s3_protocol(style_name) == "https"
       end

data/lib/paperclip/validators/attachment_file_name_validator.rb

@@ -27,7 +27,7 @@ module Paperclip
             [:both, :base].include?(options[:add_validation_errors_to])
 
           record.errors[attribute].each do |error|
-            record.errors.add base_attribute, error
+            record.errors.add(base_attribute, error)
           end
 
           record.errors.delete(attribute) if options[:add_validation_errors_to] == :base

data/lib/paperclip/validators/attachment_size_validator.rb

@@ -35,8 +35,9 @@ module Paperclip
           options.slice(*AVAILABLE_CHECKS).each do |option, option_value|
             option_value = option_value.call(record) if option_value.is_a?(Proc)
             option_value = extract_option_value(option, option_value)
-
-            unless value.send(CHECKS[option], option_value)
+            operator = ActiveRecord::VERSION::MAJOR >= 7 ? COMPARE_CHECKS[option] : CHECKS[option]
+              
+            unless value.send(operator, option_value)
               error_message_key = options[:in] ? :in_between : option
               error_attrs.each do |error_attr_name|
                 record.errors.add(error_attr_name, error_message_key, **filtered_options(value).merge(

data/lib/paperclip/version.rb

@@ -1,3 +1,3 @@
 module Paperclip
-  VERSION = "6.4.2" unless defined?(Paperclip::VERSION)
+  VERSION = "7.2.0" unless defined?(Paperclip::VERSION)
 end

data/lib/paperclip.rb

@@ -64,8 +64,7 @@ rescue LoadError
   require "mime/types"
 end
 
-require "mimemagic"
-require "mimemagic/overlay"
+require "marcel"
 require "logger"
 require "terrapin"
 

data/paperclip.gemspec

@@ -20,12 +20,12 @@ Gem::Specification.new do |s|
   s.post_install_message = File.read("UPGRADING") if File.exist?("UPGRADING")
 
   s.requirements << "ImageMagick"
-  s.required_ruby_version = ">= 2.2.0"
+  s.required_ruby_version = ">= 2.3.0"
 
   s.add_dependency("activemodel", ">= 4.2.0")
   s.add_dependency("activesupport", ">= 4.2.0")
   s.add_dependency("mime-types")
-  s.add_dependency("mimemagic", "~> 0.3.0")
+  s.add_dependency("marcel", "~> 1.0.1")
   s.add_dependency("terrapin", "~> 0.6.0")
 
   s.add_development_dependency("activerecord", ">= 4.2.0")

data/spec/paperclip/content_type_detector_spec.rb

@@ -7,6 +7,13 @@ describe Paperclip::ContentTypeDetector do
                  Paperclip::ContentTypeDetector.new(file.path).detect
   end
 
+  it 'returns a more specific content type based on the filename if it matches
+      multiple content types' do
+    file = File.new(fixture_file('sample.xlsm'))
+    assert_equal 'application/vnd.ms-excel.sheet.macroenabled.12',
+                 Paperclip::ContentTypeDetector.new(file.path).detect
+  end
+
   it "gives a sensible default when the name is empty" do
     assert_equal "application/octet-stream", Paperclip::ContentTypeDetector.new("").detect
   end

data/spec/paperclip/io_adapters/abstract_adapter_spec.rb

@@ -15,7 +15,7 @@ describe Paperclip::AbstractAdapter do
     before do
       allow(subject).to receive(:path).and_return("image.png")
       allow(Paperclip).to receive(:run).and_return("image/png\n")
-      allow_any_instance_of(Paperclip::ContentTypeDetector).to receive(:type_from_mime_magic).and_return("image/png")
+      allow_any_instance_of(Paperclip::ContentTypeDetector).to receive(:type_from_marcel).and_return("image/png")
     end
 
     it "returns the content type without newline" do

data/spec/paperclip/io_adapters/file_adapter_spec.rb

@@ -78,7 +78,7 @@ describe Paperclip::FileAdapter do
           allow(MIME::Types).to receive(:type_for).and_return([])
           allow(Paperclip).to receive(:run).and_return("application/vnd.ms-office\n")
           allow_any_instance_of(Paperclip::ContentTypeDetector).
-            to receive(:type_from_mime_magic).and_return("application/vnd.ms-office")
+            to receive(:type_from_marcel).and_return("application/vnd.ms-office")
 
           @subject = Paperclip.io_adapters.for(@file)
         end

data/spec/paperclip/storage/filesystem_spec.rb

@@ -49,6 +49,29 @@ describe Paperclip::Storage::Filesystem do
         assert_equal @file.read, tempfile.read
         tempfile.close
       end
+
+      it "only issues a delete call once for each unique attachment style when nullifying attachment" do
+        @dummy.save
+        @dummy.avatar.clear(:thumbnail)
+        @dummy.avatar = nil
+        assert_equal 3, @dummy.avatar.queued_for_delete.size
+
+        expect(FileUtils).to receive(:rm).twice
+        @dummy.save
+
+        FileUtils.rm_rf("tmp")
+      end
+
+      it "only issues a delete call once for each unique attachment style when destroying model" do
+        @dummy.save
+        @dummy.avatar.clear(:thumbnail)
+        assert_equal 1, @dummy.avatar.queued_for_delete.size
+
+        expect(FileUtils).to receive(:rm).twice
+        @dummy.destroy
+
+        FileUtils.rm_rf("tmp")
+      end
     end
 
     context "with file that has space in file name" do

data/spec/paperclip/storage/fog_spec.rb

@@ -7,6 +7,52 @@ describe Paperclip::Storage::Fog do
   context "" do
     before { Fog.mock! }
 
+    context "deleting attachment styles" do
+      before do
+        rebuild_model styles: { medium: "300x300>", thumb: "100x100>" },
+                      storage: :fog,
+                      url: "/:attachment/:style/:filename",
+                      fog_directory: "paperclip",
+                      fog_credentials: fixture_file("fog.yml")
+        @file = File.open(fixture_file("5k.png"))
+        @dummy = Dummy.new
+        @dummy.avatar = @file
+        @dummy.save
+      end
+
+      after do
+        @file.close
+        FileUtils.rm_rf("tmp")
+      end
+
+      it "only issues a delete call once for each unique attachment style when nullifying attachment" do
+        @dummy.avatar.clear(:thumb)
+        @dummy.avatar = nil
+        assert_equal 4, @dummy.avatar.queued_for_delete.size
+
+        original = double("original")
+        medium = double("medium")
+        thumb = double("thumb")
+
+        allow(Fog::AWS::Storage::File).to receive(:new).and_return(original, medium, thumb)
+
+        expect(original).to receive(:destroy).once
+        expect(medium).to receive(:destroy).once
+        expect(thumb).to receive(:destroy).once
+        @dummy.save
+      end
+
+      it "only issues a delete call once for each unique attachment style when destroying model" do
+        @dummy.avatar.clear(:thumb)
+        assert_equal 1, @dummy.avatar.queued_for_delete.size
+
+        file = double("file")
+        allow(Fog::AWS::Storage::File).to receive(:new).and_return(file)
+        expect(file).to receive(:destroy).exactly(3).times
+        @dummy.destroy
+      end
+    end
+
     context "with credentials provided in a path string" do
       before do
         rebuild_model styles: { medium: "300x300>", thumb: "100x100>" },