carrierwave 3.1.0.beta → 3.1.0.rc

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94f7caad86544528c7b1d7acdecd8bfe3d5d94e53469890899578c47dd142f91
-  data.tar.gz: 1d572604e7b5b89639286ae6f7d087f513a53cf3adf4028138bdea0be6d538a6
+  metadata.gz: 5daf18958a06d91a53e10270049c75a1f93dcb8224e2dfb4511fc70d7bae5c2a
+  data.tar.gz: c60177f496f73f8fe949d89bc3cb39bb62aa81b384091eaf566c492a0d53f4dd
 SHA512:
-  metadata.gz: 19f434816a0cde1b473525dc383cd61f7b0899ddb7c2230a95053ba43ee6287d0a9dcb6dd322bd016ed582140d2e54fc5f5385741c91e09df3201c6f39ed4083
-  data.tar.gz: 127a4ac2b998d373d5774cbfeef32c49f31d9fe44f30416738945b61c6316ce093f4c2607aeb9c6cfb4c7286684926491755572eb8fd696b4b0195bdcd07a07e
+  metadata.gz: 4c333ce7499ab4145df649e839ad40226d8338999b4ff624a884ffc07f253592000704b7f7cd090696602c29dcd1109e8a2aa1482c83dced511479d78cb0b650
+  data.tar.gz: dab32ccd98121831f2a1f4eee30e2540b3f15f73b8fc8680189df3e673457cea8f1e2f5bbe1555abf3a7fd25d8f1acdb16d13fa4c3a29b82d78aca76a838a0bd

data/README.md

@@ -1027,7 +1027,7 @@ end
 ### List of available processing methods:
 
 > [!NOTE]
-> While the intention is to provide uniform interfaces to al three processing libraries the availability and implementation of processing methods can <a href="supported-processing-methods">vary slightly between them</a>.
+> While the intention is to provide uniform interfaces to all three processing libraries the availability and implementation of processing methods can <a href="supported-processing-methods">vary slightly between them</a>.
 
 - `convert` - Changes the image encoding format to the given format (eg. jpg). This operation is treated specially to trigger the change of the file extension, so it matches with the format of the resulting file.
 - `resize_to_limit` - Resize the image to fit within the specified dimensions while retaining the original aspect ratio. Will only resize the image if it is larger than the specified dimensions. The resulting image may be shorter or narrower than specified in the smaller dimension but will not be larger than the specified values.

data/lib/carrierwave/mounter.rb

@@ -125,6 +125,7 @@ module CarrierWave
         urls = Array.wrap(urls).reject(&:blank?)
         return if urls.blank?
       end
+      @download_errors.clear
       @remote_urls = urls
 
       clear_unstaged

data/lib/carrierwave/processing/mini_magick.rb

@@ -291,7 +291,7 @@ module CarrierWave
       image = yield(image)
       FileUtils.mv image.path, current_path
 
-      image.run_command("identify", current_path)
+      ::MiniMagick::Image.new(current_path).identify
     rescue ::MiniMagick::Error, ::MiniMagick::Invalid => e
       raise e if e.message =~ /(You must have .+ installed|is not installed|executable not found)/
       message = I18n.translate(:"errors.messages.processing_error")

data/lib/carrierwave/storage/fog.rb

@@ -18,6 +18,8 @@ module CarrierWave
     # [:fog_use_ssl_for_aws]              (optional) #public_url will use https for the AWS generated URL]
     # [:fog_aws_accelerate]               (optional) #public_url will use s3-accelerate subdomain
     #   instead of s3, defaults to false
+    # [:fog_aws_fips]                     (optional) #public_url will use s3-fips subdomain
+    #   instead of s3, defaults to false
     #
     #
     # AWS credentials contain the following keys:
@@ -309,6 +311,15 @@ module CarrierWave
           file.nil? ? 0 : file.content_length
         end
 
+        ##
+        # === Returns
+        #
+        # [Boolean] whether the file is non-existent or empty
+        #
+        def empty?
+          !exists? || size.zero?
+        end
+
         ##
         # Check if the file exists on the remote service
         #
@@ -365,6 +376,7 @@ module CarrierWave
             when 'AWS'
               # check if some endpoint is set in fog_credentials
               if @uploader.fog_credentials.has_key?(:endpoint)
+                raise 'fog_aws_fips = true is incompatible with :endpoint, as FIPS endpoints do not support path-style URLs.' if @uploader.fog_aws_fips
                 "#{@uploader.fog_credentials[:endpoint]}/#{@uploader.fog_directory}/#{encoded_path}"
               else
                 protocol = @uploader.fog_use_ssl_for_aws ? "https" : "http"
