Rename models and tables exim -> mail_server

1 files changed, 37 insertions, 37 deletions

diff --git a/spec/models/exim_log_spec.rb b/spec/models/mail_server_log_spec.rb
index 43796cf17..cad64f7ff 100644
--- a/spec/models/exim_log_spec.rb
+++ b/spec/models/mail_server_log_spec.rb
@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-describe EximLog do
+describe MailServerLog do
     describe ".load_file" do
         before :each do
             Configuration.stub!(:incoming_email_domain).and_return("example.com")
@@ -17,14 +17,14 @@ describe EximLog do
         it "loads relevant lines of an uncompressed exim log file" do
             File.should_receive(:open).with("/var/log/exim4/exim-mainlog-2012-10-10", "r").and_return(log)
             InfoRequest.should_receive(:find_by_incoming_email).with("request-1234@example.com").twice.and_return(ir)
-            EximLog.load_file("/var/log/exim4/exim-mainlog-2012-10-10")
+            MailServerLog.load_file("/var/log/exim4/exim-mainlog-2012-10-10")
 
-            ir.exim_logs.count.should == 2
-            log = ir.exim_logs[0]
+            ir.mail_server_logs.count.should == 2
+            log = ir.mail_server_logs[0]
             log.order.should == 1
             log.line.should == "This is a line of a logfile relevant to foi+request-1234@example.com"
 
-            log = ir.exim_logs[1]
+            log = ir.mail_server_logs[1]
             log.order.should == 2
             log.line.should == "This is the second line for the same foi+request-1234@example.com email address"
         end
@@ -32,33 +32,33 @@ describe EximLog do
         it "doesn't load the log file twice if it's unchanged" do
             File.should_receive(:open).with("/var/log/exim4/exim-mainlog-2012-10-10", "r").once.and_return([])
 
-            EximLog.load_file("/var/log/exim4/exim-mainlog-2012-10-10")
-            EximLog.load_file("/var/log/exim4/exim-mainlog-2012-10-10")
+            MailServerLog.load_file("/var/log/exim4/exim-mainlog-2012-10-10")
+            MailServerLog.load_file("/var/log/exim4/exim-mainlog-2012-10-10")
         end
 
         it "loads the log file again if it's changed" do
             File.should_receive(:open).with("/var/log/exim4/exim-mainlog-2012-10-10", "r").twice.and_return([])
-            EximLog.load_file("/var/log/exim4/exim-mainlog-2012-10-10")
+            MailServerLog.load_file("/var/log/exim4/exim-mainlog-2012-10-10")
             File.stub_chain(:stat, :mtime).and_return(DateTime.new(2012, 10, 11))
-            EximLog.load_file("/var/log/exim4/exim-mainlog-2012-10-10")
+            MailServerLog.load_file("/var/log/exim4/exim-mainlog-2012-10-10")
         end
 
         it "doesn't end up with two copies of each line when the same file is actually loaded twice" do
             File.should_receive(:open).with("/var/log/exim4/exim-mainlog-2012-10-10", "r").twice.and_return(log)
             InfoRequest.should_receive(:find_by_incoming_email).with("request-1234@example.com").any_number_of_times.and_return(ir)
 
-            EximLog.load_file("/var/log/exim4/exim-mainlog-2012-10-10")
-            ir.exim_logs.count.should == 2
+            MailServerLog.load_file("/var/log/exim4/exim-mainlog-2012-10-10")
+            ir.mail_server_logs.count.should == 2
 
             File.stub_chain(:stat, :mtime).and_return(DateTime.new(2012, 10, 11))
-            EximLog.load_file("/var/log/exim4/exim-mainlog-2012-10-10")
-            ir.exim_logs.count.should == 2
+            MailServerLog.load_file("/var/log/exim4/exim-mainlog-2012-10-10")
+            ir.mail_server_logs.count.should == 2
         end
 
         it "easily handles gzip compress log files" do
             File.should_not_receive(:open)
             Zlib::GzipReader.should_receive(:open).with("/var/log/exim4/exim-mainlog-2012-10-10.gz").and_return([])
-            EximLog.load_file("/var/log/exim4/exim-mainlog-2012-10-10.gz")
+            MailServerLog.load_file("/var/log/exim4/exim-mainlog-2012-10-10.gz")
         end
     end
 
