carrierwave 0.9.0 → 3.0.2

data/lib/carrierwave.rb

@@ -1,7 +1,6 @@
-# encoding: utf-8
-
 require 'fileutils'
 require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/object/try'
 require 'active_support/core_ext/class/attribute'
 require 'active_support/concern'
 
@@ -9,6 +8,7 @@ module CarrierWave
 
   class << self
     attr_accessor :root, :base_path
+    attr_writer :tmp_path
 
     def configure(&block)
       CarrierWave::Uploader::Base.configure(&block)
@@ -17,26 +17,45 @@ module CarrierWave
     def clean_cached_files!(seconds=60*60*24)
       CarrierWave::Uploader::Base.clean_cached_files!(seconds)
     end
+
+    def tmp_path
+      @tmp_path ||= File.expand_path(File.join('..', 'tmp'), root)
+    end
   end
 
 end
 
-if defined?(Merb)
+if defined?(Jets)
 
-  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 }
+  module CarrierWave
+    class Turbine < Jets::Turbine
+      initializer "carrierwave.setup_paths" do |app|
+        CarrierWave.root = Jets.root.to_s
+        CarrierWave.tmp_path = "/tmp/carrierwave"
+        CarrierWave.configure do |config|
+          config.cache_dir = "/tmp/carrierwave/uploads/tmp"
+        end
+      end
+
+      initializer "carrierwave.active_record" do
+        ActiveSupport.on_load :active_record do
+          require 'carrierwave/orm/activerecord'
+        end
+      end
+    end
   end
 
 elsif defined?(Rails)
 
   module CarrierWave
     class Railtie < Rails::Railtie
-      initializer "carrierwave.setup_paths" do
+      initializer "carrierwave.setup_paths" do |app|
         CarrierWave.root = Rails.root.join(Rails.public_path).to_s
         CarrierWave.base_path = ENV['RAILS_RELATIVE_URL_ROOT']
+        available_locales = Array(app.config.i18n.available_locales || [])
+        if available_locales.blank? || available_locales.include?(:en)
+          I18n.load_path.prepend(File.join(File.dirname(__FILE__), 'carrierwave', 'locale', "en.yml"))
+        end
       end
 
       initializer "carrierwave.active_record" do
@@ -44,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
 
@@ -52,19 +75,21 @@ 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
 
 require "carrierwave/utilities"
 require "carrierwave/error"
 require "carrierwave/sanitized_file"
+require "carrierwave/mounter"
 require "carrierwave/mount"
 require "carrierwave/processing"
 require "carrierwave/version"

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

@@ -1,7 +1,4 @@
-# encoding: utf-8
-
 class <%= class_name %>Uploader < CarrierWave::Uploader::Base
-
   # Include RMagick or MiniMagick support:
   # include CarrierWave::RMagick
   # include CarrierWave::MiniMagick
@@ -17,7 +14,7 @@ class <%= class_name %>Uploader < CarrierWave::Uploader::Base
   end
 
   # Provide a default URL as a default if there hasn't been a file uploaded:
-  # def default_url
+  # def default_url(*args)
   #   # For Rails 3.1+ asset pipeline compatibility:
   #   # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_'))
   #
@@ -25,7 +22,7 @@ class <%= class_name %>Uploader < CarrierWave::Uploader::Base
   # end
 
   # Process files as they are uploaded:
-  # process :scale => [200, 300]
+  # process scale: [200, 300]
   #
   # def scale(width, height)
   #   # do something
@@ -33,12 +30,12 @@ class <%= class_name %>Uploader < CarrierWave::Uploader::Base
 
   # Create different versions of your uploaded files:
   # version :thumb do
-  #   process :scale => [50, 50]
+  #   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_white_list
+  # def extension_allowlist
   #   %w(jpg jpeg gif png)
   # end
 
@@ -47,5 +44,4 @@ class <%= class_name %>Uploader < CarrierWave::Uploader::Base
   # def filename
   #   "something.jpg" if original_filename
   # 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", "app/uploaders/#{file_name}_uploader.rb"
+    template "uploader.rb.erb", File.join('app/uploaders', class_path, "#{file_name}_uploader.rb")
   end
