bodyparts 0.1.1 → 0.1.2

data/README.rdoc

@@ -4,7 +4,7 @@ Separates new messages from included reply chains in the body of forwarded email
 
 == Usage
 
-BodyParts.find_reply_in( valid raw_email_source or Mail object)
+BodyParts.find_reply_in( valid raw email string, TMail or Mail object)
 
 == Copyright
 

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/bodyparts.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bodyparts}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Max Ogden"]
-  s.date = %q{2010-06-08}
+  s.date = %q{2010-06-10}
   s.description = %q{Separates new messages from included reply chains in the body of forwarded emails}
   s.email = %q{max@maxogden.com}
   s.extra_rdoc_files = [

data/lib/bodyparts.rb

@@ -1,32 +1,45 @@
 require 'mail'
+require 'tmail'
 
 class BodyParts
-  def self.find_reply_in(email)
-    email = Mail::Message.new(email) unless email.class == Mail::Message
-    message_id = email.message_id
-    x_mailer = email['x-mailer']
-
-    rules = [
-      { :server => 'Gmail',
-        :reply_delimiter => /^On.*?wrote:.$/m
-      },
-      { :server => 'Yahoo! Mail',
-        :reply_delimiter => /^_+\r\nFrom:/
-      },
-      { :server => 'Microsoft Live Mail/Hotmail',
-        :reply_delimiter =>  /\r\n\r\n(Date|Subject):/
-      },
-      { :server => 'Outlook Express/AOL Webmail',
-        :reply_delimiter =>  /^-+.*Original Message.*-+/
-      }
-    ]
+  def self.rules
+     [{ :server => 'Gmail', :reply_delimiter => /^On.*?wrote:.$/m },
+      { :server => 'Yahoo! Mail', :reply_delimiter => /^_+\r\nFrom:/ },
+      { :server => 'Microsoft Live Mail/Hotmail', :reply_delimiter =>  /\r\n\r\n(Date|Subject):/ },
+      { :server => 'Outlook Express/AOL Webmail', :reply_delimiter =>  /^-+.*Original Message.*-+/ }]
+  end
+  
+  def self.extract_tmail_attributes(tmail_object)
+    message_id = tmail_object.message_id
+    x_mailer = tmail_object['x-mailer'].to_s
+    body = if tmail_object.multipart?
+      tmail_object.parts.first.body
+    else
+      tmail_object.body
+    end
+    {:message_id => message_id, :x_mailer => x_mailer, :body => body}
+  end
+  
+  def self.extract_mail_attributes(mail_object)
+    message_id = mail_object['message_id']
+    x_mailer = mail_object['x-mailer']
 
-    if email.multipart?
-      body = email.parts.first.body.raw_source
+    if mail_object.multipart?
+      body = mail_object.parts.first.body.raw_source
     else
-      body = email.body.raw_source
+      body = mail_object.body.raw_source
+    end
+    {:message_id => message_id, :x_mailer => x_mailer, :body => body}
+  end
+  
+  def self.find_reply_in(email)
+    email = Mail::Message.new(email) if email.is_a? String
+    mail_attributes = case email.class.to_s
+      when "TMail::Mail" then extract_tmail_attributes(email)
+      when "Mail::Message" then extract_mail_attributes(email)
+      else raise "You must pass in either a TMail or Mail object or raw email source text"
     end
-    
+    body = mail_attributes[:body]
     matches = rules.map {|rule| body.match(rule[:reply_delimiter])}.compact!
     unless matches.empty?
       match = matches.sort_by {|m| m.begin(0)}.first

data/spec/bodyparts_spec.rb

@@ -1,23 +1,32 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "BodyParts" do
+  
+  [TMail::Mail, Mail].each do |mail_object|
+    it "should accept and parse #{mail_object} objects as input" do
+      generic = FakeMessage.fake_emails[:generic]
+      message = FakeMessage.new_mail(mail_object, generic[:headers])
+      BodyParts.find_reply_in(message)[:new_message].should == generic[:reply_text]
+    end
+  end
+
   %w(gmail yahoo hotmail aol_webmail generic).each do |mail_server|
     it "should strip out the replies from a #{mail_server} message containing forwarded junk" do
       mail_server = FakeMessage.fake_emails[mail_server.to_sym]
-      message = FakeMessage.new_mail(mail_server[:headers])
+      message = FakeMessage.new_mail(Mail, mail_server[:headers])
       BodyParts.find_reply_in(message.to_s)[:new_message].should == mail_server[:reply_text]
     end
   end
   
   it "should always use the first reply delimiter in a message containing multiple replies" do
     multiple_replies = FakeMessage.fake_emails[:multiple_replies]
-    message = FakeMessage.new_mail(multiple_replies[:headers])
+    message = FakeMessage.new_mail(Mail, multiple_replies[:headers])
     BodyParts.find_reply_in(message.to_s)[:new_message].should == multiple_replies[:reply_text]
   end
   
   it "should return the rest of the thread" do
     generic = FakeMessage.fake_emails[:generic]
-    message = FakeMessage.new_mail(generic[:headers])
+    message = FakeMessage.new_mail(Mail, generic[:headers])
     BodyParts.find_reply_in(message.to_s).should == {:new_message => generic[:reply_text], :rest_of_thread => generic[:rest_of_thread].gsub("\n", "\r\n").strip}
   end
 end

data/spec/spec_helper.rb

@@ -16,13 +16,24 @@ class FakeMessage
     }
   end
 
-  def self.new_mail(custom_headers={})
+  def self.new_mail(mail_class, custom_headers={})
     headers = default_mail_headers.merge(custom_headers)
-    mail = Mail.new do
-      text_part do
-        body headers.delete("body")
+    
+    mail = mail_class.new do
+      if mail_class == Mail
+        text_part do
+          body headers.delete("body")
+        end
       end
     end
+    
+    if mail_class == TMail::Mail
+      %w(body from to).each do |attr|
+        mail.send "#{attr}=", headers[attr]
+        headers.delete attr
+      end
+    end
+    
     headers.each {|header, content| mail[header] = content }
     mail
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Max Ogden
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-08 00:00:00 -07:00
+date: 2010-06-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency