Merge branch 'master' into wdtk

2 files changed, 40 insertions, 3 deletions

diff --git a/app/models/info_request.rb b/app/models/info_request.rb
index de3b5bdc5..209954b16 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.rb
@@ -428,11 +428,11 @@ public
 
         ActiveRecord::Base.transaction do
             raw_email = RawEmail.new
-            raw_email.data = raw_email_data
             incoming_message.raw_email = raw_email
             incoming_message.info_request = self
-            raw_email.save!
             incoming_message.save!
+            raw_email.data = raw_email_data
+            raw_email.save!
 
             self.awaiting_description = true
             self.log_event("response", { :incoming_message_id => incoming_message.id })
diff --git a/app/models/raw_email.rb b/app/models/raw_email.rb
index 2406cee7c..1d85cc7d9 100644
--- a/app/models/raw_email.rb
+++ b/app/models/raw_email.rb
@@ -20,17 +20,54 @@ class RawEmail < ActiveRecord::Base
     
     has_one :incoming_message
 
+    before_destroy :destroy_file_representation!
 
     # We keep the old data_text field (which is of type text) for backwards
     # compatibility. We use the new data_binary field because only it works
     # properly in recent versions of PostgreSQL (get seg faults escaping
     # some binary strings).
 
+    def directory
+        request_id = self.incoming_message.info_request.id.to_s
+        if ENV["RAILS_ENV"] = "test"
+            return 'files/raw_email_test'
+        else
+            return File.join(MySociety::Config.get('RAW_EMAILS_LOCATION',
+                                                   'files/raw_emails'), 
+                             request_id[0..2], request_id)
+        end
+    end
+
+    def filepath
+        File.join(self.directory, self.incoming_message.id.to_s)
+    end
+
     def data=(d)
-        write_attribute(:data_binary, d)
+        if !File.exists?(self.directory)
+            FileUtils.mkdir_p self.directory
+        end
+        File.open(self.filepath, "wb") { |file|
+            file.write d
+        }
     end
 
     def data
+        if !File.exists?(self.filepath)
+            dbdata
+        else
+            File.open(self.filepath, "rb" ).read
+        end
+    end
+
+    def destroy_file_representation!
+        File.delete(self.filepath)
+    end
+
+    def dbdata=(d)
+        write_attribute(:data_binary, d)
+    end
+
+    def dbdata
         d = read_attribute(:data_binary)
         if !d.nil?
             return d