kt-paperclip 7.0.1 → 7.1.0

data/Gemfile

@@ -12,7 +12,8 @@ group :development, :test do
   gem "builder"
   gem "listen", "~> 3.0.8"
   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/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/content_type_detector.rb

@@ -67,9 +67,13 @@ module Paperclip
     end
 
     def type_from_marcel
-      @type_from_marcel ||= File.open(@filepath) do |file|
-        Marcel::Magic.by_magic(file).try(:type)
-      end
+      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
     end
 
     def type_from_file_command

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 = Rails::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 = "7.0.1" unless defined?(Paperclip::VERSION)
+  VERSION = "7.1.0" unless defined?(Paperclip::VERSION)
 end

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kt-paperclip
 version: !ruby/object:Gem::Version
-  version: 7.0.1
+  version: 7.1.0
 platform: ruby
 authors:
 - Surendra Singhi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-06 00:00:00.000000000 Z
+date: 2022-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -394,6 +394,7 @@ files:
 - gemfiles/5.2.gemfile
 - gemfiles/6.0.gemfile
 - gemfiles/6.1.gemfile
+- gemfiles/7.0.gemfile
 - lib/generators/paperclip/USAGE
 - lib/generators/paperclip/paperclip_generator.rb
 - lib/generators/paperclip/templates/paperclip_migration.rb.erb
@@ -533,6 +534,7 @@ files:
 - spec/support/fixtures/fog.yml
 - spec/support/fixtures/rotated.jpg
 - spec/support/fixtures/s3.yml
+- spec/support/fixtures/sample.xlsm
 - spec/support/fixtures/spaced file.jpg
 - spec/support/fixtures/spaced file.png
 - spec/support/fixtures/text.txt