From 31e85f32ac27309f03da8f742e53079f584ad3f9 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Fri, 21 Jul 2017 04:11:32 +0200
Subject: [PATCH] Bump carrierwave

---
 Gemfile                            |  2 +-
 Gemfile.lock                       | 11 ++++-------
 app/uploaders/exported_user.rb     |  6 ++----
 app/uploaders/processed_image.rb   |  4 ++--
 app/uploaders/unprocessed_image.rb |  8 ++++----
 spec/models/photo_spec.rb          |  2 +-
 6 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/Gemfile b/Gemfile
index f44c0c74b..8786e75cb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -73,8 +73,8 @@ gem "activerecord-import", "0.19.1"
 
 # File uploading
 
+gem "carrierwave", "1.1.0"
 gem "fog-aws",     "1.4.0"
-gem "carrierwave", "0.11.2"
 gem "mini_magick", "4.6.1"
 
 # GUID generation
diff --git a/Gemfile.lock b/Gemfile.lock
index 90d9cdb58..1fb8a19a5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -74,12 +74,10 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    carrierwave (0.11.2)
-      activemodel (>= 3.2.0)
-      activesupport (>= 3.2.0)
-      json (>= 1.7)
+    carrierwave (1.1.0)
+      activemodel (>= 4.0.0)
+      activesupport (>= 4.0.0)
       mime-types (>= 1.16)
-      mimemagic (>= 0.3.0)
     celluloid (0.17.3)
       celluloid-essentials
       celluloid-extras
@@ -367,7 +365,6 @@ GEM
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
-    mimemagic (0.3.2)
     mini_magick (4.6.1)
     mini_portile2 (2.1.0)
     minitest (5.10.2)
@@ -768,7 +765,7 @@ DEPENDENCIES
   bootstrap-sass (= 3.3.7)
   bootstrap-switch-rails (= 3.3.3)
   capybara (= 2.12.1)
-  carrierwave (= 0.11.2)
+  carrierwave (= 1.1.0)
   compass-rails (= 3.0.2)
   configurate (= 0.3.1)
   coveralls
diff --git a/app/uploaders/exported_user.rb b/app/uploaders/exported_user.rb
index a7c4d5a2b..f2d309c2b 100644
--- a/app/uploaders/exported_user.rb
+++ b/app/uploaders/exported_user.rb
@@ -3,17 +3,15 @@
 #   the COPYRIGHT file.
 
 class ExportedUser < SecureUploader
-
   def store_dir
     "uploads/users"
   end
 
-  def extension_white_list
-    %w(gz)
+  def extension_whitelist
+    %w[gz]
   end
 
   def filename
     "#{model.username}_diaspora_data_#{secure_token}.json.gz"
   end
-
 end
diff --git a/app/uploaders/processed_image.rb b/app/uploaders/processed_image.rb
index 68b540cf9..226d4fd47 100644
--- a/app/uploaders/processed_image.rb
+++ b/app/uploaders/processed_image.rb
@@ -9,8 +9,8 @@ class ProcessedImage < CarrierWave::Uploader::Base
     "uploads/images"
   end
 
-  def extension_white_list
-    %w(jpg jpeg png gif tiff)
+  def extension_whitelist
+    %w[jpg jpeg png gif tiff]
   end
 
   def filename
diff --git a/app/uploaders/unprocessed_image.rb b/app/uploaders/unprocessed_image.rb
index 86d425eb2..10186dd9b 100644
--- a/app/uploaders/unprocessed_image.rb
+++ b/app/uploaders/unprocessed_image.rb
@@ -6,7 +6,7 @@ class UnprocessedImage < CarrierWave::Uploader::Base
   include CarrierWave::MiniMagick
 
   attr_accessor :strip_exif
-  
+
   def strip_exif
     @strip_exif || false
   end
@@ -15,8 +15,8 @@ class UnprocessedImage < CarrierWave::Uploader::Base
     "uploads/images"
   end
 
-  def extension_white_list
-    %w(jpg jpeg png gif)
+  def extension_whitelist
+    %w[jpg jpeg png gif]
   end
 
   def filename
@@ -38,7 +38,7 @@ class UnprocessedImage < CarrierWave::Uploader::Base
   version :thumb_medium
   version :thumb_large
   version :scaled_full do
-    process :get_version_dimensions 
+    process :get_version_dimensions
   end
 
   def get_version_dimensions
diff --git a/spec/models/photo_spec.rb b/spec/models/photo_spec.rb
index 470f95a58..31d4afff6 100644
--- a/spec/models/photo_spec.rb
+++ b/spec/models/photo_spec.rb
@@ -178,7 +178,7 @@ describe Photo, :type => :model do
       file = File.open(@fail_fixture_name)
       expect {
         @photo.unprocessed_image.store! file
-      }.to raise_error CarrierWave::IntegrityError, 'You are not allowed to upload "xml" files, allowed types: jpg, jpeg, png, gif'
+      }.to raise_error CarrierWave::IntegrityError
     end
 
   end