kt-paperclip 6.4.1 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5feef0e82a301e5ec7bface30f82007d82864dbad49f6ffe9f521522dc4cbf42
-  data.tar.gz: 2f0e12df815225d400486c6dbe8779ab9eb665afca82f529c0a94fcd7c607ab5
+  metadata.gz: 88e74021df46ad0074287f891fba5ca682856e9e04ee8d4799dd12d3ee6a16b6
+  data.tar.gz: 286dd1db7397931937182a720e399073708eb2288e90fb335ba202cb57209803
 SHA512:
-  metadata.gz: 9ded6bae6f8422c9f51aa9ec0d0b098af61f0a502468550afcbfece6e9516e1e4ce4d8b7989f472c92802cdbb17fa5dd33d98c5372161728b22c6ab57801304d
-  data.tar.gz: d3562d3f7e7e5fd35535972157e5d668ad9f2294db4d906e2307227c5c648c63dff231d28809df6d1a670a69f0c21d1e661fa8c0e475256bd8168f8bacb3b233
+  metadata.gz: bdd6685f4c714492582fd1fce2a2db7b26b0b6499134438aee64c4f384398cbd9e568ef7640c6856d83cde06b0616e04e081143b5a7131a3d0607258655ff6dd
+  data.tar.gz: 258c88aa96a0fee96f8fe1def58e1e6cbf94e59945fed2b41d6e45b71a483fdbb976ccff6b772a8e36fa973ad0f31e1c8d0026975101569393234d4a8f316057

data/.github/FUNDING.yml

@@ -1,3 +1,3 @@
 # These are supported funding model platforms
 
-github: [ssinghi, shalinibhawsingka-kreeti]
+github: [ssinghi, sbhawsingka]

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/Gemfile

@@ -11,7 +11,6 @@ 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"

data/NEWS

@@ -1,3 +1,31 @@
+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:
@@ -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/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/lib/paperclip/content_type_detector.rb

@@ -60,15 +60,15 @@ 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)
+    def type_from_marcel
+      @type_from_marcel ||= File.open(@filepath) do |file|
+        Marcel::Magic.by_magic(file).try(:type)
       end
     end
 

data/lib/paperclip/validators/attachment_content_type_validator.rb

@@ -47,7 +47,7 @@ module Paperclip
       end
 
       def mark_invalid(record, attribute, types)
-        record.errors.add attribute, :invalid, options.merge(types: types.join(", "))
+        record.errors.add attribute, :invalid, **options.merge(types: types.join(", "))
       end
 
       def allowed_types

data/lib/paperclip/validators/attachment_file_name_validator.rb

@@ -43,7 +43,7 @@ module Paperclip
       end
 
       def mark_invalid(record, attribute, patterns)
-        record.errors.add attribute, :invalid, options.merge(names: patterns.join(", "))
+        record.errors.add attribute, :invalid, **options.merge(names: patterns.join(", "))
       end
 
       def allowed

data/lib/paperclip/validators/attachment_presence_validator.rb

@@ -4,7 +4,7 @@ module Paperclip
   module Validators
     class AttachmentPresenceValidator < ActiveModel::EachValidator
       def validate_each(record, attribute, _value)
-        record.errors.add(attribute, :blank, options) if record.send("#{attribute}_file_name").blank?
+        record.errors.add(attribute, :blank, **options) if record.send("#{attribute}_file_name").blank?
       end
 
       def self.helper_method_name

data/lib/paperclip/validators/attachment_size_validator.rb

@@ -39,7 +39,7 @@ module Paperclip
             unless value.send(CHECKS[option], 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(
+                record.errors.add(error_attr_name, error_message_key, **filtered_options(value).merge(
                                                                         min: min_value_in_human_size(record),
                                                                         max: max_value_in_human_size(record),
                                                                         count: human_size(option_value)

data/lib/paperclip/version.rb

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

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/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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kt-paperclip
 version: !ruby/object:Gem::Version
-  version: 6.4.1
+  version: 7.0.0
 platform: ruby
 authors:
 - Surendra Singhi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-30 00:00:00.000000000 Z
+date: 2021-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mimemagic
+  name: marcel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: terrapin
   requirement: !ruby/object:Gem::Requirement
@@ -393,6 +393,7 @@ files:
 - gemfiles/5.1.gemfile
 - gemfiles/5.2.gemfile
 - gemfiles/6.0.gemfile
+- gemfiles/6.1.gemfile
 - lib/generators/paperclip/USAGE
 - lib/generators/paperclip/paperclip_generator.rb
 - lib/generators/paperclip/templates/paperclip_migration.rb.erb
@@ -576,7 +577,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="