mlist 0.1.14 → 0.1.16

data/CHANGELOG

@@ -1,3 +1,11 @@
+*0.1.16 [Bug Fix] (2010-04-13)
+
+* Fixed bug where encoding was lost when adding footers. [aiwilliams]
+
+*0.1.15 [Bug Fix] (2010-04-02)
+
+* Fixed mistakes in lifecycle management of imap connection. [aiwilliams]
+
 *0.1.14 [Bug Fix] (2010-04-02)
 
 * Better to ask for not deleted messages, and expunging after processing. [aiwilliams]

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:patch: 14
+:patch: 16
 :major: 0
 :build: 
 :minor: 1

data/lib/mlist/email_server/imap.rb

@@ -6,11 +6,6 @@ module MList
     class Imap < Base
       def initialize(settings)
         super(settings)
-        @imap = Net::IMAP.new(
-          settings[:server],
-          settings[:port],
-          settings[:ssl]
-        )
       end
 
       def deliver(tmail)
@@ -18,7 +13,12 @@ module MList
       end
 
       def execute
-        connect { process_folders }
+        begin
+          connect
+          process_folders
+        ensure
+          disconnect
+        end
       end
 
       def archive_message_id(id)
@@ -27,12 +27,16 @@ module MList
       end
 
       def connect
+        @imap = Net::IMAP.new(
+          settings[:server],
+          settings[:port],
+          settings[:ssl]
+        )
         @imap.login(settings[:username], settings[:password])
-        begin
-          yield
-        ensure
-          @imap.close
-        end
+      end
+
+      def disconnect
+        @imap.disconnect if @imap && !@imap.disconnected?
       end
 
       def process_folders
@@ -47,7 +51,7 @@ module MList
           process_message_id(message_id)
           archive_message_id(message_id)
         end
-        @imap.expunge
+        @imap.close
       end
 
       def process_message_id(id)

data/lib/mlist/mail_list.rb

@@ -1,5 +1,7 @@
 module MList
   class MailList < ActiveRecord::Base
+    include Util::Quoting
+
     set_table_name 'mlist_mail_lists'
 
     # Provides the MailList for a given implementation of MList::List,
@@ -237,24 +239,31 @@ module MList
 
       def prepare_html_footer(part, footer)
         return unless part
-        content = part.body
+
+        content = part.body('utf-8')
         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
+
+        part.charset = 'utf-8'
+        part.content_transfer_encoding = 'quoted-printable'
+        part.body = [normalize_new_lines(content)].pack("M*")
       end
 
       def prepare_text_footer(part, footer)
         return unless part
-        content = strip_list_footers(part.body)
+        content = strip_list_footers(part.body('utf-8'))
         content << "\n\n" unless content.end_with?("\n\n")
         content << footer
-        part.body = content
+        part.charset = 'utf-8'
+        part.content_transfer_encoding = 'quoted-printable'
+        part.body = [normalize_new_lines(content)].pack("M*")
       end
 
       def list_footer(message)

data/spec/integration/imap_email_server_spec.rb

@@ -1,50 +1,47 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 require 'mlist/email_server/imap'
 
-describe MList::EmailServer::Imap, 'settings' do
-  it 'should use the provided credentials' do
-    mock(Net::IMAP).new('host', 993, true) { mock('imap') }
-    MList::EmailServer::Imap.new(:server => 'host', :port => 993, :ssl => true)
-  end
-
-  it 'should login with the provided credentials, process the folders, close on completion' do
-    imap_server = Object.new
-    stub(Net::IMAP).new { imap_server }
-
+describe MList::EmailServer::Imap, 'execute' do
+  it 'should use the provided credentials when connecting' do
+    imap_server = 'mock_imap_server'
+    mock(Net::IMAP).new('host', 993, true) { imap_server }
     mock(imap_server).login('aahh', 'eeya')
-    mock(imap_server).close
 
     imap = MList::EmailServer::Imap.new(
+      :server => 'host', :port => 993, :ssl => true,
       :username => 'aahh', :password => 'eeya'
     )
-    mock(imap).process_folders
-    imap.execute
+    imap.connect
   end
 
-  it 'should process the provided folders' do
-    imap_server = Object.new
-    stub(Net::IMAP).new { imap_server }
-    imap = MList::EmailServer::Imap.new(
-      :source_folders => ['Inbox', 'Spam']
-    )
-    mock(imap).process_folder('Inbox')
-    mock(imap).process_folder('Spam')
-    imap.process_folders
+  it 'should connect, process the folders, disconnect on execution' do
+    imap = MList::EmailServer::Imap.new({})
+    mock(imap).connect
+    mock(imap).process_folders
+    mock(imap).disconnect
+    imap.execute
   end
 end
 
 describe MList::EmailServer::Imap, 'processing' do
   before do
     @imap_server = 'mock_imap_server'