@@ -83,31 +83,31 @@ describe EximLog do
                 ir2 = info_requests(:naughty_chicken_request)
                 InfoRequest.should_receive(:find_by_incoming_email).with("request-14-e0e09f97@example.com").any_number_of_times.and_return(ir1)
                 InfoRequest.should_receive(:find_by_incoming_email).with("request-10-1234@example.com").any_number_of_times.and_return(ir2)
-                EximLog.load_postfix_log_data(log, EximLogDone.new(:filename => "foo", :last_stat => DateTime.now))
+                MailServerLog.load_postfix_log_data(log, MailServerLogDone.new(:filename => "foo", :last_stat => DateTime.now))
                 # TODO: Check that each log line is attached to the correct request
-                ir1.exim_logs.count.should == 5
-                ir1.exim_logs[0].order.should == 1
-                ir1.exim_logs[0].line.should == "Oct  3 16:39:35 host postfix/pickup[2257]: CB55836EE58C: uid=1003 from=<foitest+request-14-e0e09f97@example.com>"
-                ir1.exim_logs[1].order.should == 2
-                ir1.exim_logs[1].line.should == "Oct  3 16:39:35 host postfix/cleanup[7674]: CB55836EE58C: message-id=<ogm-15+506bdda7a4551-20ee@example.com>"
-                ir1.exim_logs[2].order.should == 4
-                ir1.exim_logs[2].line.should == "Oct  3 16:39:35 host postfix/qmgr[15615]: CB55836EE58C: from=<foitest+request-14-e0e09f97@example.com>, size=1695, nrcpt=1 (queue active)"
-                ir1.exim_logs[3].order.should == 5
-                ir1.exim_logs[3].line.should == "Oct  3 16:39:38 host postfix/smtp[7676]: CB55836EE58C: to=<foi@some.gov.au>, relay=aspmx.l.google.com[74.125.25.27]:25, delay=2.5, delays=0.13/0.02/1.7/0.59, dsn=2.0.0, status=sent (250 2.0.0 OK 1349246383 j9si1676296paw.328)"
-                ir1.exim_logs[4].order.should == 7
-                ir1.exim_logs[4].line.should == "Oct  3 16:39:38 host postfix/qmgr[15615]: CB55836EE58C: removed"
-                ir2.exim_logs.count.should == 2
-                ir2.exim_logs[0].order.should == 3
-                ir2.exim_logs[0].line.should == "Oct  3 16:39:35 host postfix/qmgr[1673]: 9634B16F7F7: from=<foitest+request-10-1234@example.com>, size=368, nrcpt=1 (queue active)"
-                ir2.exim_logs[1].order.should == 6
-                ir2.exim_logs[1].line.should == "Oct  3 16:39:38 host postfix/smtp[1681]: 9634B16F7F7: to=<kdent@example.com>, relay=none, delay=46, status=deferred (connect to 216.150.150.131[216.150.150.131]: No route to host)"
+                ir1.mail_server_logs.count.should == 5
+                ir1.mail_server_logs[0].order.should == 1
+                ir1.mail_server_logs[0].line.should == "Oct  3 16:39:35 host postfix/pickup[2257]: CB55836EE58C: uid=1003 from=<foitest+request-14-e0e09f97@example.com>"
+                ir1.mail_server_logs[1].order.should == 2
+                ir1.mail_server_logs[1].line.should == "Oct  3 16:39:35 host postfix/cleanup[7674]: CB55836EE58C: message-id=<ogm-15+506bdda7a4551-20ee@example.com>"
+                ir1.mail_server_logs[2].order.should == 4
+                ir1.mail_server_logs[2].line.should == "Oct  3 16:39:35 host postfix/qmgr[15615]: CB55836EE58C: from=<foitest+request-14-e0e09f97@example.com>, size=1695, nrcpt=1 (queue active)"
+                ir1.mail_server_logs[3].order.should == 5
+                ir1.mail_server_logs[3].line.should == "Oct  3 16:39:38 host postfix/smtp[7676]: CB55836EE58C: to=<foi@some.gov.au>, relay=aspmx.l.google.com[74.125.25.27]:25, delay=2.5, delays=0.13/0.02/1.7/0.59, dsn=2.0.0, status=sent (250 2.0.0 OK 1349246383 j9si1676296paw.328)"
+                ir1.mail_server_logs[4].order.should == 7
+                ir1.mail_server_logs[4].line.should == "Oct  3 16:39:38 host postfix/qmgr[15615]: CB55836EE58C: removed"
+                ir2.mail_server_logs.count.should == 2
+                ir2.mail_server_logs[0].order.should == 3
+                ir2.mail_server_logs[0].line.should == "Oct  3 16:39:35 host postfix/qmgr[1673]: 9634B16F7F7: from=<foitest+request-10-1234@example.com>, size=368, nrcpt=1 (queue active)"
+                ir2.mail_server_logs[1].order.should == 6
+                ir2.mail_server_logs[1].line.should == "Oct  3 16:39:38 host postfix/smtp[1681]: 9634B16F7F7: to=<kdent@example.com>, relay=none, delay=46, status=deferred (connect to 216.150.150.131[216.150.150.131]: No route to host)"
             end
         end
 
         describe ".scan_for_postfix_queue_ids" do
             it "returns the queue ids of interest with the connected email addresses" do
                 Configuration.stub!(:incoming_email_domain).and_return("example.com")
