aiwilliams-mlist 0.1.2 → 0.1.3

data/README

@@ -65,9 +65,10 @@ You love Ruby. You want MList.
 
 You'll need some gems.
 
+* uuid (macaddr also)
+* tmail
 * activesupport
 * activerecord
-* tmail
 
 == INSTALL:
 
@@ -86,6 +87,7 @@ environment.rb after the initialize block (our gem needs to have been loaded):
   end
   
   MLIST_SERVER = MList::Server.new(
+    :domain       => 'myapp.com',                      # This is optional
     :list_manager => MList::Manager::Database.new,
     :email_server => MList::EmailServer::Default.new(
       MList::EmailServer::Pop.new(

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 1
-:patch: 2
+:patch: 3
 :major: 0

data/lib/mlist.rb

@@ -1,3 +1,4 @@
+require 'uuid'
 require 'tmail'
 require 'activesupport'
 require 'activerecord'

data/lib/mlist/email_server/base.rb

@@ -4,14 +4,22 @@ module MList
       attr_reader :settings
       
       def initialize(settings)
-        @settings = settings
+        @settings = {
+          :domain => ::Socket.gethostname
+        }.merge(settings)
+        
+        @uuid = UUID.new
         @receivers = []
       end
       
-      def deliver(tmail, destinations)
+      def deliver(tmail)
         raise 'Implement actual delivery mechanism in subclasses'
       end
       
+      def generate_message_id
+        "#{@uuid.generate}@#{@settings[:domain]}"
+      end
+      
       def receive(tmail)
         email = MList::Email.new(:tmail => tmail)
         @receivers.each { |r| r.receive_email(email) }

data/lib/mlist/email_server/default.rb

@@ -10,8 +10,8 @@ module MList
       
       # Delegates delivery of email to outgoing server.
       #
-      def deliver(tmail, destinations)
-        @outgoing_server.deliver(tmail, destinations)
+      def deliver(tmail)
+        @outgoing_server.deliver(tmail)
       end
       
       # Delegates fetching emails to incoming server.

data/lib/mlist/email_server/fake.rb

@@ -3,12 +3,12 @@ module MList
     class Fake < Base
       attr_reader :deliveries
       
-      def initialize
-        super({})
+      def initialize(settings = {})
+        super
         @deliveries = []
       end
       
-      def deliver(tmail, destinations)
+      def deliver(tmail)
         @deliveries << tmail
       end
     end

data/lib/mlist/email_server/pop.rb

@@ -4,7 +4,7 @@ module MList
   module EmailServer
     
     class Pop < Base
-      def deliver(tmail, destinations)
+      def deliver(tmail)
         raise "Mail cannot be delivered through a POP server. Please use the '#{MList::EmailServer::Default.name}' type."
       end
       

data/lib/mlist/email_server/smtp.rb

@@ -4,7 +4,9 @@ module MList
   module EmailServer
     
     class Smtp < Base
-      def deliver(tmail, destinations)
+      def deliver(tmail)
+        destinations = tmail.destinations
+        tmail.delete_no_send_fields
         Net::SMTP.start(settings[:address], settings[:port], settings[:domain],
             settings[:user_name], settings[:password], settings[:authentication]) do |smtp|
           smtp.sendmail(tmail.encoded, tmail['sender'], destinations)

data/lib/mlist/mail_list.rb

@@ -98,35 +98,35 @@ module MList
           :search_parent => true,
           :delivery_time => Time.now
         }.merge(options)
+        
         transaction do
           thread = find_thread(message, options)
+          thread.updated_at = options[:delivery_time]
+          
+          delivery = prepare_delivery(message, options)
           thread.messages << message
-          prepare_delivery(message)
-          destinations = message.delivery.destinations
-          tmail = message.to_tmail
-          self.updated_at = thread.updated_at = options[:delivery_time]
+          
+          self.updated_at = options[:delivery_time]
           thread.save! && save!
-          outgoing_server.deliver(tmail, destinations)
+          
+          outgoing_server.deliver(delivery.tmail)
         end
+        
         message
       end
       
-      def prepare_delivery(message)
-        delivery = message.delivery
-        prepare_list_headers(delivery)
-        delivery.subject = list_subject(message)
-        delivery.to = address
-        delivery.bcc = message.recipients.collect(&:email_address)
-        delivery.reply_to = "#{label} <#{post_url}>"
-      end
-      
-      def prepare_list_headers(delivery)
-        list_headers.each do |k,v|
-          if TMail::Mail::ALLOW_MULTIPLE.include?(k.downcase)
-            delivery.prepend_header(k,v)
-          else
-            delivery.write_header(k,v)
-          end
+      def prepare_delivery(message, options)
+        message.identifier = outgoing_server.generate_message_id
+        message.created_at = options[:delivery_time]
+        returning(message.delivery) do |delivery|
+          delivery.date = message.created_at
+          delivery.message_id = message.identifier
+          delivery.mailer = message.mailer
+          delivery.headers = list_headers
+          delivery.subject = list_subject(message)
+          delivery.to = address
+          delivery.bcc = message.recipients.collect(&:email_address)
+          delivery.reply_to = "#{label} <#{post_url}>"
         end
       end
       

data/lib/mlist/message.rb

@@ -15,8 +15,21 @@ module MList
     #
     attr_accessor :recipients
     
+    # Answers an MList::TMailBuilder for assembling the TMail::Mail object
+    # that will be fit for delivery. If this is not a new message, the
+    # delivery will be updated to reflect the message-id, x-mailer, etc. of
+    # this message.
+    #
     def delivery
-      @delivery ||= MList::Util::TMailBuilder.new(TMail::Mail.parse(email.source))
+      @delivery ||= begin
+        d = MList::Util::TMailBuilder.new(TMail::Mail.parse(email.source))
+        unless new_record?
+          d.message_id = self.identifier
+          d.mailer = self.mailer
+          d.date = self.created_at
+        end
+        d
+      end
     end
     
     def email_with_capture=(email)
@@ -100,12 +113,5 @@ module MList
         @subscriber = self.subscriber_address = self.subscriber_type = self.subscriber_id = nil
       end
     end
-    
-    def to_tmail
-      delivery.mailer = mailer
-      delivery.ready_to_send
-      self.identifier = delivery.identifier
-      delivery.tmail
-    end
   end
 end

data/lib/mlist/util/header_sanitizer.rb

@@ -31,6 +31,8 @@ module MList
       end
       
       def initialize_default_sanitizers
+        self['message-id'] = quoter(:quote_address_if_necessary)
+        
         self['to']       = quoter(:quote_any_address_if_necessary)
         self['cc']       = quoter(:quote_any_address_if_necessary)
         self['bcc']      = quoter(:quote_any_address_if_necessary)

data/lib/mlist/util/tmail_methods.rb

@@ -59,6 +59,16 @@ module MList
         tmail[name] = nil
       end
       
+      def headers=(updates)
+        updates.each do |k,v|
+          if TMail::Mail::ALLOW_MULTIPLE.include?(k.downcase)
+            prepend_header(k,v)
+          else
+            write_header(k,v)
+          end
+        end
+      end
+      
       # Add another value for the named header, it's position being earlier in
       # the email than those that are already present. This will raise an error
       # if the header does not allow multiple values according to
@@ -94,6 +104,10 @@ module MList
       def mailer=(value)
         write_header('x-mailer', value)
       end
+      
+      def message_id=(value)
+        tmail.message_id = sanitize_header(charset, 'message-id', value)
+      end
     end
     
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aiwilliams-mlist
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Adam Williams
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-07 00:00:00 -08:00
+date: 2009-02-09 00:00:00 -08:00
 default_executable: 
 dependencies: []