-    stub(Net::IMAP).new { @imap_server }
     @imap = MList::EmailServer::Imap.new({:archive_folder => 'Archive'})
+    @imap.instance_variable_set('@imap', @imap_server)
+  end
+
+  it 'should process the provided folders' do
+    imap = MList::EmailServer::Imap.new(:source_folders => ['Inbox', 'Spam'])
+    mock(imap).process_folder('Inbox')
+    mock(imap).process_folder('Spam')
+    imap.process_folders
   end
 
-  it 'should examine the specified folder and process all the messages' do
+  it 'should select the folder, process each message, close the folder' do
     message_ids = [1,2]
     mock(@imap_server).select('folder')
     mock(@imap_server).search(['NOT','DELETED']) { message_ids }
-    mock(@imap_server).expunge
+    mock(@imap_server).close
     mock(@imap).process_message_id(1)
     mock(@imap).archive_message_id(1)
     mock(@imap).process_message_id(2)

data/spec/models/mail_list_spec.rb

@@ -396,7 +396,7 @@ describe MList::MailList do
     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}"
+      process_post.body.should == "My Email\n\n\n\n\n#{MList::MailList::FOOTER_BLOCK_START}\nmy footer\n#{MList::MailList::FOOTER_BLOCK_END}=\n"
     end
 
     it 'should append the list footer to multipart/alternative, text/plain part of emails' do
@@ -414,7 +414,7 @@ describe MList::MailList do
     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}"
+      process_post.body.should == "My Email\n\n#{MList::MailList::FOOTER_BLOCK_START}\nmy footer\n#{MList::MailList::FOOTER_BLOCK_END}=\n"
     end
 
     it 'should strip out any existing text footers from the list' do
@@ -433,7 +433,7 @@ describe MList::MailList do
 this is without any in front
 #{MList::MailList::FOOTER_BLOCK_END}
       }
-      process_post.body.should == "My Email\n\n#{MList::MailList::FOOTER_BLOCK_START}\nmy footer\n#{MList::MailList::FOOTER_BLOCK_END}"
+      process_post.body.should == "My Email\n\n#{MList::MailList::FOOTER_BLOCK_START}\nmy footer\n#{MList::MailList::FOOTER_BLOCK_END}=\n"
     end
 
     it 'should strip out any existing html footers from the list' do
@@ -457,6 +457,19 @@ this is without any in front
       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
 
+    it 'should properly reflect the new encoding when adding footers' do
+      @post_tmail = tmail_fixture('content_types/multipart_alternative_encoded')
+      stub(@manager_list).footer_content { 'my footer' }
+
+      part = process_post.parts[0]
+      part.charset.should == 'utf-8'
+      part.body.should == "Hi Friends and Neighbors:\n\nLike you, we have many concerns about what is going on in our country.  This\nyear in our homeschool, we've spent a lot more time learning about the\nhistory of our country, and the mindset of the founders that caused them to\nbreak away from the British empire and put together our great founding\ndocuments of the Declaration of Independence and U.S. Constitution.  How far\nwe have fallen!\n\n-- \nBob Bold\nThe Edge of Your Seat Experience Compny™\n\n\n#{MList::MailList::FOOTER_BLOCK_START}\nmy footer\n#{MList::MailList::FOOTER_BLOCK_END}"
+
+      part = process_post.parts[1]
+      part.charset.should == 'utf-8'
+      part.body.should == "<div class=\"gmail_quote\"><br><div class=\"gmail_quote\"><div><span style=\"font-family:arial, sans-serif;font-size:13px;border-collapse:collapse\"><div>\nHi Friends and Neighbors:</div><div><br></div><div>Like you, we have many concerns about what is going on in our country.  This year in our homeschool, we&#39;ve spent a lot more time learning about the history of our country, and the mindset of the founders that caused them to break away from the British empire and put together our great founding documents of the Declaration of Independence and U.S. Constitution.  How far we have fallen!</div>\n\n<div><span style=\"font-size:small\"><br></span></div></span></div></div>-- <br>Bob Bold<br>The Edge of Your Seat Experience Compny™ <br>Beaverton Heights               919-555-5555 (v)<br>1234 Checkstone St            919-555-5555 (f)<br><p>#{MList::MailList::FOOTER_BLOCK_START}<br />\nmy footer<br />\n#{MList::MailList::FOOTER_BLOCK_END}</p>"
+    end
+
     describe 'time' do
       include TMail::TextUtils
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 14
-  version: 0.1.14
+  - 16
+  version: 0.1.16
 platform: ruby
 authors: 
 - Adam Williams
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-02 00:00:00 -04:00
+date: 2010-04-13 00:00:00 -04:00
 default_executable: 
 dependencies: []