carrierwave 2.2.0 → 2.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6e511db9d3eebc43bd42613884cf42ba2ad5f236a438a609cccc67c6ce3d192
-  data.tar.gz: 20cef424394b5a40d27e73e8677161870c6d35f60734fd05cf2d0666f461b834
+  metadata.gz: 188b2d0a4b8e09fcfadd3e5066a1dabe2d6ad178ba26384ea1dbe7da2b9f5eb9
+  data.tar.gz: a5a76814bdcb877f75a059a5a0746e8dfb07755dcd5cfea80a7f9a3382dd4af1
 SHA512:
-  metadata.gz: 28aeace46926db2716ac4600a67cb3a318c553f8f04f533fcf19afaddbafc46489bc3df5d523bc878f5b77164d4110c69ddfe346944caeb46b0dd83df39d7ac9
-  data.tar.gz: dc271f6fdfd5a515295185265a53b0b894ecef7e1d72bdcaa062357dacd5c7e9bca54a818ffcd344a95b341628451f5b6e579b62587845148075f9db9de949f7
+  metadata.gz: 88a7f9a0fb94488b1b28c842def1b527781b1c7dcefc5c3e3010481b682b5175fc76172f4ac5d77f103dae99fcfbdfc7c61b69737d353f9bcc22a45b0b9cde01
+  data.tar.gz: f1c14065946dcaa080e45b5221f39b7da3886b659fe27f4755edf8df72234c1e3aafeb73ccdc0adac5d1ef1cdbdf98adc98f1a2853610b442efe9d1526907eee

data/README.md

@@ -361,6 +361,22 @@ created. This can cut down on processing cost.
 
 See `carrierwave/processing/mini_magick.rb` for details.
 
+### conditional process
+
+If you want to use conditional process, you can only use `if` statement.
+
+See `carrierwave/uploader/processing.rb` for details.
+
+```ruby
+class MyUploader < CarrierWave::Uploader::Base
+  process :scale => [200, 200], :if => :image?
+  
+  def image?(carrier_wave_sanitized_file)
+    true
+  end
+end
+```
+
 ### Nested versions
 
 It is possible to nest versions within versions:
@@ -1056,6 +1072,8 @@ See [CONTRIBUTING.md](https://github.com/carrierwaveuploader/carrierwave/blob/ma
 
 ## License
 
+The MIT License (MIT)
+
 Copyright (c) 2008-2015 Jonas Nicklas
 
 Permission is hereby granted, free of charge, to any person obtaining

data/lib/carrierwave/downloader/base.rb

@@ -29,8 +29,14 @@ module CarrierWave
             response = OpenURI.open_uri(process_uri(url.to_s), headers)
           else
             request = nil
-            response = SsrfFilter.get(uri, headers: headers) do |req|
-              request = req
+            if ::SsrfFilter::VERSION.to_f < 1.1
+              response = SsrfFilter.get(uri, headers: headers) do |req|
+                request = req
+              end
+            else
+              response = SsrfFilter.get(uri, headers: headers, request_proc: ->(req) { request = req }) do |res|
+                res.body # ensure to read body
+              end
             end
             response.uri = request.uri
             response.value

data/lib/carrierwave/sanitized_file.rb

@@ -1,8 +1,7 @@
 require 'pathname'
 require 'active_support/core_ext/string/multibyte'
 require 'mini_mime'
-require 'mimemagic'
-require 'mimemagic/overlay'
+require 'marcel'
 
 module CarrierWave
 
@@ -262,7 +261,7 @@ module CarrierWave
     def content_type
       @content_type ||=
         existing_content_type ||
-        mime_magic_content_type ||
+        marcel_magic_content_type ||
         mini_mime_content_type
     end
 
@@ -325,18 +324,18 @@ module CarrierWave
 
     def existing_content_type
       if @file.respond_to?(:content_type) && @file.content_type
-        @file.content_type.to_s.chomp
+        Marcel::MimeType.for(declared_type: @file.content_type.to_s.chomp)
       end
     end
 
-    def mime_magic_content_type
+    def marcel_magic_content_type
       if path
         type = File.open(path) do |file|
-          MimeMagic.by_magic(file).try(:type)
+          Marcel::Magic.by_magic(file).try(:type)
         end
 
         if type.nil?
-          type = ::MiniMime.lookup_by_filename(path).try(:content_type)
+          type = Marcel::Magic.by_path(path).try(:type)
           type = 'invalid/invalid' unless type.nil? || type.start_with?('text/')
         end
 

data/lib/carrierwave/storage/fog.rb

@@ -30,7 +30,7 @@ module CarrierWave
     #
     # Google credentials contain the following keys:
     # [:google_storage_access_key_id]
-    # [:google_storage_secrete_access_key]
+    # [:google_storage_secret_access_key]
     #
     #
     # Local credentials contain the following keys:
@@ -147,8 +147,9 @@ module CarrierWave
           :public => uploader.fog_public
         ).files.all(:prefix => uploader.cache_dir).each do |file|
           # generate_cache_id returns key formated TIMEINT-PID(-COUNTER)-RND
-          time = file.key.scan(/(\d+)-\d+-\d+(?:-\d+)?/).first.map { |t| t.to_i }
-          time = Time.at(*time)
+          matched = file.key.match(/(\d+)-\d+-\d+(?:-\d+)?/)
+          next unless matched
+          time = Time.at(matched[1].to_i)
           file.destroy if time < (Time.now.utc - seconds)
         end
       end

data/lib/carrierwave/uploader/content_type_whitelist.rb

@@ -51,7 +51,7 @@ module CarrierWave
       def whitelisted_content_type?(content_type)
         Array(content_type_allowlist).any? do |item|
           item = Regexp.quote(item) if item.class != Regexp
-          content_type =~ /#{item}/
+          content_type =~ /\A#{item}/
         end
       end
 

data/lib/carrierwave/uploader/processing.rb

@@ -80,7 +80,17 @@ module CarrierWave
                 next unless self.send(condition, new_file)
               end
             end
-            self.send(method, *args)
+
+            if args.is_a? Array
+              kwargs, args = args.partition { |arg| arg.is_a? Hash }
+            end
+
+            if kwargs.present?
+              kwargs = kwargs.reduce(:merge)
+              self.send(method, *args, **kwargs)
+            else
+              self.send(method, *args)
+            end
           end
         end
       end

data/lib/carrierwave/version.rb

@@ -1,3 +1,3 @@
 module CarrierWave
-  VERSION = "2.2.0"
+  VERSION = "2.2.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.6
 platform: ruby
 authors:
 - Jonas Nicklas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-23 00:00:00.000000000 Z
+date: 2024-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -67,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
 - !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.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: rspec-retry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -199,6 +213,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 1.12.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -206,6 +223,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 1.12.1
 - !ruby/object:Gem::Dependency
   name: fog-local
   requirement: !ruby/object:Gem::Requirement
@@ -392,7 +412,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Ruby file upload library