@@ -374,17 +386,18 @@ module CarrierWave
                 use_virtual_hosted_style = @uploader.fog_directory.to_s =~ subdomain_regex && !(protocol == 'https' && @uploader.fog_directory =~ /\./)
 
                 region = @uploader.fog_credentials[:region].to_s
-                regional_host = case region
-                                when DEFAULT_S3_REGION, ''
-                                  's3.amazonaws.com'
-                                else
-                                  "s3.#{region}.amazonaws.com"
-                                end
+                regional_host = 's3.amazonaws.com' # used for DEFAULT_S3_REGION or no region set
+                if @uploader.fog_aws_fips
+                  regional_host = "s3-fips.#{region}.amazonaws.com" # https://aws.amazon.com/compliance/fips/
+                elsif ![DEFAULT_S3_REGION, ''].include?(region)
+                  regional_host = "s3.#{region}.amazonaws.com"
+                end
 
                 if use_virtual_hosted_style
                   regional_host = 's3-accelerate.amazonaws.com' if @uploader.fog_aws_accelerate
                   "#{protocol}://#{@uploader.fog_directory}.#{regional_host}/#{encoded_path}"
                 else # directory is not a valid subdomain, so use path style for access
+                  raise 'FIPS Endpoints can only be used with Virtual Hosted-Style addressing.' if @uploader.fog_aws_fips
                   "#{protocol}://#{regional_host}/#{@uploader.fog_directory}/#{encoded_path}"
                 end
               end

data/lib/carrierwave/uploader/configuration.rb

@@ -35,6 +35,7 @@ module CarrierWave
         add_config :fog_authenticated_url_expiration
         add_config :fog_use_ssl_for_aws
         add_config :fog_aws_accelerate
+        add_config :fog_aws_fips
 
         # Mounting
         add_config :ignore_integrity_errors
@@ -197,6 +198,7 @@ module CarrierWave
             config.fog_authenticated_url_expiration = 600
             config.fog_use_ssl_for_aws = true
             config.fog_aws_accelerate = false
+            config.fog_aws_fips = false
             config.store_dir = 'uploads'
             config.cache_dir = 'uploads/tmp'
             config.delete_tmp_file_after_storage = true

data/lib/carrierwave/uploader/processing.rb

@@ -70,6 +70,9 @@ module CarrierWave
             if processor == :convert
               # Treat :convert specially, since it should trigger the file extension change
               force_extension processor_args
+              if condition
+                warn "Use of 'process convert: format' with conditionals has an issue and doesn't work correctly. See https://github.com/carrierwaveuploader/carrierwave/issues/2723 for details. "
+              end
             end
           end
         end

data/lib/carrierwave/uploader/versions.rb

@@ -196,9 +196,9 @@ module CarrierWave
       #
       # === Returns
       #
-      # [Boolean] True when the version exists according to its :if or :unless condition
+      # [Boolean] True when the version satisfy its :if or :unless condition
       #
-      def version_exists?(name)
+      def version_active?(name)
         name = name.to_sym
 
         return false unless versions.has_key?(name)
@@ -222,6 +222,8 @@ module CarrierWave
           true
         end
       end
+      alias_method :version_exists?, :version_active?
+      CarrierWave.deprecator.deprecate_methods(self, version_exists?: :version_active?)
 
       ##
       # Copies the parent's cache_id when caching a version file.
@@ -299,7 +301,7 @@ module CarrierWave
 
       def active_versions
         versions.select do |name, uploader|
-          version_exists?(name)
+          version_active?(name)
         end
       end
 

data/lib/carrierwave/utilities/uri.rb

@@ -4,7 +4,7 @@ module CarrierWave
   module Utilities
     module Uri
       # based on Ruby < 2.0's URI.encode
-      PATH_SAFE = URI::REGEXP::PATTERN::UNRESERVED + '\/'
+      PATH_SAFE = URI::RFC2396_REGEXP::PATTERN::UNRESERVED + '\/'
       PATH_UNSAFE = Regexp.new("[^#{PATH_SAFE}]", false)
       NON_ASCII = /[^[:ascii:]]/.freeze
 

data/lib/carrierwave/version.rb

@@ -1,3 +1,3 @@
 module CarrierWave
-  VERSION = "3.1.0.beta".freeze
+  VERSION = "3.1.0.rc".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave
 version: !ruby/object:Gem::Version
-  version: 3.1.0.beta
+  version: 3.1.0.rc
 platform: ruby
 authors:
 - Jonas Nicklas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-01 00:00:00.000000000 Z
+date: 2024-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport