carrierwave 0.10.0 → 1.2.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Jonas Nicklas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2017-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,42 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -86,44 +72,44 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: sham_rack
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -142,14 +128,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.28.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.28.0
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
@@ -179,35 +165,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.10
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.10
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: generator_spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
-  name: generator_spec
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -233,25 +219,11 @@ files:
 - lib/carrierwave.rb
 - lib/carrierwave/compatibility/paperclip.rb
 - lib/carrierwave/error.rb
-- lib/carrierwave/locale/cs.yml
-- lib/carrierwave/locale/de.yml
-- lib/carrierwave/locale/el.yml
 - lib/carrierwave/locale/en.yml
-- lib/carrierwave/locale/es.yml
-- lib/carrierwave/locale/fr.yml
-- lib/carrierwave/locale/ja.yml
-- lib/carrierwave/locale/nb.yml
-- lib/carrierwave/locale/nl.yml
-- lib/carrierwave/locale/pl.yml
-- lib/carrierwave/locale/pt-BR.yml
-- lib/carrierwave/locale/pt-PT.yml
-- lib/carrierwave/locale/ru.yml
-- lib/carrierwave/locale/sk.yml
-- lib/carrierwave/locale/tr.yml
 - lib/carrierwave/mount.rb
+- lib/carrierwave/mounter.rb
 - lib/carrierwave/orm/activerecord.rb
 - lib/carrierwave/processing.rb
-- lib/carrierwave/processing/mime_types.rb
 - lib/carrierwave/processing/mini_magick.rb
 - lib/carrierwave/processing/rmagick.rb
 - lib/carrierwave/sanitized_file.rb
@@ -264,10 +236,15 @@ 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/default_url.rb
 - lib/carrierwave/uploader/download.rb
 - lib/carrierwave/uploader/extension_blacklist.rb
 - lib/carrierwave/uploader/extension_whitelist.rb
+- lib/carrierwave/uploader/file_size.rb
+- lib/carrierwave/uploader/magic_mime_blacklist.rb
+- lib/carrierwave/uploader/magic_mime_whitelist.rb
 - lib/carrierwave/uploader/mountable.rb
 - lib/carrierwave/uploader/processing.rb
 - lib/carrierwave/uploader/proxy.rb
@@ -277,7 +254,6 @@ files:
 - lib/carrierwave/uploader/url.rb
 - lib/carrierwave/uploader/versions.rb
 - lib/carrierwave/utilities.rb
-- lib/carrierwave/utilities/deprecation.rb
 - lib/carrierwave/utilities/uri.rb
 - lib/carrierwave/validations/active_model.rb
 - lib/carrierwave/version.rb
@@ -296,16 +272,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: carrierwave
-rubygems_version: 2.2.0
+rubyforge_project: 
+rubygems_version: 2.5.2
 signing_key: 
-specification_version: 3
+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}"

data/lib/carrierwave/locale/de.yml

@@ -1,11 +0,0 @@
-de:
-  errors:
-    messages:
-      carrierwave_processing_error: konnte nicht verarbeitet werden
-      carrierwave_integrity_error: ist kein erlaubter Dateityp
-      carrierwave_download_error: konnte nicht heruntergeladen werden
-      extension_white_list_error: "Sie sind nicht berechtigt %{extension} Dateien hochzuladen, erlaubte Typen: %{allowed_types}"
-      extension_black_list_error: "Sie sind nicht berechtigt %{extension} Dateien hochzuladen, verbotene Typen: %{prohibited_types}"
-      rmagick_processing_error: "Verarbeitung mit rmagick fehlgeschlagen, vielleicht ist es kein Bild? Original Fehler: %{e}"
-      mime_types_processing_error: "Verarbeitung mit MIME::Types fehlgeschlagen, vielleicht kein gültiger content-type? Original Fehler: %{e}"
-      mini_magick_processing_error: "Verarbeitung mit MiniMagick fehlgeschlagen, vielleicht ist es kein Bild? Original Fehler: %{e}"

data/lib/carrierwave/locale/el.yml

@@ -1,11 +0,0 @@
-el:
-  errors:
-    messages:
-      carrierwave_processing_error: "απέτυχε στην επεξεργασία"
-      carrierwave_integrity_error: "δεν ανήκει σε επιτρεπτό τύπο αρχείου"
-      carrierwave_download_error: "δεν ήταν δυνατό να μεταφορτωθεί"
-      extension_white_list_error: "Δεν επιτρέπεται το ανέβασμα αρχείων %{extension}, επιτρεπτοί τύποι: %{allowed_types}"
-      extension_black_list_error: "Δεν επιτρέπεται το ανέβασμα αρχείων %{extension}, μη επιτρεπτοί τύποι: %{prohibited_types}"
-      rmagick_processing_error: "Απέτυχε ο χειρισμός με rmagick, ίσως δεν είναι εικόνα; Αρχικό Σφάλμα: %{e}"
-      mime_types_processing_error: "Απέτυχε η επεξεργασία του αρχείου με MIME::Types, ίσως δεν έχει έγκυρο content-type; Αρχικό Σφάλμα: %{e}"
-      mini_magick_processing_error: "Απέτυχε ο χειρισμός με MiniMagick, ίσως δεν είναι εικόνα; Αρχικό Σφάλμα: %{e}"

data/lib/carrierwave/locale/es.yml

@@ -1,11 +0,0 @@
-es:
-  errors:
-    messages:
-      carrierwave_processing_error: no se pudo procesar
-      carrierwave_integrity_error: no es de un tipo de archivo permitido
-      carrierwave_download_error: no se pudo descargar
-      extension_white_list_error: "No se pueden subir archivos de esta extensión %{extension}, las extensiones permitidas son: %{allowed_types}"
-      extension_black_list_error: "No se pueden subir archivos de esta extensión %{extension}, las extensiones prohibidas son: %{allowed_types}"
-      rmagick_processing_error: "No se pudo manipular con rmagick, quizá porque no es una imágen? Error original: %{e}"
-      mime_types_processing_error: "No se pudo procesar archivo con MIME::Types, quizá no tiene el content-type correcto? Error original: %{e}"
-      mini_magick_processing_error: "No se pudo manipular con MiniMagick, quizá porque no es una imágen? Error original: %{e}"

data/lib/carrierwave/locale/fr.yml

@@ -1,11 +0,0 @@
-fr:
-  errors:
-    messages:
-      carrierwave_processing_error: "Impossible de redimensionner l'image."
-      carrierwave_integrity_error: "Ce n'est pas une image."
-      carrierwave_download_error: "Impossible de télécharger l'image."
-      extension_white_list_error: "Vous n'êtes pas autorisé à uploader des fichiers %{extension}, types autorisés: %{allowed_types}"
-      extension_black_list_error: "Vous n'êtes pas autorisé à uploader des fichiers %{extension}, types interdits: %{prohibited_types}"
-      rmagick_processing_error: "La manipulation d'image avec rmagick a échoué. Peut-être que ce n'est pas une image ? Erreur originale: %{e}"
-      mime_types_processing_error: "Le traitement de fichier avec MIME::Types a échoué. Peut-être que ce n'est pas un type valide ? Erreur originale: %{e}"
-      mini_magick_processing_error: "La manipulation d'image avec MiniMagick a échoué. Peut-être que ce n'est pas une image ? Erreur originale: %{e}"

data/lib/carrierwave/locale/ja.yml

@@ -1,11 +0,0 @@
-ja:
-  errors:
-    messages:
-      carrierwave_processing_error: 処理できませんでした
-      carrierwave_integrity_error: は許可されていないファイルタイプです
-      carrierwave_download_error: はダウンロードできません
-      extension_white_list_error: "%{extension}ファイルのアップロードは許可されていません。アップロードできるファイルタイプ: %{allowed_types}"
-      extension_black_list_error: "%{extension}ファイルのアップロードは許可されていません。アップロードできないファイルタイプ: %{prohibited_types}"
-      rmagick_processing_error: "rmagickがファイルを処理できませんでした。画像を確認してください。エラーメッセージ: %{e}"
-      mime_types_processing_error: "MIME::Typesのファイルを処理できませんでした。Content-Typeを確認してください。エラーメッセージ: %{e}"
-      mini_magick_processing_error: "MiniMagickがファイルを処理できませんでした。画像を確認してください。エラーメッセージ: %{e}"

