carrierwave 1.3.1 → 3.0.5

data/lib/carrierwave.rb

@@ -25,16 +25,7 @@ module CarrierWave
 
 end
 
-if defined?(Merb)
-
-  CarrierWave.root = Merb.dir_for(:public)
-  Merb::BootLoader.before_app_loads do
-    # Setup path for uploaders and load all of them before classes are loaded
-    Merb.push_path(:uploaders, Merb.root / 'app' / 'uploaders', '*.rb')
-    Dir.glob(File.join(Merb.load_paths[:uploaders])).each {|f| require f }
-  end
-
-elsif defined?(Jets)
+if defined?(Jets)
 
   module CarrierWave
     class Turbine < Jets::Turbine
@@ -72,6 +63,10 @@ elsif defined?(Rails)
           require 'carrierwave/orm/activerecord'
         end
       end
+
+      config.before_eager_load do
+        CarrierWave::Storage::Fog.eager_load
+      end
     end
   end
 
@@ -80,13 +75,14 @@ elsif defined?(Sinatra)
     CarrierWave.root = File.join(PADRINO_ROOT, "public")
   else
 
-    CarrierWave.root = if Sinatra::Application.respond_to?(:public_folder)
-      # Sinatra >= 1.3
-      Sinatra::Application.public_folder
-    else
-      # Sinatra < 1.3
-      Sinatra::Application.public
-    end
+    CarrierWave.root =
+      if Sinatra::Application.respond_to?(:public_folder)
+        # Sinatra >= 1.3
+        Sinatra::Application.public_folder
+      else
+        # Sinatra < 1.3
+        Sinatra::Application.public
+      end
   end
 end
 

data/lib/generators/templates/{uploader.rb → uploader.rb.erb}

@@ -33,15 +33,15 @@ class <%= class_name %>Uploader < CarrierWave::Uploader::Base
   #   process resize_to_fit: [50, 50]
   # end
 
-  # Add a white list of extensions which are allowed to be uploaded.
+  # Add an allowlist of extensions which are allowed to be uploaded.
   # For images you might use something like this:
-  # def extension_whitelist
+  # def extension_allowlist
   #   %w(jpg jpeg gif png)
   # end
 
   # Override the filename of the uploaded files:
   # Avoid using model.id or version_name here, see uploader/store.rb for details.
   # def filename
-  #   "something.jpg" if original_filename
+  #   "something.jpg"
   # end
 end

data/lib/generators/uploader_generator.rb

@@ -1,7 +1,7 @@
 class UploaderGenerator < Rails::Generators::NamedBase
-  source_root File.expand_path("../templates", __FILE__)
+  source_root File.expand_path('templates', __dir__)
 
   def create_uploader_file
-    template "uploader.rb", File.join('app/uploaders', class_path, "#{file_name}_uploader.rb")
+    template "uploader.rb.erb", File.join('app/uploaders', class_path, "#{file_name}_uploader.rb")
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 3.0.5
 platform: ruby
 authors:
 - Jonas Nicklas
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-12-29 00:00:00.000000000 Z
+date: 2023-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,70 +16,84 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
-  name: mime-types
+  name: image_processing
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: marcel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 1.0.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
-  type: :development
+        version: '2.6'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '2.6'
+- !ruby/object:Gem::Dependency
+  name: ssrf_filter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +122,34 @@ 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: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.28'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.28'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +184,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: '1.7'
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 1.12.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: '1.7'
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 1.12.1
 - !ruby/object:Gem::Dependency
   name: fog-local
   requirement: !ruby/object:Gem::Requirement
@@ -198,14 +246,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.16'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -248,6 +296,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  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'
 description: Upload files in your Ruby applications, map them to a range of ORMs,
   store them on different backends.
 email:
@@ -260,6 +322,8 @@ files:
 - README.md
 - lib/carrierwave.rb
 - lib/carrierwave/compatibility/paperclip.rb
+- lib/carrierwave/downloader/base.rb
+- lib/carrierwave/downloader/remote_file.rb
 - lib/carrierwave/error.rb
 - lib/carrierwave/locale/en.yml
 - lib/carrierwave/mount.rb
@@ -268,6 +332,7 @@ files:
 - lib/carrierwave/processing.rb
 - lib/carrierwave/processing/mini_magick.rb
 - lib/carrierwave/processing/rmagick.rb
