bodyparts 0.1.6 → 0.1.7

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/bodyparts.gemspec

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

data/lib/bodyparts.rb

@@ -10,37 +10,54 @@ class BodyParts
   end
   
   def self.extract_tmail_attributes(tmail_object)
-    message_id = tmail_object.message_id
-    x_mailer = tmail_object['x-mailer'].to_s
+    if mail_encoding = tmail_object['content_transfer_encoding']
+      content_encoding = mail_encoding.to_s
+    else
+      content_encoding = "not known"
+    end
+    
     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}
+    
+    {:content_encoding => content_encoding, :body => body}
   end
   
   def self.extract_mail_attributes(mail_object)
-    message_id = mail_object['message_id']
-    x_mailer = mail_object['x-mailer']
+    if mail_encoding = mail_object['content_transfer_encoding']
+      content_encoding = mail_encoding.encoding
+    else
+      content_encoding = "not known"
+    end
+    
     if mail_object.find_first_mime_type('text/plain')
       body = mail_object.text_part.body.raw_source
     else
       body = mail_object.body.raw_source
     end
-    {:message_id => message_id, :x_mailer => x_mailer, :body => body}
+
+    {:content_encoding => content_encoding, :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]
+    
+    if mail_attributes[:content_encoding] == 'base64'
+      body = Base64.decode64 body
+    end
 
     matches = rules.map {|rule| body.match(rule[:reply_delimiter])}.compact!
+    
     unless matches.empty?
       match = matches.sort_by {|m| m.begin(0)}.first
       new_message = body[0, match.begin(0)]

data/spec/bodyparts_spec.rb

@@ -1,7 +1,6 @@
 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]
@@ -9,7 +8,7 @@ describe "BodyParts" do
       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]
@@ -41,4 +40,12 @@ describe "BodyParts" do
     message = FakeMessage.load_mail(with_attachment[:filename])
     BodyParts.find_reply_in(message)[:new_message].should == with_attachment[:reply_text]
   end
+  
+  [TMail::Mail, Mail].each do |mail_type|
+    it "should correctly parse base64 encoded #{mail_type} messages" do
+      base64_encoded = FakeMessage.fake_emails[:base64_encoded]
+      message = FakeMessage.new_mail(mail_type, base64_encoded[:headers])
+      BodyParts.find_reply_in(message)[:new_message].should == base64_encoded[:reply_text]
+    end
+  end
 end

data/spec/emails.yml

@@ -139,4 +139,12 @@
   :filename:
     "email_with_attachment"
   :reply_text:
-    HELLO
+    HELLO
+:base64_encoded:
+  :reply_text:
+    INSTAIN REPLY. DO WAY
+  :headers:
+    content_transfer_encoding:
+      base64
+    body:
+      SU5TVEFJTiBSRVBMWS4gRE8gV0FZ\n

data/spec/spec_helper.rb

@@ -1,7 +1,6 @@
 require 'spec'
 require File.expand_path(File.dirname(__FILE__) + '/../lib/bodyparts.rb')
 
-
 class FakeMessage
   def self.fake_emails
     YAML.load_file(File.expand_path(File.dirname(__FILE__) + '/emails.yml'))
@@ -26,7 +25,7 @@ class FakeMessage
     mail = mail_class.new do
       if mail_class == Mail
         text_part do
-          body headers.delete("body")
+          body headers.delete "body"
         end
       end
     end

metadata

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