@@ -11,32 +11,17 @@ class LoggedMail property :mapping_id, Integer, :index => true property :recipient, String property :subject, String - property :filename, String property :created_at, DateTime property :delivered_at, DateTime property :error_message, String belongs_to :mapping - before :save do - if delivered_at && filename - FileUtils.rm_rf raw_path if File.exist?(raw_path) - self.filename = nil - end - end def self.from(message) - logged = new(:filename => message.filename, :subject => message.subject) + logged = new(:subject => message.subject) if !block_given? || yield(logged) logged.save end logged end - - def raw - @raw ||= (!filename.blank? && File.exist?(raw_path)) ? IO.read(raw_path) : nil - end - - def raw_path - @raw_path ||= self.class.log_path / filename - end end app/models/logged_mail.rb @@ -4,7 +4,7 @@ require 'tempfile' # Wrapper around a TMail object class Message - attr_accessor :body, :filename + attr_accessor :body attr_reader :mail, :attachments class << self @@ -33,19 +33,14 @@ class Message end def self.receive(raw) - file = Tempfile.new("astrotrain-#{raw.size}") - file << raw - receive_file file.path, raw + message = parse(raw) + Mapping.process(message) + message end def self.receive_file(path, raw = nil) - FileUtils.mkdir_p(LoggedMail.log_path) - raw ||= IO.read(path) - filename = File.basename(path) - message = parse(raw) - message.filename = filename - FileUtils.mv path, LoggedMail.log_path / filename - Mapping.process(message) + message = receive IO.read(path) + FileUtils.rm_rf path message end app/models/message.rb @@ -8,7 +8,7 @@ dependency "merb-slices", ver # Provides a mechanism for letting plugins dependency "merb-auth", ver # An authentication slice (Merb's equivalent to Rails' restful authentication) dependency "merb-param-protection", ver -dm_ver = "0.9.9" +dm_ver = "0.9.10" dependency "dm-core", dm_ver # The datamapper ORM dependency "dm-aggregates", dm_ver # Provides your DM models with count, sum, avg, min, max, etc. dependency "dm-migrations", dm_ver # Make incremental changes to your database. config/dependencies.rb @@ -9,24 +9,12 @@ describe LoggedMail do @mapping = @user.mappings.create!(:user_id => @user.id, :email_user => '*', :recipient_header_order => 'delivered_to,original_to,to') @raw = mail(:custom) @message = Message.parse(@raw) - @message.filename = 'logged_mail_raw' @logged = LoggedMail.from(@message) do |l| l.recipient = @message.recipients(%w(delivered_to)).first l.mapping = @mapping end end - before do - File.open @logged.raw_path, 'w' do |f| - f << @raw - end - end - - it "clears message file if no mapping was set" do - Mapping.process(@message) - File.exist?(@logged.raw_path).should == false - end - it "sets recipient" do @logged.recipient.should == @message.recipients(%w(delivered_to)).first end @@ -38,20 +26,5 @@ describe LoggedMail do it "sets mapping" do @logged.mapping.should == @mapping end - - it "sets raw headers" do - @logged.raw.should == @raw - end - - it "keeps raw file" do - File.exist?(@logged.raw_path).should == true - end - - it "deletes raw file if delivered" do - @logged.delivered_at = Time.now.utc - @logged.save - @logged.filename.should == nil - File.exist?(@logged.raw_path).should == false - end end end \ No newline at end of file spec/models/logged_mail_spec.rb @@ -66,10 +66,6 @@ describe Message do @log.mapping.should == @mapping end - it "sets filename" do - @log.filename.should == nil - end - it "sets subject" do @log.subject.should == @msg.subject end spec/models/message_spec.rb 5a47b06e825c44b6b7f337d5777b10b0077eed8a rick technoweenie@gmail.com http://github.com/jnunemaker/astrotrain/commit/0ebf9216782ec1d1d8ca66f230e68ece7f6016c2 0ebf9216782ec1d1d8ca66f230e68ece7f6016c2 2009-04-19T19:44:29-07:00 2009-03-17T14:53:14-07:00 dont log mails, assume they're archived elsewhere Signed-off-by: John Nunemaker <nunemaker@gmail.com> 2cbd2ce67d52915845a86164329e95589fefa158 John Nunemaker nunemaker@gmail.com