kt-paperclip 6.4.2 → 7.2.0

data/spec/paperclip/storage/s3_spec.rb

@@ -411,6 +411,62 @@ describe Paperclip::Storage::S3 do
     end
   end
 
+  context "An attachment that uses S3 for storage with acl disabled" do
+    before do
+      rebuild_model(
+        aws2_add_region.merge(
+          storage: :s3,
+          styles: { thumb: ["90x90#", :jpg] },
+          bucket: "bucket",
+          s3_acl_enabled: false,
+          s3_credentials: {
+            "access_key_id" => "12345",
+            "secret_access_key" => "54321"
+          }
+        )
+      )
+
+      @file = File.new(fixture_file("5k.png"), "rb")
+      @dummy = Dummy.new
+      @dummy.avatar = @file
+      @dummy.save
+    end
+
+    context "reprocess" do
+      before do
+        @object = double
+        allow(@dummy.avatar).to receive(:s3_object).with(:original).and_return(@object)
+        allow(@dummy.avatar).to receive(:s3_object).with(:thumb).and_return(@object)
+        allow(@object).to receive(:get).and_yield(@file.read)
+        allow(@object).to receive(:exists?).and_return(true)
+        allow(@object).to receive(:download_file).with(anything)
+      end
+
+      it "uploads original" do
+        expect(@object).to receive(:upload_file).with(
+          anything,
+          content_type: "image/png",
+        ).and_return(true)
+        @dummy.avatar.reprocess!
+        expect(@object).to receive(:upload_file).with(
+          anything,
+          content_type: "image/png",
+        ).and_return(true)
+        @dummy.avatar.reprocess!
+      end
+
+      it "doesn't upload original" do
+        expect(@object).to receive(:upload_file).with(
+          anything,
+          content_type: "image/png",
+        ).and_return(true)
+        @dummy.avatar.reprocess!
+      end
+    end
+
+    after { @file.close }
+  end
+
   context "An attachment that uses S3 for storage and has styles" do
     before do
       rebuild_model(
@@ -940,6 +996,19 @@ describe Paperclip::Storage::S3 do
         end
       end
 
+      context "and remove, calling S3 Object destroy once per unique style" do
+        before do
+          allow_any_instance_of(Aws::S3::Object).to receive(:exists?).and_return(true)
+          expect_any_instance_of(Aws::S3::Object).to receive(:delete).once
+          @dummy.avatar.clear(:original)
+          @dummy.destroy
+        end
+
+        it "succeeds" do
+          assert true
+        end
+      end
+
       context "that the file were missing" do
         before do
           allow_any_instance_of(Aws::S3::Object).to receive(:exists?).

data/spec/paperclip/validators_spec.rb

@@ -1,6 +1,11 @@
 require "spec_helper"
 
 describe Paperclip::Validators do
+  # required to support a range of rubies
+  def error_attribute_names(error)
+    error.try(:attribute_names) || error.keys
+  end
+
   context "using the helper" do
     before do
       rebuild_class
@@ -22,7 +27,9 @@ describe Paperclip::Validators do
     it "prevents you from attaching a file that violates that validation" do
       Dummy.class_eval { validate(:name) { raise "DO NOT RUN THIS" } }
       dummy = Dummy.new(avatar: File.new(fixture_file("12k.png")))
-      expect(dummy.errors.keys).to match_array [:avatar_content_type, :avatar, :avatar_file_size]
+      expect(error_attribute_names(dummy.errors)).to match_array(
+        %i[avatar_content_type avatar avatar_file_size]
+      )
       assert_raises(RuntimeError) { dummy.valid? }
     end
   end
@@ -47,21 +54,27 @@ describe Paperclip::Validators do
     it "prevents you from attaching a file that violates all of these validations" do
       Dummy.class_eval { validate(:name) { raise "DO NOT RUN THIS" } }
       dummy = Dummy.new(avatar: File.new(fixture_file("spaced file.png")))
-      expect(dummy.errors.keys).to match_array [:avatar, :avatar_file_name]
+      expect(error_attribute_names(dummy.errors)).to match_array(
+        %i[avatar avatar_file_name]
+      )
       assert_raises(RuntimeError) { dummy.valid? }
     end
 
     it "prevents you from attaching a file that violates only first of these validations" do
       Dummy.class_eval { validate(:name) { raise "DO NOT RUN THIS" } }
       dummy = Dummy.new(avatar: File.new(fixture_file("5k.png")))
-      expect(dummy.errors.keys).to match_array [:avatar, :avatar_file_name]
+      expect(error_attribute_names(dummy.errors)).to match_array(
+        %i[avatar avatar_file_name]
+      )
       assert_raises(RuntimeError) { dummy.valid? }
     end
 
     it "prevents you from attaching a file that violates only second of these validations" do
       Dummy.class_eval { validate(:name) { raise "DO NOT RUN THIS" } }
       dummy = Dummy.new(avatar: File.new(fixture_file("spaced file.jpg")))
-      expect(dummy.errors.keys).to match_array [:avatar, :avatar_file_name]
+      expect(error_attribute_names(dummy.errors)).to match_array(
+        %i[avatar avatar_file_name]
+      )
       assert_raises(RuntimeError) { dummy.valid? }
     end
 
@@ -88,7 +101,9 @@ describe Paperclip::Validators do
         end
       end
       dummy = Dummy.new(avatar: File.new(fixture_file("12k.png")))
-      expect(dummy.errors.keys).to match_array [:avatar_content_type, :avatar, :avatar_file_size]
+      expect(error_attribute_names(dummy.errors)).to match_array(
+        %i[avatar_content_type avatar avatar_file_size]
+      )
     end
 
     it "does not validate attachment if title is not present" do
@@ -98,7 +113,7 @@ describe Paperclip::Validators do
         end
       end
       dummy = Dummy.new(avatar: File.new(fixture_file("12k.png")))
-      assert_equal [], dummy.errors.keys
+      assert_equal [], error_attribute_names(dummy.errors)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kt-paperclip
 version: !ruby/object:Gem::Version
-  version: 6.4.2
+  version: 7.2.0
 platform: ruby
 authors:
 - Surendra Singhi
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-13 00:00:00.000000000 Z
+date: 2023-05-30 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,8 @@ files:
 - gemfiles/5.1.gemfile
 - 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
@@ -532,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
@@ -576,7 +579,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:
   - - ">="
@@ -585,7 +588,113 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - ImageMagick
 rubygems_version: 3.1.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: File attachments as attributes for ActiveRecord
-test_files: []
+test_files:
+- features/basic_integration.feature
+- features/migration.feature
+- features/rake_tasks.feature
+- features/step_definitions/attachment_steps.rb
+- features/step_definitions/html_steps.rb
+- features/step_definitions/rails_steps.rb
+- features/step_definitions/s3_steps.rb
+- features/step_definitions/web_steps.rb
+- features/support/env.rb
+- features/support/fakeweb.rb
+- features/support/file_helpers.rb
+- features/support/fixtures/boot_config.txt
+- features/support/fixtures/gemfile.txt
+- features/support/fixtures/preinitializer.txt
+- features/support/paths.rb
+- features/support/rails.rb
+- features/support/selectors.rb
+- spec/database.yml
+- spec/paperclip/attachment_definitions_spec.rb
+- spec/paperclip/attachment_processing_spec.rb
+- spec/paperclip/attachment_registry_spec.rb
+- spec/paperclip/attachment_spec.rb
+- spec/paperclip/content_type_detector_spec.rb
+- spec/paperclip/file_command_content_type_detector_spec.rb
+- spec/paperclip/filename_cleaner_spec.rb
+- spec/paperclip/geometry_detector_spec.rb
+- spec/paperclip/geometry_parser_spec.rb
+- spec/paperclip/geometry_spec.rb
+- spec/paperclip/glue_spec.rb
+- spec/paperclip/has_attached_file_spec.rb
+- spec/paperclip/integration_spec.rb
+- spec/paperclip/interpolations_spec.rb
+- spec/paperclip/io_adapters/abstract_adapter_spec.rb
+- spec/paperclip/io_adapters/attachment_adapter_spec.rb
+- spec/paperclip/io_adapters/data_uri_adapter_spec.rb
+- spec/paperclip/io_adapters/empty_string_adapter_spec.rb
+- spec/paperclip/io_adapters/file_adapter_spec.rb
+- spec/paperclip/io_adapters/http_url_proxy_adapter_spec.rb
+- spec/paperclip/io_adapters/identity_adapter_spec.rb
+- spec/paperclip/io_adapters/nil_adapter_spec.rb
+- spec/paperclip/io_adapters/registry_spec.rb
+- spec/paperclip/io_adapters/stringio_adapter_spec.rb
+- spec/paperclip/io_adapters/uploaded_file_adapter_spec.rb
+- spec/paperclip/io_adapters/uri_adapter_spec.rb
+- spec/paperclip/matchers/have_attached_file_matcher_spec.rb
+- spec/paperclip/matchers/validate_attachment_content_type_matcher_spec.rb
+- spec/paperclip/matchers/validate_attachment_presence_matcher_spec.rb
+- spec/paperclip/matchers/validate_attachment_size_matcher_spec.rb
+- spec/paperclip/media_type_spoof_detector_spec.rb
+- spec/paperclip/meta_class_spec.rb
+- spec/paperclip/paperclip_missing_attachment_styles_spec.rb
+- spec/paperclip/paperclip_spec.rb
+- spec/paperclip/plural_cache_spec.rb
+- spec/paperclip/processor_helpers_spec.rb
+- spec/paperclip/processor_spec.rb
+- spec/paperclip/rails_environment_spec.rb
+- spec/paperclip/rake_spec.rb
+- spec/paperclip/schema_spec.rb
+- spec/paperclip/storage/filesystem_spec.rb
+- spec/paperclip/storage/fog_spec.rb
+- spec/paperclip/storage/s3_live_spec.rb
+- spec/paperclip/storage/s3_spec.rb
+- spec/paperclip/style_spec.rb
+- spec/paperclip/tempfile_factory_spec.rb
+- spec/paperclip/tempfile_spec.rb
+- spec/paperclip/thumbnail_spec.rb
+- spec/paperclip/url_generator_spec.rb
+- spec/paperclip/validators/attachment_content_type_validator_spec.rb
+- spec/paperclip/validators/attachment_file_name_validator_spec.rb
+- spec/paperclip/validators/attachment_presence_validator_spec.rb
+- spec/paperclip/validators/attachment_size_validator_spec.rb
+- spec/paperclip/validators/media_type_spoof_detection_validator_spec.rb
+- spec/paperclip/validators_spec.rb
+- spec/spec_helper.rb
+- spec/support/assertions.rb
+- spec/support/fake_model.rb
+- spec/support/fake_rails.rb
+- spec/support/fixtures/12k.png
+- spec/support/fixtures/50x50.png
+- spec/support/fixtures/5k.png
+- spec/support/fixtures/animated
+- spec/support/fixtures/animated.gif
+- spec/support/fixtures/animated.unknown
+- spec/support/fixtures/aws_s3.yml
+- spec/support/fixtures/bad.png
+- spec/support/fixtures/empty.html
+- spec/support/fixtures/empty.xlsx
+- 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
+- spec/support/fixtures/twopage.pdf
+- spec/support/fixtures/uppercase.PNG
+- spec/support/matchers/accept.rb
+- spec/support/matchers/exist.rb
+- spec/support/matchers/have_column.rb
+- spec/support/mock_attachment.rb
+- spec/support/mock_interpolator.rb
+- spec/support/mock_url_generator_builder.rb
+- spec/support/model_reconstruction.rb
+- spec/support/reporting.rb
+- spec/support/test_data.rb
+- spec/support/version_helper.rb