-end
+end

metadata

@@ -1,206 +1,327 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave
 version: !ruby/object:Gem::Version
-  version: 0.9.0
-  prerelease: 
+  version: 3.0.2
 platform: ruby
 authors:
 - Jonas Nicklas
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-07-06 00:00:00.000000000 Z
+date: 2023-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
-  name: json
+  name: image_processing
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: marcel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 1.0.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        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: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 6.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: sham_rack
+  name: rspec-retry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     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
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fog
+  name: fog-aws
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: fog-google
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !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
+    requirements:
+    - - "~>"
+      - !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
+    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: fog-rackspace
+  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: mini_magick
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.16'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.16'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  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: generator_spec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.1
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
+      - !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,
@@ -212,32 +333,38 @@ extensions: []
 extra_rdoc_files:
 - README.md
 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/cs.yml
-- lib/carrierwave/locale/de.yml
 - lib/carrierwave/locale/en.yml
-- lib/carrierwave/locale/nl.yml
-- lib/carrierwave/locale/sk.yml
 - lib/carrierwave/mount.rb
+- lib/carrierwave/mounter.rb
 - lib/carrierwave/orm/activerecord.rb
-- lib/carrierwave/processing/mime_types.rb
+- lib/carrierwave/processing.rb
 - lib/carrierwave/processing/mini_magick.rb
 - lib/carrierwave/processing/rmagick.rb
-- lib/carrierwave/processing.rb
+- lib/carrierwave/processing/vips.rb
 - lib/carrierwave/sanitized_file.rb
+- lib/carrierwave/storage.rb
 - lib/carrierwave/storage/abstract.rb
 - lib/carrierwave/storage/file.rb
 - lib/carrierwave/storage/fog.rb
-- lib/carrierwave/storage.rb
 - lib/carrierwave/test/matchers.rb
+- lib/carrierwave/uploader.rb
 - lib/carrierwave/uploader/cache.rb
 - lib/carrierwave/uploader/callbacks.rb
 - lib/carrierwave/uploader/configuration.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
 - lib/carrierwave/uploader/proxy.rb
@@ -246,38 +373,35 @@ files:
 - lib/carrierwave/uploader/store.rb
 - lib/carrierwave/uploader/url.rb
 - lib/carrierwave/uploader/versions.rb
-- lib/carrierwave/uploader.rb
-- lib/carrierwave/utilities/uri.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/carrierwave.rb
-- lib/generators/templates/uploader.rb
+- lib/generators/templates/uploader.rb.erb
 - lib/generators/uploader_generator.rb
-- README.md
 homepage: https://github.com/carrierwaveuploader/carrierwave
-licenses: []
-post_install_message: 
+licenses:
+- MIT
+metadata: {}
+post_install_message:
 rdoc_options:
-- --main
+- "--main"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: carrierwave
-rubygems_version: 1.8.23
-signing_key: 
-specification_version: 3
+rubygems_version: 3.3.7
+signing_key:
+specification_version: 4
 summary: Ruby file upload library
 test_files: []

data/lib/carrierwave/locale/cs.yml

@@ -1,11 +0,0 @@
-cs:
-  errors:
-    messages:
-      carrierwave_processing_error: se nepodařilo zpracovat
-      carrierwave_integrity_error: není povolený typ souboru
-      carrierwave_download_error: nemůže být stažen
-      extension_white_list_error: "Není možné nahrávat %{extension} soubory, povolené typy: %{allowed_types}"
-      extension_black_list_error: "Není možné nahrávat %{extension} soubory, zakázané typy: %{prohibited_types}"
-      rmagick_processing_error: "Nepodařilo se upravit pomocí rmagick, možná se nejedná o obrázek? Hlášená Chyba: %{e}"
-      mime_types_processing_error: "Nepodařilo se upravit s MIME::Types, možná se nejedná o content-type? Hlášená Chyba: %{e}"
-      mini_magick_processing_error: "Nepodařilo se upravit pomocí MiniMagick, možná se nejedná o obrázek? Hlášená Chyba: %{e}"