Merge branch 'release/0.20'0.20.0.0

Conflicts:
  config/general.yml-example

1 files changed, 17 insertions, 15 deletions

diff --git a/app/models/raw_email.rb b/app/models/raw_email.rb
index 21a53f493..3b466cb81 100644
--- a/app/models/raw_email.rb
+++ b/app/models/raw_email.rb
@@ -17,44 +17,46 @@ class RawEmail < ActiveRecord::Base
     has_one :incoming_message
 
     def directory
-        request_id = self.incoming_message.info_request.id.to_s
         if request_id.empty?
             raise "Failed to find the id number of the associated request: has it been saved?"
         end
 
         if Rails.env.test?
-            return File.join(Rails.root, 'files/raw_email_test')
+            File.join(Rails.root, 'files/raw_email_test')
         else
-            return File.join(AlaveteliConfiguration::raw_emails_location,
-                             request_id[0..2], request_id)
+            File.join(AlaveteliConfiguration::raw_emails_location,
+                      request_id[0..2], request_id)
         end
     end
 
     def filepath
-        incoming_message_id = self.incoming_message.id.to_s
         if incoming_message_id.empty?
             raise "Failed to find the id number of the associated incoming message: has it been saved?"
         end
-        File.join(self.directory, incoming_message_id)
+
+        File.join(directory, incoming_message_id)
     end
 
     def data=(d)
-        if !File.exists?(self.directory)
-            FileUtils.mkdir_p self.directory
-        end
-        File.atomic_write(self.filepath) { |file|
-            file.write d
-        }
+        FileUtils.mkdir_p(directory) unless File.exists?(directory)
+        File.atomic_write(filepath) { |file| file.write(d) }
     end
 
     def data
-        File.open(self.filepath, "r").read
+        File.open(filepath, "r").read
     end
 
     def destroy_file_representation!
-        File.delete(self.filepath)
+        File.delete(filepath)
     end
 
-end
+    private
 
+    def request_id
+        incoming_message.info_request.id.to_s
+    end
 
+    def incoming_message_id
+        incoming_message.id.to_s
+    end
+end