kt-paperclip 7.1.0 → 7.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 157a08d6afe54c6a2b058e2a1fb8f9f8b11b19c49e565d28fba6e9bda226ba8e
-  data.tar.gz: 07a4071fdde88ed97090788de2ee932c61478517952f79f59d0f2bea437706a6
+  metadata.gz: ada7e8b864e1b23b9bd7064be5e30202ce2f89869de43d136df1a915951fc97d
+  data.tar.gz: fbe391dc1f775274f4e3f6972991c2883fc30c5d4970c925b43a48c651c6f9e3
 SHA512:
-  metadata.gz: 95a1f25661bbeae438168c7145fe36662b5926b7a9bf6ebddeec6a7d2424995764cd3875ca8eb224cbeb0ddf3b8f764ab3d646518cf1b19b031e684edc249894
-  data.tar.gz: 34263d2e70b9698db8a90dd547e1225451a664ac6e3a5aa44cc17287b80d00d9ca8216740fe9ab4c9f808df0757d228b1a29d8e3ef46954b0ee835321d49581f
+  metadata.gz: bb686418ce534696a30cb0610b7af967b608a889c2f1efb68ce577ab65334df366177674887cadb98be6739b54c06158cae9de7d98a8adaf011d23e245128ed8
+  data.tar.gz: b19cd6cd395d65fa25d90f63f597fbe4585890a2c257d0636791613410ea53b6d9df441512e581160e4c16e2d3e0e8dff55910038165449516a3c00067a99eb3

data/README.md

@@ -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:

data/lib/paperclip/content_type_detector.rb

@@ -74,6 +74,7 @@ module Paperclip
       # 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/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
@@ -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_size_validator.rb

@@ -35,7 +35,7 @@ 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)
-            operator = Rails::VERSION::MAJOR >= 7 ? COMPARE_CHECKS[option] : CHECKS[option]
+            operator = ActiveRecord::VERSION::MAJOR >= 7 ? COMPARE_CHECKS[option] : CHECKS[option]
               
             unless value.send(operator, option_value)
               error_message_key = options[:in] ? :in_between : option

data/lib/paperclip/version.rb

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

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(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kt-paperclip
 version: !ruby/object:Gem::Version
-  version: 7.1.0
+  version: 7.2.0
 platform: ruby
 authors:
 - Surendra Singhi
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-04 00:00:00.000000000 Z
+date: 2023-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -587,8 +587,114 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - ImageMagick
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.1.6
+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