-                EximLog.scan_for_postfix_queue_ids(log).should == {
+                MailServerLog.scan_for_postfix_queue_ids(log).should == {
                     "CB55836EE58C" => ["request-14-e0e09f97@example.com"],
                     "9634B16F7F7" => ["request-10-1234@example.com"]
                 }
@@ -116,21 +116,21 @@ describe EximLog do
 
         describe ".extract_postfix_queue_id_from_syslog_line" do
             it "returns nil if there is no queue id" do                
-                EximLog.extract_postfix_queue_id_from_syslog_line("Oct  7 07:16:48 kedumba postfix/smtp[14294]: connect to mail.neilcopp.com.au[110.142.151.66]:25: Connection refused").should be_nil
+                MailServerLog.extract_postfix_queue_id_from_syslog_line("Oct  7 07:16:48 kedumba postfix/smtp[14294]: connect to mail.neilcopp.com.au[110.142.151.66]:25: Connection refused").should be_nil
             end
         end
 
         describe ".request_postfix_sent?" do
             it "returns true when the logs say the message was sent" do
                 ir = info_requests(:fancy_dog_request)
-                ir.exim_logs.create!(:line => "Oct 10 16:58:38 kedumba postfix/smtp[26358]: A664436F218D: to=<contact@openaustraliafoundation.org.au>, relay=aspmx.l.google.com[74.125.25.26]:25, delay=2.7, delays=0.16/0.02/1.8/0.67, dsn=2.0.0, status=sent (250 2.0.0 OK 1349848723 e6si653316paw.346)", :order => 1)
-                EximLog.request_postfix_sent?(ir).should be_true
+                ir.mail_server_logs.create!(:line => "Oct 10 16:58:38 kedumba postfix/smtp[26358]: A664436F218D: to=<contact@openaustraliafoundation.org.au>, relay=aspmx.l.google.com[74.125.25.26]:25, delay=2.7, delays=0.16/0.02/1.8/0.67, dsn=2.0.0, status=sent (250 2.0.0 OK 1349848723 e6si653316paw.346)", :order => 1)
+                MailServerLog.request_postfix_sent?(ir).should be_true
             end
 
             it "returns false when the logs say the message hasn't been sent" do
                 ir = info_requests(:fancy_dog_request)
-                ir.exim_logs.create!(:line => "Oct 10 13:22:49 kedumba postfix/smtp[11876]: 6FB9036F1307: to=<foo@example.com>, relay=mta7.am0.yahoodns.net[74.6.136.244]:25, delay=1.5, delays=0.03/0/0.48/1, dsn=5.0.0, status=bounced (host mta7.am0.yahoodns.net[74.6.136.244] said: 554 delivery error: dd Sorry your message to foo@example.com cannot be delivered. This account has been disabled or discontinued [#102]. - mta1272.mail.sk1.yahoo.com (in reply to end of DATA command))", :order => 1)
-                EximLog.request_postfix_sent?(ir).should be_false
+                ir.mail_server_logs.create!(:line => "Oct 10 13:22:49 kedumba postfix/smtp[11876]: 6FB9036F1307: to=<foo@example.com>, relay=mta7.am0.yahoodns.net[74.6.136.244]:25, delay=1.5, delays=0.03/0/0.48/1, dsn=5.0.0, status=bounced (host mta7.am0.yahoodns.net[74.6.136.244] said: 554 delivery error: dd Sorry your message to foo@example.com cannot be delivered. This account has been disabled or discontinued [#102]. - mta1272.mail.sk1.yahoo.com (in reply to end of DATA command))", :order => 1)
+                MailServerLog.request_postfix_sent?(ir).should be_false
             end
         end
     end