data/lib/carrierwave/locale/nb.yml

@@ -1,11 +0,0 @@
-nb:
-  errors:
-    messages:
-      carrierwave_processing_error: kunne ikke behandles
-      carrierwave_integrity_error: er ikke en tillatt filtype
-      carrierwave_download_error: kunne ikke lastes ned
-      extension_white_list_error: "Du kan ikke laste opp %{extension}-filer, tillatte filtyper: %{allowed_types}"
-      extension_black_list_error: "Du kan ikke laste opp %{extension}-filer, forbudte filtyper: %{prohibited_types}"
-      rmagick_processing_error: "Kunne ikke manipulere med rmagick. Er du sikker på at det er et bilde? Feilmelding: %{e}"
-      mime_types_processing_error: "Kunne ikke behandle fil med MIME::Types. Er du sikker på at content-type er korrekt? Feilmelding: %{e}"
-      mini_magick_processing_error: "Kunne ikke manipulere med MiniMagick. Er du sikker på at det er et bilde? Feilmelding: %{e}"

data/lib/carrierwave/locale/nl.yml

@@ -1,11 +0,0 @@
-nl:
-  errors:
-    messages:
-      carrierwave_processing_error: kon niet worden verwerkt
-      carrierwave_integrity_error: is niet van een toegestaan bestandstype
-      carrierwave_download_error: kon niet gedownload worden
-      extension_white_list_error: "Het is niet toegestaan om %{extension} bestanden te uploaden; toegestane bestandstypes: %{allowed_types}"
-      extension_black_list_error: "Het is niet toegestaan om %{extension} bestanden te uploaden; verboden bestandstypes: %{prohibited_types}"
-      rmagick_processing_error: "Bewerking met rmagick is mislukt, misschien is het geen afbeelding? Originele foutmelding: %{e}"
-      mime_types_processing_error: "Verwerking van bestand met MIME::Types is mislukt, misschien is het geen geldig content-type? Originele foutmelding: %{e}"
-      mini_magick_processing_error: "Bewerking met MiniMagick is mislukt, misschien is het geen afbeelding? Originele foutmelding: %{e}"

data/lib/carrierwave/locale/pl.yml

@@ -1,11 +0,0 @@
-pl:
-  errors:
-    messages:
-      carrierwave_processing_error: nie można przetworzyć
-      carrierwave_integrity_error: niedozwolony typ pliku
-      carrierwave_download_error: nie można pobrać pliku
-      extension_white_list_error: "Nie można wgrać pliku o rozszerzeniu %{extension}, dozwolone typy plików: %{allowed_types}"
-      extension_black_list_error: "Nie można wgrać pliku o rozszerzeniu %{extension}, zakazane typy plików: %{prohibited_types}"
-      rmagick_processing_error: "Nie udało się przetworzyć pliku przy pomocy rmagick, może to nie jest obrazek? Oryginalna treść błędu: %{e}"
-      mime_types_processing_error: "Nie udało się przetworzyć pliku przy pomocy MIME::Types, może content-type jest niepoprawny? Oryginalna treść błędu: %{e}"
-      mini_magick_processing_error: "Nie udało się przetworzyć pliku przy pomocy MiniMagick, może to nie jest obrazek? Oryginalna treść błędu: %{e}"

data/lib/carrierwave/locale/pt-BR.yml