+- lib/carrierwave/processing/vips.rb
 - lib/carrierwave/sanitized_file.rb
 - lib/carrierwave/storage.rb
 - lib/carrierwave/storage/abstract.rb
@@ -278,12 +343,13 @@ files:
 - lib/carrierwave/uploader/cache.rb
 - lib/carrierwave/uploader/callbacks.rb
 - lib/carrierwave/uploader/configuration.rb
-- lib/carrierwave/uploader/content_type_blacklist.rb
-- lib/carrierwave/uploader/content_type_whitelist.rb
+- lib/carrierwave/uploader/content_type_allowlist.rb
+- lib/carrierwave/uploader/content_type_denylist.rb
 - lib/carrierwave/uploader/default_url.rb
+- lib/carrierwave/uploader/dimension.rb
 - lib/carrierwave/uploader/download.rb
-- lib/carrierwave/uploader/extension_blacklist.rb
-- lib/carrierwave/uploader/extension_whitelist.rb
+- lib/carrierwave/uploader/extension_allowlist.rb
+- lib/carrierwave/uploader/extension_denylist.rb
 - lib/carrierwave/uploader/file_size.rb
 - lib/carrierwave/uploader/mountable.rb
 - lib/carrierwave/uploader/processing.rb
@@ -294,16 +360,17 @@ files:
 - lib/carrierwave/uploader/url.rb
 - lib/carrierwave/uploader/versions.rb
 - lib/carrierwave/utilities.rb
+- lib/carrierwave/utilities/file_name.rb
 - lib/carrierwave/utilities/uri.rb
 - lib/carrierwave/validations/active_model.rb
 - lib/carrierwave/version.rb
-- lib/generators/templates/uploader.rb
+- lib/generators/templates/uploader.rb.erb
 - lib/generators/uploader_generator.rb
 homepage: https://github.com/carrierwaveuploader/carrierwave
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 require_paths:
@@ -312,16 +379,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Ruby file upload library
 test_files: []

data/lib/carrierwave/uploader/content_type_blacklist.rb

