From 1ecfc62bb5fd6adb72f5b427e995efba80a833b8 Mon Sep 17 00:00:00 2001
From: Xavier J <xjulien@octo.com>
Date: Wed, 2 Nov 2016 10:18:59 +0100
Subject: [PATCH] Fix upload cache directory (opensimplif)

---
 app/uploaders/base_uploader.rb                | 15 +++++++++++++++
 app/uploaders/cerfa_uploader.rb               | 10 +---------
 app/uploaders/piece_justificative_uploader.rb | 14 +-------------
 app/uploaders/procedure_logo_uploader.rb      | 10 +---------
 4 files changed, 18 insertions(+), 31 deletions(-)
 create mode 100644 app/uploaders/base_uploader.rb

diff --git a/app/uploaders/base_uploader.rb b/app/uploaders/base_uploader.rb
new file mode 100644
index 000000000..b575299d8
--- /dev/null
+++ b/app/uploaders/base_uploader.rb
@@ -0,0 +1,15 @@
+# encoding: utf-8
+
+class BaseUploader < CarrierWave::Uploader::Base
+  def cache_dir
+    if Rails.env.production?
+      if Features.opensimplif?
+        '/tmp/opensimplif-cache'
+      else
+        '/tmp/tps-cache'
+      end
+    else
+      '/tmp/tps-dev-cache'
+    end
+  end
+end
\ No newline at end of file
diff --git a/app/uploaders/cerfa_uploader.rb b/app/uploaders/cerfa_uploader.rb
index 0b798ec81..c398801b8 100644
--- a/app/uploaders/cerfa_uploader.rb
+++ b/app/uploaders/cerfa_uploader.rb
@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-class CerfaUploader < CarrierWave::Uploader::Base
+class CerfaUploader < BaseUploader
   before :cache, :set_original_filename
 
 # Choose what kind of storage to use for this uploader:
@@ -18,14 +18,6 @@ class CerfaUploader < CarrierWave::Uploader::Base
     end
   end
 
-  def cache_dir
-    if Rails.env.production?
-      '/tmp/tps-cache'
-    else
-      '/tmp/tps-dev-cache'
-    end
-  end
-
   # Add a white list of extensions which are allowed to be uploaded.
   # For images you might use something like this:
   def extension_white_list
diff --git a/app/uploaders/piece_justificative_uploader.rb b/app/uploaders/piece_justificative_uploader.rb
index 868ca5bef..e5c93b34d 100644
--- a/app/uploaders/piece_justificative_uploader.rb
+++ b/app/uploaders/piece_justificative_uploader.rb
@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-class PieceJustificativeUploader < CarrierWave::Uploader::Base
+class PieceJustificativeUploader < BaseUploader
   before :cache, :set_original_filename
 
   # Choose what kind of storage to use for this uploader:
@@ -18,18 +18,6 @@ class PieceJustificativeUploader < CarrierWave::Uploader::Base
     end
   end
 
-  def cache_dir
-    if Rails.env.production?
-      if Features.opensimplif?
-        '/tmp/opensimplif-cache'
-      else
-        '/tmp/tps-cache'
-      end
-    else
-      '/tmp/tps-dev-cache'
-    end
-  end
-
   # Add a white list of extensions which are allowed to be uploaded.
   # For images you might use something like this:
   def extension_white_list
diff --git a/app/uploaders/procedure_logo_uploader.rb b/app/uploaders/procedure_logo_uploader.rb
index fd1366e0d..e5723f9a0 100644
--- a/app/uploaders/procedure_logo_uploader.rb
+++ b/app/uploaders/procedure_logo_uploader.rb
@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-class ProcedureLogoUploader < CarrierWave::Uploader::Base
+class ProcedureLogoUploader < BaseUploader
 
   def root
     File.join(Rails.root, "public")
@@ -21,14 +21,6 @@ class ProcedureLogoUploader < CarrierWave::Uploader::Base
     end
   end
 
-  def cache_dir
-    if Rails.env.production?
-      '/tmp/tps-cache'
-    else
-      '/tmp/tps-dev-cache'
-    end
-  end
-
   # Add a white list of extensions which are allowed to be uploaded.
   # For images you might use something like this:
   def extension_white_list