@@ -1,11 +0,0 @@
-pt-BR:
-  errors:
-    messages:
-      carrierwave_processing_error: falhou em ser processado
-      carrierwave_integrity_error: não é um tipo de arquivo permitido
-      carrierwave_download_error: não pôde ser baixado
-      extension_white_list_error: "Não é permitido o envio de arquivos %{extension}, tipos permitidos: %{allowed_types}"
-      extension_black_list_error: "Não é permitido o envio de arquivos %{extension}, tipos proibidos: %{prohibited_types}"
-      rmagick_processing_error: "Falha ao manipular com RMagick, talvez arquivo não seja uma imagem? Erro original: %{e}"
-      mime_types_processing_error: "Falha ao processar arquivo com MIME::Types, talvez content-type seja inválido? Erro original: %{e}"
-      mini_magick_processing_error: "Falha ao manipular com MiniMagick, talvez arquivo não seja uma imagem? Erro original: %{e}"

data/lib/carrierwave/locale/pt-PT.yml

@@ -1,11 +0,0 @@
-pt-PT:
-  errors:
-    messages:
-      carrierwave_processing_error: falhou ao ser processado
-      carrierwave_integrity_error: não é um tipo de ficheiro permitido
-      carrierwave_download_error: não pôde ser transferido
-      extension_white_list_error: "Não é permitido o envio de ficheiros com a extensão %{extension}, tipos de ficheiro permitidos: %{allowed_types}"
-      extension_black_list_error: "Não é permitido o envio de ficheiros com a extensão %{extension}, tipos de ficheiro proibidos: %{prohibited_types}"
-      rmagick_processing_error: "Ocorreu uma falha ao processar com rmagick, talvez o ficheiro não seja uma imagem? Erro original: %{e}"
-      mime_types_processing_error: "Ocorreu uma falha ao processar com MIME::Types, talvez o parâmetro content-type não seja válido? Erro original: %{e}"
-      mini_magick_processing_error: "Ocorreu uma falha ao processar com MiniMagick, talvez o ficheiro não seja uma imagem? Erro original: %{e}"

data/lib/carrierwave/locale/ru.yml

@@ -1,11 +0,0 @@
-ru:
-  errors:
-    messages:
-      carrierwave_processing_error: Невозможно обработать изображение
-      carrierwave_integrity_error: Файл не является изображением
-      carrierwave_download_error: Невозможно скачать файл
-      extension_white_list_error: "Вы не можете загружать файлы типа %{extension}, разрешенные типы: %{allowed_types}"
-      extension_black_list_error: "Вы не можете загружать файлы типа %{extension}, запрещенные типы: %{prohibited_types}"
-      rmagick_processing_error: "Ошибка взаимодействия с RMagick, может быть это не изображение? Исходная ошибка: %{e}"
-      mime_types_processing_error: "Не получилось обработать файл с MIME::Types, возможно неправильный content-type? Исходная ошибка: %{e}"
-      mini_magick_processing_error: "Ошибка взаимодействия с MiniMagick, может быть это не изображение? Исходная ошибка: %{e}"

data/lib/carrierwave/locale/sk.yml

@@ -1,11 +0,0 @@
-sk:
-  errors:
-    messages:
-      carrierwave_processing_error: sa nepodarilo spracovať
-      carrierwave_integrity_error: nie je povolený typ súboru
-      carrierwave_download_error: nie je možné stiahnuť
-      extension_white_list_error: "Nie je možné nahrávať %{extension} súbory, povolené typy: %{allowed_types}"
-      extension_black_list_error: "Nie je možné nahrávať %{extension} súbory, zakázané typy: %{prohibited_types}"
-      rmagick_processing_error: "Nepodarilo sa upraviť pomocou rmagick, možno nejde o obrázok? Hlásená chyba: %{e}"
-      mime_types_processing_error: "Súbor sa nepodarilo spracovať pomocou MIME::Types, možno nejde o valídny content-type? Hlásená chyba: %{e}"
-      mini_magick_processing_error: "Nepodarilo sa upraviť pomocou MiniMagick, možno nejde o obrázok? Hlásená chyba: %{e}"

data/lib/carrierwave/locale/tr.yml

@@ -1,11 +0,0 @@
-tr:
-  errors:
-    messages:
-      carrierwave_processing_error: işlenmesi sırasında hata oluştu
-      carrierwave_integrity_error: izin verilebilir bir dosya türü değil
-      carrierwave_download_error: indirilemedi
-      extension_white_list_error: "%{extension} uzantılı dosyaları yükleme izniniz yok, izin verilen uzantılar: %{allowed_types}"
-      extension_black_list_error: "%{extension} uzantılı dosyaları yükleme izniniz yok, izin verilmeyen uzantılar: %{prohibited_types}"
-      rmagick_processing_error: "Resim rmagick ile düzenlenemedi, belkide resim değildir? Orjinal Hata: %{e}"
-      mime_types_processing_error: "Dosya, MIME::Types kullanılarak işlenemedi, belkide geçerli bir içerik türü değildir? Orjinal Hata: %{e}"
-      mini_magick_processing_error: "Resim MiniMagick ile düzenlenemedi, belkide resim değildir? Orjinal Hata: %{e}"

data/lib/carrierwave/processing/mime_types.rb

@@ -1,74 +0,0 @@
-# encoding: utf-8
-
-module CarrierWave
-
-  ##
-  # This module simplifies the use of the mime-types gem to intelligently
-  # guess and set the content-type of a file. If you want to use this, you'll
-  # need to require this file:
-  #
-  #     require 'carrierwave/processing/mime_types'
-  #
-  # And then include it in your uploader:
-  #
-  #     class MyUploader < CarrierWave::Uploader::Base
-  #       include CarrierWave::MimeTypes
-  #     end
-  #
-  # You can now use the provided helper:
-  #
-  #     class MyUploader < CarrierWave::Uploader::Base
-  #       include CarrierWave::MimeTypes
-  #
-  #       process :set_content_type
-  #     end
-  #
-  module MimeTypes
-    extend ActiveSupport::Concern
-
-    included do
-      CarrierWave::Utilities::Deprecation.new "0.11.0", "CarrierWave::MimeTypes is deprecated and will be removed in the future, get the content_type from the SanitizedFile object directly."
-      begin
-        require "mime/types"
-      rescue LoadError => e
-        e.message << " (You may need to install the mime-types gem)"
-        raise e
-      end
-    end
-
-    module ClassMethods
-      def set_content_type(override=false)
-        process :set_content_type => override
-      end
-    end
-
-    GENERIC_CONTENT_TYPES = %w[application/octet-stream binary/octet-stream]
-
-    def generic_content_type?
-      GENERIC_CONTENT_TYPES.include? file.content_type
-    end
-
-    ##
-    # Changes the file content_type using the mime-types gem
-    #
-    # === Parameters
-    #
-    # [override (Boolean)] whether or not to override the file's content_type
-    #                      if it is already set and not a generic content-type,
-    #                      false by default
-    #
-    def set_content_type(override=false)
-      if override || file.content_type.blank? || generic_content_type?
-        new_content_type = ::MIME::Types.type_for(file.original_filename).first.to_s
-        if file.respond_to?(:content_type=)
-          file.content_type = new_content_type
-        else
-          file.instance_variable_set(:@content_type, new_content_type)
-        end
-      end
-    rescue ::MIME::InvalidContentType => e
-      raise CarrierWave::ProcessingError, I18n.translate(:"errors.messages.mime_types_processing_error", :e => e)
-    end
-
-  end # MimeTypes
-end # CarrierWave

data/lib/carrierwave/utilities/deprecation.rb

@@ -1,18 +0,0 @@
-# encoding: utf-8
-require 'active_support/deprecation'
-
-module CarrierWave
-  module Utilities
-    module Deprecation
-
-      def self.new version = '0.11.0', message = 'Carrierwave'
-        if ActiveSupport::VERSION::MAJOR < 4
-          ActiveSupport::Deprecation.warn("#{message} (will be removed from version #{version})")
-        else
-          ActiveSupport::Deprecation.new(version, message)
-        end
-      end
-
-    end # Deprecation
-  end # Utilities
-end # CarrierWave