@@ -1,48 +0,0 @@
-module CarrierWave
-  module Uploader
-    module ContentTypeBlacklist
-      extend ActiveSupport::Concern
-
-      included do
-        before :cache, :check_content_type_blacklist!
-      end
-
-      ##
-      # Override this method in your uploader to provide a blacklist of files content types
-      # which are not allowed to be uploaded.
-      # Not only strings but Regexp are allowed as well.
-      #
-      # === Returns
-      #
-      # [NilClass, String, Regexp, Array[String, Regexp]] a blacklist of content types which are not allowed to be uploaded
-      #
-      # === Examples
-      #
-      #     def content_type_blacklist
-      #       %w(text/json application/json)
-      #     end
-      #
-      # Basically the same, but using a Regexp:
-      #
-      #     def content_type_blacklist
-      #       [/(text|application)\/json/]
-      #     end
-      #
-      def content_type_blacklist; end
-
-    private
-
-      def check_content_type_blacklist!(new_file)
-        content_type = new_file.content_type
-        if content_type_blacklist && blacklisted_content_type?(content_type)
-          raise CarrierWave::IntegrityError, I18n.translate(:"errors.messages.content_type_blacklist_error", content_type: content_type)
-        end
-      end
-
-      def blacklisted_content_type?(content_type)
-        Array(content_type_blacklist).any? { |item| content_type =~ /#{item}/ }
-      end
-
-    end # ContentTypeBlacklist
-  end # Uploader
-end # CarrierWave

data/lib/carrierwave/uploader/content_type_whitelist.rb

@@ -1,48 +0,0 @@
-module CarrierWave
-  module Uploader
-    module ContentTypeWhitelist
-      extend ActiveSupport::Concern
-
-      included do
-        before :cache, :check_content_type_whitelist!
-      end
-
-      ##
-      # Override this method in your uploader to provide a whitelist of files content types
-      # which are allowed to be uploaded.
-      # Not only strings but Regexp are allowed as well.
-      #
-      # === Returns
-      #
-      # [NilClass, String, Regexp, Array[String, Regexp]] a whitelist of content types which are allowed to be uploaded
-      #
-      # === Examples
-      #
-      #     def content_type_whitelist
-      #       %w(text/json application/json)
-      #     end
-      #
-      # Basically the same, but using a Regexp:
-      #
-      #     def content_type_whitelist
-      #       [/(text|application)\/json/]
-      #     end
-      #
-      def content_type_whitelist; end
-
-    private
-
-      def check_content_type_whitelist!(new_file)
-        content_type = new_file.content_type
-        if content_type_whitelist && !whitelisted_content_type?(content_type)
-          raise CarrierWave::IntegrityError, I18n.translate(:"errors.messages.content_type_whitelist_error", content_type: content_type, allowed_types: Array(content_type_whitelist).join(", "))
-        end
-      end
-
-      def whitelisted_content_type?(content_type)
-        Array(content_type_whitelist).any? { |item| content_type =~ /#{item}/ }
-      end
-
-    end # ContentTypeWhitelist
-  end # Uploader
-end # CarrierWave

data/lib/carrierwave/uploader/extension_blacklist.rb

@@ -1,51 +0,0 @@
-module CarrierWave
-  module Uploader
-    module ExtensionBlacklist
-      extend ActiveSupport::Concern
-
-      included do
-        before :cache, :check_extension_blacklist!
-      end
-
-      ##
-      # Override this method in your uploader to provide a black list of extensions which
-      # are prohibited to be uploaded. Compares the file's extension case insensitive.
-      # Furthermore, not only strings but Regexp are allowed as well.
-      #
-      # When using a Regexp in the black list, `\A` and `\z` are automatically added to
-      # the Regexp expression, also case insensitive.
-      #
-      # === Returns
-
-      # [NilClass, String, Regexp, Array[String, Regexp]] a black list of extensions which are prohibited to be uploaded
-      #
-      # === Examples
-      #
-      #     def extension_blacklist
-      #       %w(swf tiff)
-      #     end
-      #
-      # Basically the same, but using a Regexp:
-      #
-      #     def extension_blacklist
-      #       [/swf/, 'tiff']
-      #     end
-      #
-
-      def extension_blacklist; end
-
-    private
-
-      def check_extension_blacklist!(new_file)
-        extension = new_file.extension.to_s
-        if extension_blacklist && blacklisted_extension?(extension)
-          raise CarrierWave::IntegrityError, I18n.translate(:"errors.messages.extension_blacklist_error", extension: new_file.extension.inspect, prohibited_types: Array(extension_blacklist).join(", "))
-        end
-      end
-
-      def blacklisted_extension?(extension)
-        Array(extension_blacklist).any? { |item| extension =~ /\A#{item}\z/i }
-      end
-    end
-  end
-end

data/lib/carrierwave/uploader/extension_whitelist.rb

@@ -1,52 +0,0 @@
-module CarrierWave
-  module Uploader
-    module ExtensionWhitelist
-      extend ActiveSupport::Concern
-
-      included do
-        before :cache, :check_extension_whitelist!
-      end
-
-      ##
-      # Override this method in your uploader to provide a white list of extensions which
-      # are allowed to be uploaded. Compares the file's extension case insensitive.
-      # Furthermore, not only strings but Regexp are allowed as well.
-      #
-      # When using a Regexp in the white list, `\A` and `\z` are automatically added to
-      # the Regexp expression, also case insensitive.
-      #
-      # === Returns
-      #
-      # [NilClass, String, Regexp, Array[String, Regexp]] a white list of extensions which are allowed to be uploaded
-      #
-      # === Examples
-      #
-      #     def extension_whitelist
-      #       %w(jpg jpeg gif png)
-      #     end
-      #
-      # Basically the same, but using a Regexp:
-      #
-      #     def extension_whitelist
-      #       [/jpe?g/, 'gif', 'png']
-      #     end
-      #
-      def extension_whitelist; end
-
-    private
-
-      def check_extension_whitelist!(new_file)
-        extension = new_file.extension.to_s
-        if extension_whitelist && !whitelisted_extension?(extension)
-          raise CarrierWave::IntegrityError, I18n.translate(:"errors.messages.extension_whitelist_error", extension: new_file.extension.inspect, allowed_types: Array(extension_whitelist).join(", "))
-        end
-      end
-
-      def whitelisted_extension?(extension)
-        downcase_extension = extension.downcase
-        Array(extension_whitelist).any? { |item| downcase_extension =~ /\A#{item}\z/i }
-      end
-
-    end # ExtensionWhitelist
-  end # Uploader
-end # CarrierWave