mlist 0.1.11 → 0.1.12

data/README

@@ -141,7 +141,7 @@ environment.rb after the initialize block (our gem needs to have been loaded):
     # Please do specify a version, and check for the latest!
     config.gem "mlist", :version => '0.1.0'
   end
-  
+
   MLIST_SERVER = MList::Server.new(
     :list_manager => MList::Manager::Database.new,
     :email_server => MList::EmailServer::Default.new(
@@ -185,6 +185,7 @@ list something like this:
 (The MIT License)
 
 Copyright (c) 2008-2009 Adam Williams (aiwilliams)
+Portions from Rails are Copyright (c) 2004-2008 David Heinemeier Hansson
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the 'Software'), to deal in the

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:patch: 11
+:patch: 12
 :major: 0
 :build: 
 :minor: 1

data/lib/mlist/mail_list.rb

@@ -1,7 +1,7 @@
 module MList
   class MailList < ActiveRecord::Base
     set_table_name 'mlist_mail_lists'
-    
+
     # Provides the MailList for a given implementation of MList::List,
     # connecting it to the provided email server for delivering posts.
     #
@@ -17,19 +17,19 @@ module MList
       mail_list.outgoing_server = outgoing_server
       mail_list
     end
-    
+
     include MList::Util::EmailHelpers
-    
+
     belongs_to :manager_list, :polymorphic => true
-    
+
     before_destroy :delete_unreferenced_email
     has_many :messages, :class_name => 'MList::Message', :dependent => :delete_all
     has_many :threads, :class_name => 'MList::Thread', :dependent => :delete_all
-    
+
     delegate :address, :label, :post_url, :to => :list
-    
+
     attr_accessor :outgoing_server
-    
+
     # Creates a new MList::Message and delivers it to the subscribers of this
     # list.
     #
@@ -45,7 +45,7 @@ module MList
         :email => MList::Email.new(:source => email.to_s)
       ), :search_parent => false, :copy_sender => email.copy_sender
     end
-    
+
     # Processes the email received by the MList::Server.
     #
     def process_email(email, subscriber)
@@ -57,7 +57,7 @@ module MList
         :email => email
       ), :copy_sender => list.copy_sender?(subscriber)
     end
-    
+
     # Answers the provided subject with superfluous 're:' and this list's
     # labels removed.
     #
@@ -72,14 +72,14 @@ module MList
         without_label
       end
     end
-    
+
     def find_parent_message(email)
       if in_reply_to = email.header_string('in-reply-to')
         message = messages.find(:first,
           :conditions => ['identifier = ?', remove_brackets(in_reply_to)])
         return message if message
       end
-      
+
       if email.references
         reference_identifiers = email.references.collect {|rid| remove_brackets(rid)}
         message = messages.find(:first,
@@ -87,7 +87,7 @@ module MList
           :order => 'created_at desc')
         return message if message
       end
-      
+
       if email.subject =~ REGARD_RE
         message = messages.find(:first,
           :conditions => ['subject = ?', remove_regard(clean_subject(email.subject))],
@@ -95,13 +95,13 @@ module MList
         return message if message
       end
     end
-    
+
     # The MList::List instance of the list manager.
     #
     def list
       @list ||= manager_list
     end
-    
+
     def manager_list_with_dual_type=(list)
       if list.is_a?(ActiveRecord::Base)
         self.manager_list_without_dual_type = list
@@ -112,27 +112,27 @@ module MList
       end
     end
     alias_method_chain :manager_list=, :dual_type
-    
+
     # Distinct footer start marker. It is important to realize that changing
     # this could be problematic.
     #
     FOOTER_BLOCK_START    = "-~----~~----~----~----~----~---~~-~----~------~--~-~-"
-    
+
     # Distinct footer end marker. It is important to realize that changing
     # this could be problematic.
     #
     FOOTER_BLOCK_END      = "--~--~---~-----~--~----~-----~~~----~---~---~--~----~"
-    
+
     private
       FOOTER_BLOCK_START_RE = %r[#{FOOTER_BLOCK_START}]
       FOOTER_BLOCK_END_RE   = %r[#{FOOTER_BLOCK_END}]
-      
+
       # http://mail.python.org/pipermail/mailman-developers/2006-April/018718.html
       def bounce_headers
         # tmail would not correctly quote the label in the sender header, which would break smtp delivery
         {'sender' => "<mlist-#{address}>", 'errors-to' => "#{label} <mlist-#{address}>"}
       end
-      
+
       def delete_unreferenced_email
         conditions = %Q{
           mlist_emails.id in (
@@ -144,7 +144,7 @@ module MList
           )}
         MList::Email.delete_all(conditions)
       end
-      
+
       def strip_list_footers(content)
         if content =~ FOOTER_BLOCK_START_RE
           in_footer_block = false
@@ -160,7 +160,7 @@ module MList
         end
         content
       end
-      
+
       # http://www.jamesshuggins.com/h/web1/list-email-headers.htm
       def list_headers
         headers = list.list_headers.dup
@@ -169,43 +169,43 @@ module MList
         headers.update(bounce_headers)
         headers.delete_if {|k,v| v.nil?}
       end
-      
+
       # Answer headers values which should be stripped from outgoing email.
       #
       def strip_headers
         %w(return-receipt-to domainkey-signature dkim-signature)
       end
-      
+
       def process_message(message, options = {})
         raise MList::DoubleDeliveryError.new(message) unless message.new_record?
-        
+
         options = {
           :search_parent => true,
           :delivery_time => Time.now,
           :copy_sender => false
         }.merge(options)
-        
+
         transaction do
           thread = find_thread(message, options)
           thread.updated_at = options[:delivery_time]
-          
+
           delivery = prepare_delivery(message, options)
           thread.messages << message
-          
+
           self.updated_at = options[:delivery_time]
           thread.save! && save!
-          
+
           outgoing_server.deliver(delivery.tmail)
         end
-        
+
         message
       end
-      
+
       def prepare_delivery(message, options)
         message.identifier = outgoing_server.generate_message_id
         message.created_at = options[:delivery_time]
         message.subject = clean_subject(message.subject)
-        
+
         recipient_addresses = message.recipient_addresses
         sender_address = message.subscriber.email_address
         if options[:copy_sender]
@@ -213,7 +213,7 @@ module MList
         else
           recipient_addresses.delete(sender_address)
         end
-        
+
         returning(message.delivery) do |delivery|
           delivery.date ||= options[:delivery_time]
           delivery.message_id = message.identifier
@@ -228,22 +228,40 @@ module MList
           prepare_list_footer(delivery, message)
         end
       end
-      
+
       def prepare_list_footer(delivery, message)
-        text_plain_part = delivery.text_plain_part
-        return unless text_plain_part
-        
-        content = strip_list_footers(text_plain_part.body)
+        footer = list_footer(message)
+        prepare_html_footer(delivery.text_html_part, footer)
+        prepare_text_footer(delivery.text_plain_part, footer)
+      end
+
+      def prepare_html_footer(part, footer)
+        return unless part
+        content = part.body
+        content.gsub!(%r(<p>\s*#{FOOTER_BLOCK_START_RE}.*?#{FOOTER_BLOCK_END_RE}\s*<\/p>)im, '')
+        content.strip!
+        html_footer = "<p>#{auto_link_urls(text_to_html(footer))}</p>"
+
+        unless content.sub!(/<\/body>/, "#{html_footer}</body>")
+          # no body was there, substitution failed
+          content << html_footer
+        end
+        part.body = content
+      end
+
+      def prepare_text_footer(part, footer)
+        return unless part
+        content = strip_list_footers(part.body)
         content << "\n\n" unless content.end_with?("\n\n")
-        content << list_footer(message)
-        text_plain_part.body = content
+        content << footer
+        part.body = content
       end
-      
+
       def list_footer(message)
         content = list.footer_content(message)
         "#{FOOTER_BLOCK_START}\n#{content}\n#{FOOTER_BLOCK_END}"
       end
-      
+
       def list_subject(string)
         list_subject = string.dup
         if list_subject =~ REGARD_RE
@@ -252,12 +270,12 @@ module MList
           "#{subject_prefix} #{list_subject}"
         end
       end
-      
+
       def find_thread(message, options)
         message.parent = find_parent_message(message.email) if message.email && options[:search_parent]
         message.parent ? message.parent.thread : threads.build
       end
-      
+
       def reply_to_header(message)
         if list.reply_to_list?
           "#{label} #{bracket(address)}"
@@ -265,13 +283,13 @@ module MList
           subscriber_name_and_address(message.subscriber)
         end
       end
-      
+
       def subject_prefix_regex
         @subject_prefix_regex ||= Regexp.new(Regexp.escape(subject_prefix) + ' ')
       end
-      
+
       def subject_prefix
         @subject_prefix ||= "[#{label}]"
       end
   end
-end
+end

data/lib/mlist/util/email_helpers.rb

@@ -1,18 +1,18 @@
 module MList
   module Util
-    
+
     class HtmlTextExtraction
-      
+
       # We need a way to maintain non-breaking spaces. Hpricot will replace
       # them with ??.chr. We can easily teach it to convert it to a space, but
       # then we lose the information in the Text node that we need to keep the
       # space around, since that is what they would see in a view of the HTML.
       NBSP = '!!!NBSP!!!'
-      
+
       def initialize(html)
         @doc = Hpricot(html.gsub(' ', NBSP))
       end
-      
+
       def execute
         @text, @anchors = '', []
         @doc.each_child do |node|
@@ -28,7 +28,7 @@ module MList
         end
         @text.gsub(NBSP, ' ')
       end
-      
+
       def extract_text_from_node(node)
         case node.name
         when 'head'
@@ -67,7 +67,7 @@ module MList
           extract_text_from_children(node)
         end
       end
-      
+
       def extract_text_from_children(elem)
         elem.each_child do |node|
           case node
@@ -78,45 +78,81 @@ module MList
           end
         end
       end
-      
+
       def extract_text_from_text_node(node)
         text = @text.end_with?("\n") ? node.inner_text.lstrip : node.inner_text
         @text << text.gsub(/\s{2,}/, ' ').sub(/\n/, '')
       end
     end
-    
+
     module EmailHelpers
       def sanitize_header(charset, name, *values)
         header_sanitizer(name).call(charset, *values)
       end
-      
+
       def header_sanitizer(name)
         Util.default_header_sanitizers[name]
       end
-      
+
       def html_to_text(html)
         HtmlTextExtraction.new(html).execute
       end
-      
+
       def normalize_new_lines(text)
         text.to_s.gsub(/\r\n?/, "\n")
       end
-      
+
       def subscriber_name_and_address(subscriber)
         a = subscriber.email_address
         a = "#{subscriber.display_name} #{bracket(a)}" if subscriber.respond_to?(:display_name)
         a
       end
-      
+
+      AUTO_LINK_RE = %r{
+          ( https?:// | www\. )
+          [^\s<]+
+        }x unless const_defined?(:AUTO_LINK_RE)
+
+      BRACKETS = { ']' => '[', ')' => '(', '}' => '{' }
+
+      # Turns all urls into clickable links.  If a block is given, each url
+      # is yielded and the result is used as the link text.
+      def auto_link_urls(text)
+        text.gsub(AUTO_LINK_RE) do
+          href = $&
+          punctuation = ''
+          left, right = $`, $'
+          # detect already linked URLs and URLs in the middle of a tag
+          if left =~ /<[^>]+$/ && right =~ /^[^>]*>/
+            # do not change string; URL is alreay linked
+            href
+          else
+            # don't include trailing punctuation character as part of the URL
+            if href.sub!(/[^\w\/-]$/, '') and punctuation = $& and opening = BRACKETS[punctuation]
+              if href.scan(opening).size > href.scan(punctuation).size
+                href << punctuation
+                punctuation = ''
+              end
+            end
+
+            link_text = block_given?? yield(href) : href
+            href = 'http://' + href unless href.index('http') == 0
+
+            %Q(<a href="#{href}">#{link_text}</a>)
+          end
+        end
+      end
+
+
       BRACKETS_RE = /\A<(.*?)>\Z/
       def bracket(string)
         string.blank? || string =~ BRACKETS_RE ? string : "<#{string}>"
       end
-      
+
       def remove_brackets(string)
         string =~ BRACKETS_RE ? $1 : string
       end
-      
+
       REGARD_RE = /(^|[^\w])re: /i
       def remove_regard(string)
         while string =~ REGARD_RE
@@ -124,7 +160,7 @@ module MList
         end
         string.strip
       end
-      
+
       def text_to_html(text)
         lines = normalize_new_lines(text).split("\n")
         lines.collect! do |line|
@@ -136,7 +172,7 @@ module MList
         end
         lines.join("<br />\n")
       end
-      
+
       def text_to_quoted(text)
         lines = normalize_new_lines(text).split("\n")
         lines.collect! do |line|
@@ -144,12 +180,12 @@ module MList
         end
         lines.join("\n")
       end
-      
+
       HTML_ESCAPE = { '&' => '&amp;',  '>' => '&gt;',   '<' => '&lt;', '"' => '&quot;' }
       def escape_once(text)
         text.gsub(/[\"><]|&(?!([a-zA-Z]+|(#\d+));)/) { |special| HTML_ESCAPE[special] }
       end
     end
-    
+
   end
-end
+end

data/lib/mlist/util/quoting.rb

@@ -1,8 +1,6 @@
 module MList
   module Util
-    
-    # Copyright (c) 2004-2008 David Heinemeier Hansson
-    #
+
     # Taken from ActionMailer. Modified to make charset first argument in all
     # signatures, allowing for a consistent pattern of invocation.
     #

data/lib/mlist/util/tmail_methods.rb

@@ -1,17 +1,17 @@
 module MList
   module Util
-    
+
     module TMailReaders
       def date
         if date = tmail.header_string('date')
           Time.parse(date)
         end
       end
-      
+
       def from_address
         tmail.from.first.downcase
       end
-      
+
       def html
         case tmail.content_type
         when 'text/html'
@@ -21,27 +21,39 @@ module MList
           html_part.body.strip if html_part
         end
       end
-      
+
       def identifier
         remove_brackets(tmail.header_string('message-id'))
       end
-      
+
       def mailer
         tmail.header_string('x-mailer')
       end
-      
+
       def text
         text_content = ''
         extract_text_content(tmail, text_content)
         return text_content unless text_content.blank?
-        
+
         html_content = ''
         extract_html_content(tmail, html_content)
         return html_to_text(html_content) unless html_content.blank?
-        
+
         return nil
       end
-      
+
+      # Answers the first text/html part it can find, the tmail itself if
+      # it's content type is text/html.
+      #
+      def text_html_part(part = tmail)
+        case part.content_type
+        when 'text/html'
+          part
+        when 'multipart/alternative'
+          part.parts.detect {|part| text_html_part(part)}
+        end
+      end
+
       # Answers the first text/plain part it can find, the tmail itself if
       # it's content type is text/plain.
       #
@@ -53,7 +65,7 @@ module MList
           part.parts.detect {|part| text_plain_part(part)}
         end
       end
-      
+
       private
         def extract_html_content(part, collector)
           case part.content_type
@@ -63,7 +75,7 @@ module MList
             part.parts.each {|part| extract_html_content(part, collector)}
           end
         end
-        
+
         def extract_text_content(part, collector)
           case part.content_type
           when 'text/plain'
@@ -73,16 +85,16 @@ module MList
           end
         end
     end
-    
+
     module TMailWriters
       def charset
         'utf-8'
       end
-      
+
       def delete_header(name)
         tmail[name] = nil
       end
-      
+
       def headers=(updates)
         updates.each do |k,v|
           if TMail::Mail::ALLOW_MULTIPLE.include?(k.downcase)
@@ -92,7 +104,7 @@ module MList
           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
@@ -104,35 +116,35 @@ module MList
         tmail[name] = sanitize_header(charset, name, value)
         tmail[name] = tmail[name] + original
       end
-      
+
       def write_header(name, value)
         tmail[name] = sanitize_header(charset, name, value)
       end
-      
+
       def to=(recipient_addresses)
         tmail.to = sanitize_header(charset, 'to', recipient_addresses)
       end
-      
+
       def bcc=(recipient_addresses)
         tmail.bcc = sanitize_header(charset, 'bcc', recipient_addresses)
       end
-      
+
       def from=(from_address)
         tmail.from = sanitize_header(charset, 'from', from_address)
       end
-      
+
       def in_reply_to=(*values)
         tmail.in_reply_to = sanitize_header(charset, 'in-reply-to', *values)
       end
-      
+
       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
-end
+end

data/spec/models/mail_list_spec.rb

@@ -4,38 +4,38 @@ describe MList::MailList do
   class ManagerList
     include MList::List
   end
-  
+
   before do
     @manager_list = ManagerList.new
     stub(@manager_list).label       {'Discussions'}
     stub(@manager_list).address     {'list_one@example.com'}
     stub(@manager_list).list_id     {'list_one@example.com'}
-    
+
     @subscriber_one = MList::EmailSubscriber.new('adam@nomail.net')
     @subscriber_two = MList::EmailSubscriber.new('john@example.com')
     stub(@manager_list).subscribers {[@subscriber_one, @subscriber_two]}
-    
+
     @outgoing_server = MList::EmailServer::Fake.new
     @mail_list = MList::MailList.create!(
       :manager_list => @manager_list,
       :outgoing_server => @outgoing_server)
   end
-  
+
   it 'should not require the manager list be an ActiveRecord type' do
     @mail_list.list.should == @manager_list
     @mail_list.manager_list.should be_nil
   end
-  
+
   it 'should have messages counted' do
     MList::Message.reflect_on_association(:mail_list).counter_cache_column.should == :messages_count
     MList::MailList.column_names.should include('messages_count')
   end
-  
+
   it 'should have threads counted' do
     MList::Thread.reflect_on_association(:mail_list).counter_cache_column.should == :threads_count
     MList::MailList.column_names.should include('threads_count')
   end
-  
+
   it 'should delete email not referenced by other lists' do
     email_in_other = MList::Email.create!(:tmail => tmail_fixture('single_list'))
     email_not_other = MList::Email.create!(:tmail => tmail_fixture('single_list'))
@@ -48,7 +48,7 @@ describe MList::MailList do
     MList::Email.exists?(email_in_other).should be_true
     MList::Email.exists?(email_not_other).should be_false
   end
-  
+
   describe 'post' do
     it 'should allow posting a new message to the list' do
       lambda do
@@ -60,12 +60,12 @@ describe MList::MailList do
           )
         end.should change(MList::Message, :count).by(1)
       end.should change(MList::Thread, :count).by(1)
-      
+
       tmail = @outgoing_server.deliveries.last
       tmail.subject.should =~ /I'm a Program!/
       tmail.from.should == ['adam@nomail.net']
     end
-    
+
     it 'should answer the message for use by the application' do
       @mail_list.post(
         :subscriber => @subscriber_one,
@@ -73,7 +73,7 @@ describe MList::MailList do
         :text => 'Are you a programmer or what?'
       ).should be_instance_of(MList::Message)
     end
-    
+
     it 'should allow posting a reply to an existing message' do
       @mail_list.process_email(MList::Email.new(:tmail => tmail_fixture('single_list')), @subscriber_one)
       existing_message = @mail_list.messages.last
@@ -89,7 +89,7 @@ describe MList::MailList do
       new_message = MList::Message.last
       new_message.subject.should == "Re: Test"
     end
-    
+
     it 'should not associate a posting to a parent if not reply' do
       @mail_list.process_email(MList::Email.new(:tmail => tmail_fixture('single_list')), @subscriber_one)
       lambda do
@@ -105,7 +105,7 @@ describe MList::MailList do
       message.parent.should be_nil
       message.parent_identifier.should be_nil
     end
-    
+
     it 'should capture the message-id of delivered email' do
       message = @mail_list.post(
         :subscriber => @subscriber_one,
@@ -113,91 +113,91 @@ describe MList::MailList do
         :text => 'Email must have a message id for threading')
       message.reload.identifier.should_not be_nil
     end
-    
+
     it 'should copy the subscriber if desired' do
       @mail_list.post(
         :subscriber => @subscriber_one,
         :subject => 'Copy Me',
         :text => 'Email should be sent to subscriber if desired',
         :copy_sender => true)
-        
+
       tmail = @outgoing_server.deliveries.last
       tmail.bcc.should include(@subscriber_one.email_address)
     end
-    
+
     it 'should not copy the subscriber if undesired and list includes the subscriber' do
       # The MList::List implementor may include the sending subscriber
       stub(@manager_list).recipients {[@subscriber_one, @subscriber_two]}
-      
+
       @mail_list.post(
         :subscriber => @subscriber_one,
         :subject => 'Do Not Copy Me',
         :text => 'Email should not be sent to subscriber if undesired',
         :copy_sender => false)
-        
+
       tmail = @outgoing_server.deliveries.last
       tmail.bcc.should_not include(@subscriber_one.email_address)
     end
   end
-  
+
   describe 'message storage' do
     def process_post
       @mail_list.process_email(MList::Email.new(:tmail => @post_tmail), @subscriber)
       MList::Message.last
     end
-    
+
     before do
       @post_tmail = tmail_fixture('single_list')
       @subscriber = @subscriber_one
     end
-    
+
     it 'should not include list label in subject' do
       @post_tmail.subject = '[Discussions] Test'
       process_post.subject.should == 'Test'
     end
-    
+
     it 'should not include list label in reply subject' do
       @post_tmail.subject = 'Re: [Discussions] Test'
       process_post.subject.should == 'Re: Test'
     end
-    
+
     it 'should not bother labels it does not understand in subject' do
       @post_tmail.subject = '[Ann] Test'
       process_post.subject.should == '[Ann] Test'
     end
-    
+
     it 'should not bother labels it does not understand in reply subject' do
       @post_tmail.subject = 'Re: [Ann] Test'
       process_post.subject.should == 'Re: [Ann] Test'
     end
-    
+
     it 'should be careful of multiple re:' do
       @post_tmail.subject = 'Re: [Ann] RE: Test'
       process_post.subject.should == 'Re: [Ann] Test'
     end
   end
-  
+
   describe 'finding parent message' do
     def email(path)
       MList::Email.new(:tmail => tmail_fixture(path))
     end
-    
+
     before do
       @parent_message = MList::Message.new
     end
-    
+
     it 'should be nil if none found' do
       do_not_call(@mail_list.messages).find
       @mail_list.find_parent_message(email('single_list')).should be_nil
     end
-    
+
     it 'should use in-reply-to field when present' do
       mock(@mail_list.messages).find(:first, :conditions => [
         'identifier = ?', 'F5F9DC55-CB54-4F2C-9B46-A05F241BCF22@recursivecreative.com'
         ]) { @parent_message }
       @mail_list.find_parent_message(email('single_list_reply')).should == @parent_message
     end
-    
+
     it 'should be references field if present and no in-reply-to' do
       tmail = tmail_fixture('single_list_reply')
       tmail['in-reply-to'] = nil
@@ -206,7 +206,7 @@ describe MList::MailList do
         :order => 'created_at desc') { @parent_message }
       @mail_list.find_parent_message(MList::Email.new(:tmail => tmail)).should == @parent_message
     end
-    
+
     describe 'by subject' do
       def search_subject(subject = nil)
         simple_matcher("search by the subject '#{subject}'") do |email|
@@ -223,7 +223,7 @@ describe MList::MailList do
           !subject.nil?
         end
       end
-      
+
       before do
         @parent_message = MList::Message.new
         @mail_list = MList::MailList.new
@@ -231,16 +231,16 @@ describe MList::MailList do
         @reply_tmail = tmail_fixture('single_list')
         @reply_email = MList::Email.new(:tmail => @reply_tmail)
       end
-      
+
       it 'should be employed if it has "re:" in it' do
         @reply_tmail.subject = "Re: Test"
         @reply_email.should search_subject('Test')
       end
-      
+
       it 'should not be employed when no "re:"' do
         @reply_email.should_not search_subject
       end
-      
+
       ['RE: [list name] Re: Test', 'Re: [list name] Re: [list name] Test', '[list name] Re: Test'].each do |subject|
         it "should handle '#{subject}'" do
           @reply_tmail.subject = subject
@@ -249,20 +249,20 @@ describe MList::MailList do
       end
     end
   end
-  
+
   describe 'delivery' do
     include MList::Util::EmailHelpers
-    
+
     def process_post
       @mail_list.process_email(MList::Email.new(:source => @post_tmail.to_s), @subscriber)
       @outgoing_server.deliveries.last
     end
-    
+
     before do
       @post_tmail = tmail_fixture('single_list')
       @subscriber = @subscriber_one
     end
-    
+
     it 'should be blind copied to recipients' do
       mock.proxy(@mail_list.messages).build(anything) do |message|
         mock(message.delivery).bcc=(%w(john@example.com))
@@ -270,7 +270,7 @@ describe MList::MailList do
       end
       process_post
     end
-    
+
     it 'should not deliver to addresses found in the to header' do
       @post_tmail.to = ['john@example.com', 'list_one@example.com']
       mock.proxy(@mail_list.messages).build(anything) do |message|
@@ -279,7 +279,7 @@ describe MList::MailList do
       end
       process_post
     end
-    
+
     it 'should not deliver to addresses found in the cc header' do
       @post_tmail.cc = ['john@example.com']
       mock.proxy(@mail_list.messages).build(anything) do |message|
@@ -288,88 +288,88 @@ describe MList::MailList do
       end
       process_post
     end
-    
+
     it 'should use list address as reply-to by default' do
       process_post.should have_header('reply-to', 'Discussions <list_one@example.com>')
     end
-    
+
     it 'should use subscriber address as reply-to if list says to not use address' do
       mock(@manager_list).reply_to_list? { false }
       process_post.should have_header('reply-to', 'adam@nomail.net')
     end
-    
+
     it 'should use the reply-to already in an email - should not override it' do
       @post_tmail['reply-to'] = 'theotheradam@nomail.net'
       process_post.should have_header('reply-to', 'theotheradam@nomail.net')
     end
-    
+
     it 'should set x-beenthere on emails it delivers to keep from re-posting them' do
       process_post.should have_header('x-beenthere', 'list_one@example.com')
     end
-    
+
     it 'should not remove any existing x-beenthere headers' do
       @post_tmail['x-beenthere'] = 'somewhere@nomail.net'
       process_post.should have_header('x-beenthere', %w(list_one@example.com somewhere@nomail.net))
     end
-    
+
     it 'should not modify existing headers' do
       @post_tmail['x-something-custom'] = 'existing'
       process_post.should have_header('x-something-custom', 'existing')
     end
-    
+
     it 'should delete Return-Receipt-To headers since they cause clients to spam the list (the sender address)' do
       @post_tmail['return-receipt-to'] = 'somewhere@nomail.net'
       process_post.should_not have_header('return-receipt-to')
     end
-    
+
     it 'should not have any cc addresses' do
       @post_tmail['cc'] = 'billybob@anywhere.com'
       process_post.should_not have_header('cc')
     end
-    
+
     it 'should prefix the list label to the subject of messages' do
       process_post.subject.should == '[Discussions] Test'
     end
-    
+
     it 'should move the list label to the front of subjects that already include the label' do
       @post_tmail.subject = 'Re: [Discussions] Test'
       process_post.subject.should == 'Re: [Discussions] Test'
     end
-    
+
     it 'should remove multiple occurrences of Re:' do
       @post_tmail.subject = 'Re: [Discussions] Re: Test'
       process_post.subject.should == 'Re: [Discussions] Test'
     end
-    
+
     it 'should remove DomainKey-Signature headers so that we can sign the redistribution' do
       @post_tmail['DomainKey-Signature'] = "a whole bunch of junk"
       process_post.should_not have_header('domainkey-signature')
     end
-    
+
     it 'should remove DKIM-Signature headers so that we can sign the redistribution' do
       @post_tmail['DKIM-Signature'] = "a whole bunch of junk"
       process_post.should_not have_header('dkim-signature')
     end
-    
+
     it 'should capture the new message-ids' do
       delivered = process_post
       delivered.header_string('message-id').should_not be_blank
       MList::Message.last.identifier.should == remove_brackets(delivered.header_string('message-id'))
       delivered.header_string('message-id').should_not match(/F5F9DC55-CB54-4F2C-9B46-A05F241BCF22@recursivecreative\.com/)
     end
-    
+
     it 'should maintain the content-id part headers (inline images, etc)' do
       @post_tmail = tmail_fixture('embedded_content')
       process_post.parts[1].parts[1]['content-id'].to_s.should == "<CF68EC17-F8ED-478A-A4A1-AEBF165A8830/bg_pattern.jpg>"
     end
-    
+
     it 'should add standard list headers when they are available' do
       stub(@manager_list).help_url        {'http://list_manager.example.com/help'}
       stub(@manager_list).subscribe_url   {'http://list_manager.example.com/subscribe'}
       stub(@manager_list).unsubscribe_url {'http://list_manager.example.com/unsubscribe'}
       stub(@manager_list).owner_url       {"<mailto:list_manager@example.com>\n(Jimmy Fish)"}
       stub(@manager_list).archive_url     {'http://list_manager.example.com/archive'}
-      
+
       tmail = process_post
       tmail.should have_headers(
         'list-id'          => "<list_one@example.com>",
@@ -385,33 +385,39 @@ describe MList::MailList do
       )
       tmail.header_string('x-mlist-version').should =~ /\d+\.\d+\.\d+/
     end
-    
+
     it 'should not add list headers that are not available or nil' do
       stub(@manager_list).help_url {nil}
       delivery = process_post
       delivery.should_not have_header('list-help')
       delivery.should_not have_header('list-subscribe')
     end
-    
+
     it 'should append the list footer to text/plain emails' do
       @post_tmail.body = "My Email\n\n\n\n\n"
       mock(@manager_list).footer_content(is_a(MList::Message)) { 'my footer' }
       process_post.body.should == "My Email\n\n\n\n\n#{MList::MailList::FOOTER_BLOCK_START}\nmy footer\n#{MList::MailList::FOOTER_BLOCK_END}"
     end
-    
+
     it 'should append the list footer to multipart/alternative, text/plain part of emails' do
       @post_tmail = tmail_fixture('content_types/multipart_alternative_simple')
       mock(@manager_list).footer_content(is_a(MList::Message)) { 'my footer' }
       process_post.parts[0].body.should match(/#{MList::MailList::FOOTER_BLOCK_START}\nmy footer\n#{MList::MailList::FOOTER_BLOCK_END}/)
     end
-    
+
+    it 'should append the list footer to multipart/alternative, text/html part of emails' do
+      @post_tmail = tmail_fixture('content_types/multipart_alternative_simple')
+      mock(@manager_list).footer_content(is_a(MList::Message)) { "my footer\nis here\nhttp://links/here" }
+      process_post.parts[1].body.should match(/<p>#{MList::MailList::FOOTER_BLOCK_START}<br \/>\nmy footer<br \/>\nis here<br \/>\n<a href="http:\/\/links\/here">http:\/\/links\/here<\/a><br \/>\n#{MList::MailList::FOOTER_BLOCK_END}<\/p>/)
+    end
+
     it 'should handle whitespace well when appending footer' do
       @post_tmail.body = "My Email"
       mock(@manager_list).footer_content(is_a(MList::Message)) { 'my footer' }
       process_post.body.should == "My Email\n\n#{MList::MailList::FOOTER_BLOCK_START}\nmy footer\n#{MList::MailList::FOOTER_BLOCK_END}"
     end
-    
-    it 'should strip out any existing footers from the list' do
+
+    it 'should strip out any existing text footers from the list' do
       mock(@manager_list).footer_content(is_a(MList::Message)) { 'my footer' }
       @post_tmail.body = %{My Email
 
@@ -429,32 +435,53 @@ this is without any in front
       }
       process_post.body.should == "My Email\n\n#{MList::MailList::FOOTER_BLOCK_START}\nmy footer\n#{MList::MailList::FOOTER_BLOCK_END}"
     end
-    
+
+    it 'should strip out any existing html footers from the list' do
+      @post_tmail = tmail_fixture('content_types/multipart_alternative_simple')
+      mock(@manager_list).footer_content(is_a(MList::Message)) { 'my footer' }
+      @post_tmail.parts[1].body = %{<p>My Email</p>
+<blockquote>
+   <p> Stuff in my email</p><p>  #{MList::MailList::FOOTER_BLOCK_START}
+>     >  content at front shouldn't matter
+>      >  #{MList::MailList::FOOTER_BLOCK_END}  </p>
+
+>>  not in our p!<p>#{MList::MailList::FOOTER_BLOCK_START}
+>>  this is fine to be removed
+>>  #{MList::MailList::FOOTER_BLOCK_END}</p>
+
+<p>#{MList::MailList::FOOTER_BLOCK_START}
+this is without any in front
+#{MList::MailList::FOOTER_BLOCK_END}
+</p>
+      }
+      process_post.parts[1].body.should == "<p>My Email</p>\n<blockquote>\n   <p> Stuff in my email</p>\n\n>>  not in our p!<p>#{MList::MailList::FOOTER_BLOCK_START}<br />\nmy footer<br />\n#{MList::MailList::FOOTER_BLOCK_END}</p>"
+    end
+
     describe 'time' do
       include TMail::TextUtils
-      
+
       before do
         @old_zone_default = Time.zone_default
         @system_time = Time.parse('Thu, 2 Apr 2009 15:22:04')
         mock(Time).now.times(any_times) { @system_time }
       end
-      
+
       after do
         Time.zone_default = @old_zone_default
       end
-      
+
       it 'should keep date of email post' do
         @post_tmail['date'] = 'Thu, 2 Apr 2009 15:22:04 -0400'
         process_post.header_string('date').should == 'Thu, 2 Apr 2009 15:22:04 -0400'
       end
-      
+
       it 'should store the delivery time as created_at of message record' do
         Time.zone_default = 'Pacific Time (US & Canada)'
         @post_tmail['date'] = 'Wed, 1 Apr 2009 15:22:04 -0400'
         process_post.header_string('date').should == 'Wed, 1 Apr 2009 15:22:04 -0400'
         MList::Message.last.created_at.should == @system_time
       end
-      
+
       # I think that what TMail is doing is evil, but it's reference to
       # a ruby-talk discussion leads to Japanese, which I cannot read.
       # I'd prefer that it leave the problem of timezones up to the client,
@@ -466,4 +493,4 @@ this is without any in front
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: mlist
 version: !ruby/object:Gem::Version 
-  version: 0.1.11
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 12
+  version: 0.1.12
 platform: ruby
 authors: 
 - Adam Williams
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-11 00:00:00 -05:00
+date: 2010-03-26 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -67,18 +72,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A Ruby mailing list library designed to be integrated into other applications.