aiwilliams-mlist 0.1.1 → 0.1.2

data/CHANGELOG

@@ -0,0 +1,7 @@
+*0.1.2 [] (January 7, 2009)
+
+* Added references header when creating a reply post.
+* Including display_name in from address of EmailPost.
+* Improved extraction of text when it is nested inside parts.
+
+*0.1.1 [First Working Release] (January 5, 2009)

data/VERSION.yml

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

data/lib/mlist/email_post.rb

@@ -10,6 +10,8 @@ module MList
   # list outside of the methods provided herein.
   #
   class EmailPost
+    include MList::Util::EmailHelpers
+    
     ATTRIBUTE_NAMES = %w(html text mailer subject subscriber)
     ATTRIBUTE_NAMES.each do |attribute_name|
       define_method(attribute_name) do
@@ -63,9 +65,15 @@ module MList
       builder.mime_version = "1.0"
       builder.mailer = mailer
       
-      builder.in_reply_to = parent_identifier if parent_identifier
+      if parent_identifier
+        builder.in_reply_to = parent_identifier
+        builder.references = [bracket(parent_identifier)]
+      end
+      
+      from = subscriber.email_address
+      from = "#{subscriber.display_name} #{bracket(from)}" if subscriber.respond_to?(:display_name)
+      builder.from = from
       
-      builder.from = subscriber.email_address
       builder.subject = subject
       
       if html

data/lib/mlist/list.rb

@@ -7,7 +7,8 @@ module MList
   #
   module List
     
-    # Answers whether this list is active or not.
+    # Answers whether this list is active or not. All lists are active all the
+    # time by default.
     #
     def active?
       true
@@ -41,8 +42,19 @@ module MList
       address
     end
     
+    # A list is responsible for answering the recipient subscribers.
+    
+    # The subscriber of the incoming message is provided if the list would
+    # like to exclude it from the returned list. It is not assumed that it
+    # will be included or excluded, thereby allowing the list to decide. This
+    # default implementation does not include the sending subscriber in the
+    # list of recipients.
+    #
+    # Your 'subscriber' instance MUST respond to :email_address. They may
+    # optionally respond to :display_name.
+    #
     def recipients(subscriber)
-      subscribers.collect(&:email_address) - [subscriber.email_address]
+      subscribers.reject {|s| s.email_address == subscriber.email_address}
     end
     
     def subscriber(email_address)

data/lib/mlist/mail_list.rb

@@ -116,7 +116,7 @@ module MList
         prepare_list_headers(delivery)
         delivery.subject = list_subject(message)
         delivery.to = address
-        delivery.bcc = message.recipients
+        delivery.bcc = message.recipients.collect(&:email_address)
         delivery.reply_to = "#{label} <#{post_url}>"
       end
       

data/lib/mlist/util/email_helpers.rb

@@ -14,8 +14,14 @@ module MList
         text.to_s.gsub(/\r\n?/, "\n")
       end
       
+      BRACKETS_RE = /\A<(.*?)>\Z/
+      
+      def bracket(string)
+        string.blank? || string =~ BRACKETS_RE ? string : "<#{string}>"
+      end
+      
       def remove_brackets(string)
-        string =~ /\A<(.*?)>\Z/ ? $1 : string
+        string =~ BRACKETS_RE ? $1 : string
       end
       
       def remove_regard(string)

data/lib/mlist/util/tmail_methods.rb

@@ -33,14 +33,21 @@ module MList
       end
       
       def text
-        case tmail.content_type
-        when 'text/plain'
-          tmail.body.strip
-        when 'multipart/alternative'
-          text_part = tmail.parts.detect {|part| part.content_type == 'text/plain'}
-          text_part.body.strip if text_part
-        end
+        returning('') {|content| extract_text_content(tmail, content)}
       end
+      
+      private
+        def extract_text_content(part, collector)
+          case part.content_type
+          when 'text/plain'
+            collector << part.body.strip
+          when 'multipart/alternative'
+            text_part = part.parts.detect {|part| part.content_type == 'text/plain'}
+            collector << text_part.body.strip if text_part
+          when 'multipart/mixed', 'multipart/related'
+            part.parts.each {|mixed_part| extract_text_content(mixed_part, collector)}
+          end
+        end
     end
     
     module TMailWriters

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aiwilliams-mlist
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Adam Williams
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-05 00:00:00 -08:00
+date: 2009-02-07 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -22,6 +22,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- CHANGELOG
 - Rakefile
 - README
 - VERSION.yml