carrierwave 0.9.0 → 0.10.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0092635d7d29c1b3f6b16b2589e48ba6919ff0b9
+  data.tar.gz: c19c7734e547d39cfec1d90aa48fb28bd3d99b2a
+SHA512:
+  metadata.gz: d4cce1995281a15422ac6c35b82b19b54e6ba0f5d0efffcbf6c9d3e7f81ae462efa8f313a84ba707bdf4a5e4938e7b367fae90789e18dc24421b023b64c77506
+  data.tar.gz: 5b103922747f4fb1f1c2a172408e9904a39930eda9cd1769ca0b9ba16ee7bbed4dbb9aa1d3a24ac8e61a19ead8491e4ed5b4bca852224f33e6b8b02a90f7d7da

data/README.md

@@ -3,7 +3,7 @@
 This gem provides a simple and extremely flexible way to upload files from Ruby applications.
 It works well with Rack based web applications, such as Ruby on Rails.
 
-[![Build Status](https://secure.travis-ci.org/carrierwaveuploader/carrierwave.png)](http://travis-ci.org/carrierwaveuploader/carrierwave)
+[![Build Status](https://travis-ci.org/carrierwaveuploader/carrierwave.png?branch=master)](http://travis-ci.org/carrierwaveuploader/carrierwave)
 [![Code Climate](https://codeclimate.com/github/carrierwaveuploader/carrierwave.png)](https://codeclimate.com/github/carrierwaveuploader/carrierwave)
 
 ## Information
@@ -114,7 +114,7 @@ Other ORM support has been extracted into separate gems:
 
 * [carrierwave-datamapper](https://github.com/carrierwaveuploader/carrierwave-datamapper)
 * [carrierwave-mongoid](https://github.com/carrierwaveuploader/carrierwave-mongoid)
-* [carrierwave-sequel](https://github.com/carrierwaveuploader/carrierwave-sequel)
+* [carrierwave-sequel](https://github.com/jnicklas/carrierwave-sequel)
 
 There are more extensions listed in [the wiki](https://github.com/carrierwaveuploader/carrierwave/wiki)
 
@@ -206,12 +206,21 @@ end
 
 ## Adding versions
 
-Often you'll want to add different versions of the same file. The classic
-example is image thumbnails. There is built in support for this:
+Often you'll want to add different versions of the same file. The classic example is image thumbnails. There is built in support for this*:
+
+*Note: You must have Imagemagick and MiniMagick installed to do image resizing. MiniMagick is a Ruby interface for Imagemagick which is a C program. This is why MiniMagick fails on 'bundle install' without Imagemagick installed.
+
+Some documentation refers to RMagick instead of MiniMagick but MiniMagick is recommended.
+
+To install Imagemagick on OSX with homebrew type the following:
+
+```
+$ brew install imagemagick
+```
 
 ```ruby
 class MyUploader < CarrierWave::Uploader::Base
-  include CarrierWave::RMagick
+  include CarrierWave::MiniMagick
 
   process :resize_to_fit => [800, 800]
 
@@ -360,7 +369,13 @@ easily add a checkbox to the form which will remove the file when checked.
 <% end %>
 ```
 
-If you want to remove the file manually, you can call <code>remove_avatar!</code>.
+If you want to remove the file manually, you can call <code>remove_avatar!</code>, then save the object.
+
+```erb
+@user.remove_avatar!
+@user.save
+#=> true
+```
 
 ## Uploading files from a remote location
 
@@ -433,6 +448,14 @@ User.all.each do |user|
 end
 ```
 
+Note: `recreate_versions!` will throw an exception on records without an image. To avoid this, scope the records to those with images or check if an image exists within the block. If you're using ActiveRecord, recreating versions for a user avatar might look like this:
+
+```ruby
+User.all.each do |user|
+  user.avatar.recreate_versions! if user.avatar?
+end
+```
+
 ## Configuring CarrierWave
 
 CarrierWave has a broad range of configuration options, which you can configure,
@@ -474,6 +497,9 @@ if Rails.env.test? or Rails.env.cucumber?
 end
 ```
 
+Remember, if you have already set `storage :something` in your uploader, the `storage`
+setting from this initializer will be ignored.
+
 If you need to test your processing, you should test it in isolation, and enable
 processing only for those tests that need it.
 
@@ -564,7 +590,7 @@ That's it! You can still use the `CarrierWave::Uploader#url` method to return th
 [Fog](http://github.com/fog/fog) is used to support Rackspace Cloud Files. Ensure you have it in your Gemfile:
 
 ```ruby
-gem "fog", "~> 1.10.1"
+gem "fog"
 ```
 
 You'll need to configure a directory (also known as a container), username and API key in the initializer.
@@ -623,7 +649,7 @@ the url to the file on Rackspace Cloud Files.
 [Fog](http://github.com/fog/fog) is used to support Google Storage for Developers. Ensure you have it in your Gemfile:
 
 ```ruby
-gem "fog", "~> 1.3.1"
+gem "fog"
 ```
 
 You'll need to configure a directory (also known as a bucket), access key id and secret access key in the initializer.
@@ -696,7 +722,7 @@ class AvatarUploader < CarrierWave::Uploader::Base
   process :convert => 'png'
 
   def filename
-    super.chomp(File.extname(super)) + '.png'
+    super.chomp(File.extname(super)) + '.png' if original_filename.present?
   end
 end
 ```
@@ -763,6 +789,8 @@ errors:
     carrierwave_processing_error: "Cannot resize image."
     carrierwave_integrity_error: "Not an image."
     carrierwave_download_error: "Couldn't download image."
+    extension_white_list_error: "You are not allowed to upload %{extension} files, allowed types: %{allowed_types}"
+    extension_black_list_error: "You are not allowed to upload %{extension} files, prohibited types: %{prohibited_types}"
 ```
 
 ## Large files
@@ -788,6 +816,38 @@ When the `move_to_cache` and/or `move_to_store` methods return true, files will
 
 This has only been tested with the local filesystem store.
 
+## Skipping ActiveRecord callbacks
+
+By default, mounting an uploader into an ActiveRecord model will add a few
+callbacks. For example, this code:
+
+```ruby
+class User
+  mount_uploader :avatar, AvatarUploader
+end
+```
+
+Will add these callbacks:
+
+```ruby
+after_save :store_avatar!
+before_save :write_avatar_identifier
+after_commit :remove_avatar! :on => :destroy
+before_update :store_previous_model_for_avatar
+after_save :remove_previously_stored_avatar
+```
+
+If you want to skip any of these callbacks (eg. you want to keep the existing
+avatar, even after uploading a new one), you can use ActiveRecord’s
+`skip_callback` method.
+
+```ruby
+class User
+  mount_uploader :avatar, AvatarUploader
+  skip_callback :save, :after, :remove_previously_stored_avatar
+end
+```
+
 ## Contributing to CarrierWave
 
 See [CONTRIBUTING.md](https://github.com/carrierwaveuploader/carrierwave/blob/master/CONTRIBUTING.md)

data/lib/carrierwave.rb

@@ -44,6 +44,13 @@ elsif defined?(Rails)
           require 'carrierwave/orm/activerecord'
         end
       end
+
+      ##
+      # Loads the Carrierwave locale files before the Rails application locales
+      # letting the Rails application overrite the carrierwave locale defaults
+      config.before_configuration do
+        I18n.load_path << File.join(File.dirname(__FILE__), "carrierwave", "locale", 'en.yml')
+      end
     end
   end
 

data/lib/carrierwave/compatibility/paperclip.rb

@@ -46,11 +46,31 @@ module CarrierWave
     # THE SOFTWARE.
     #
     module Paperclip
+      extend ActiveSupport::Concern
+
+      DEFAULT_MAPPINGS = {
+        :rails_root   => lambda{|u, f| Rails.root.to_s },
+        :rails_env    => lambda{|u, f| Rails.env },
+        :id_partition => lambda{|u, f| ("%09d" % u.model.id).scan(/\d{3}/).join("/")},
+        :id           => lambda{|u, f| u.model.id },
+        :attachment   => lambda{|u, f| u.mounted_as.to_s.downcase.pluralize },
+        :style        => lambda{|u, f| u.paperclip_style },
+        :basename     => lambda{|u, f| u.filename.gsub(/#{File.extname(u.filename)}$/, "") },
+        :extension    => lambda{|u, d| File.extname(u.filename).gsub(/^\.+/, "")},
+        :class        => lambda{|u, f| u.model.class.name.underscore.pluralize}
+      }
+
+      included do
+        attr_accessor :filename
+        class_attribute :mappings
+        self.mappings ||= DEFAULT_MAPPINGS.dup
+      end
 
       def store_path(for_file=filename)
         path = paperclip_path
+        self.filename = for_file
         path ||= File.join(*[store_dir, paperclip_style.to_s, for_file].compact)
-        interpolate_paperclip_path(path, for_file)
+        interpolate_paperclip_path(path)
       end
 
       def store_dir
@@ -68,28 +88,18 @@ module CarrierWave
         version_name || paperclip_default_style
       end
 
-    private
-
-      def interpolate_paperclip_path(path, filename)
-        mappings.inject(path) do |agg, pair|
-          agg.gsub(":#{pair[0]}") { pair[1].call(self, filename).to_s }
+      module ClassMethods
+        def interpolate(sym, &block)
+          mappings[sym] = block
         end
       end
 
-      def mappings
-        [
-          [:rails_root   , lambda{|u, f| Rails.root }],
-          [:rails_env    , lambda{|u, f| Rails.env }],
-          [:class        , lambda{|u, f| u.model.class.name.underscore.pluralize}],
-          [:id_partition , lambda{|u, f| ("%09d" % u.model.id).scan(/\d{3}/).join("/")}],
-          [:id           , lambda{|u, f| u.model.id }],
-          [:attachment   , lambda{|u, f| u.mounted_as.to_s.downcase.pluralize }],
-          [:style        , lambda{|u, f| u.paperclip_style }],
-          [:basename     , lambda{|u, f| f.gsub(/#{File.extname(f)}$/, "") }],
-          [:extension    , lambda{|u, f| File.extname(f).gsub(/^\.+/, "")}]
-        ]
+      private
+      def interpolate_paperclip_path(path)
+        mappings.each_pair.inject(path) do |agg, pair|
+          agg.gsub(":#{pair[0]}") { pair[1].call(self, self.paperclip_style).to_s }
+        end
       end
-
     end # Paperclip
   end # Compatibility
 end # CarrierWave

data/lib/carrierwave/locale/el.yml

@@ -0,0 +1,11 @@
+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

@@ -0,0 +1,11 @@
+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

@@ -0,0 +1,11 @@
+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

@@ -0,0 +1,11 @@
+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

@@ -0,0 +1,11 @@
+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/pl.yml

@@ -0,0 +1,11 @@
+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

@@ -0,0 +1,11 @@
+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

@@ -0,0 +1,11 @@
+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

@@ -0,0 +1,11 @@
+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/tr.yml

@@ -0,0 +1,11 @@
+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/mount.rb

@@ -20,15 +20,11 @@ module CarrierWave
     # [Hash{Symbol => CarrierWave}] what uploaders are mounted on which columns
     #
     def uploaders
-      @uploaders ||= {}
-      @uploaders = superclass.uploaders.merge(@uploaders) if superclass.respond_to?(:uploaders)
-      @uploaders
+      @uploaders ||= superclass.respond_to?(:uploaders) ? superclass.uploaders.dup : {}
     end
 
     def uploader_options
-      @uploader_options ||= {}
-      @uploader_options = superclass.uploader_options.merge(@uploader_options) if superclass.respond_to?(:uploader_options)
-      @uploader_options
+      @uploader_options ||= superclass.respond_to?(:uploader_options) ? superclass.uploader_options.dup : {}
     end
 
     ##
@@ -139,24 +135,12 @@ module CarrierWave
     #     end
     #
     def mount_uploader(column, uploader=nil, options={}, &block)
-      if block_given?
-        uploader = Class.new(uploader || CarrierWave::Uploader::Base)
-        const_set("Uploader#{uploader.object_id}".gsub('-', '_'), uploader)
-        uploader.class_eval(&block)
-        uploader.recursively_apply_block_to_versions(&block)
-      else
-        uploader ||= begin
-          u = Class.new(CarrierWave::Uploader::Base)
-          const_set("Uploader#{u.object_id}".gsub('-', '_'), u)
-          u
-        end
-      end
+      include CarrierWave::Mount::Extension
 
+      uploader = build_uploader(uploader, &block)
       uploaders[column.to_sym] = uploader
       uploader_options[column.to_sym] = options
 
-      include CarrierWave::Mount::Extension
-
       # Make sure to write over accessors directly defined on the class.
       # Simply super to the included module below.
       class_eval <<-RUBY, __FILE__, __LINE__+1
@@ -180,7 +164,7 @@ module CarrierWave
         end
 
         def #{column}?
-          !_mounter(:#{column}).blank?
+          _mounter(:#{column}).present?
         end
 
         def #{column}_url(*args)
@@ -262,9 +246,29 @@ module CarrierWave
           end
         end
 
+        def mark_remove_#{column}_false
+          _mounter(:#{column}).remove = false
+        end
+
       RUBY
     end
 
+    private
+
+    def build_uploader(uploader, &block)
+      return uploader if uploader && !block_given?
+
+      uploader = Class.new(uploader || CarrierWave::Uploader::Base)
+      const_set("Uploader#{uploader.object_id}".gsub('-', '_'), uploader)
+
+      if block_given?
+        uploader.class_eval(&block)
+        uploader.recursively_apply_block_to_versions(&block)
+      end
+
+      uploader
+    end
+
     module Extension
 
       ##
@@ -304,8 +308,8 @@ module CarrierWave
         return if record.frozen?
 
         if remove?
-          record.write_uploader(serialization_column, '')
-        elsif not uploader.identifier.blank?
+          record.write_uploader(serialization_column, nil)
+        elsif uploader.identifier.present?
           record.write_uploader(serialization_column, uploader.identifier)
         end
       end
@@ -316,11 +320,9 @@ module CarrierWave
 
       def uploader
         @uploader ||= record.class.uploaders[column].new(record, column)
+        @uploader.retrieve_from_store!(identifier) if @uploader.blank? && identifier.present?
 
-        if @uploader.blank? and not identifier.blank?
-          @uploader.retrieve_from_store!(identifier)
-        end
-        return @uploader
+        @uploader
       end
 
       def cache(new_file)
@@ -345,10 +347,11 @@ module CarrierWave
       end
 
       def remote_url=(url)
-        @download_error = nil
-        @integrity_error = nil
+        return if url.blank?
 
         @remote_url = url
+        @download_error = nil
+        @integrity_error = nil
 
         uploader.download!(url)
 
@@ -364,12 +367,12 @@ module CarrierWave
       end
 
       def store!
-        unless uploader.blank?
-          if remove?
-            uploader.remove!
-          else
-            uploader.store!
-          end
+        return if uploader.blank?
+
+        if remove?
+          uploader.remove!
+        else
+          uploader.store!
         end
       end
 
@@ -382,7 +385,7 @@ module CarrierWave
       end
 
       def remove?
-        !remove.blank? and remove !~ /\A0|false$\z/
+        remove.present? && remove !~ /\A0|false$\z/
       end
 
       def remove!