bodyparts 0.1.4 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/bodyparts.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bodyparts}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Max Ogden"]
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
      "bodyparts.gemspec",
      "lib/bodyparts.rb",
      "spec/bodyparts_spec.rb",
+     "spec/email_with_attachment.eml",
      "spec/emails.yml",
      "spec/spec_helper.rb"
   ]

data/lib/bodyparts.rb

@@ -23,11 +23,10 @@ class BodyParts
   def self.extract_mail_attributes(mail_object)
     message_id = mail_object['message_id']
     x_mailer = mail_object['x-mailer']
-
-    if mail_object.multipart?
-      body = mail_object.parts.first.body.raw_source
+    if mail_object.find_first_mime_type('text/html')
+      body = mail_object.html_part.body.raw_source
     else
-      body = mail_object.body.raw_source
+      body = mail_object.text_part.body.raw_source
     end
     {:message_id => message_id, :x_mailer => x_mailer, :body => body}
   end
@@ -40,6 +39,7 @@ class BodyParts
       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

@@ -35,4 +35,10 @@ describe "BodyParts" do
     message = FakeMessage.new_mail(Mail, no_reply[:headers])
     BodyParts.find_reply_in(message.to_s)[:new_message].should == no_reply[:reply_text]
   end
+  
+  it "should correctly parse the body from messages that contain attachments" do
+    with_attachment = FakeMessage.fake_emails[:with_attachment]
+    message = FakeMessage.load_mail(with_attachment[:filename])
+    BodyParts.find_reply_in(message)[:new_message].should == with_attachment[:reply_text]
+  end
 end

data/spec/email_with_attachment.eml

@@ -0,0 +1,34 @@
+MIME-Version: 1.0
+Received: by 10.100.134.4 with HTTP; Fri, 11 Jun 2010 13:57:35 -0700 (PDT)
+Date: Fri, 11 Jun 2010 13:57:35 -0700
+Delivered-To: support_development@revelationglobal.com
+Message-ID: <AANLkTinQeQ6gTJa4myYGttnWMHiZUuMVGReSDFgieKFd@mail.gmail.com>
+Subject: test
+From: Support Development <support_development@revelationglobal.com>
+To: Support Development <support_development@revelationglobal.com>
+Content-Type: multipart/mixed; boundary=0016e640d06a7d23c60488c7635f
+
+--0016e640d06a7d23c60488c7635f
+Content-Type: multipart/alternative; boundary=0016e640d06a7d23c00488c7635d
+
+--0016e640d06a7d23c00488c7635d
+Content-Type: text/plain; charset=ISO-8859-1
+
+HELLO
+
+--0016e640d06a7d23c00488c7635d
+Content-Type: text/html; charset=ISO-8859-1
+
+HELLO
+
+--0016e640d06a7d23c00488c7635d--
+--0016e640d06a7d23c60488c7635f
+Content-Type: image/png; name="Screen shot 2010-05-13 at 11.49.10 AM.png"
+Content-Disposition: attachment; 
+	filename="Screen shot 2010-05-13 at 11.49.10 AM.png"
+Content-Transfer-Encoding: base64
+X-Attachment-Id: f_gabi0qqa0
+
+iVBORw0KGgoAAAANSUhEUgAAAwQAAAE9CAIAAAA6czL5AAAWZGlDQ1BJQ0MgUHJvZmlsZQAAeAHV
+aMqRrNYEzQAAAABJRU5ErkJggg==
+--0016e640d06a7d23c60488c7635f--

data/spec/emails.yml

@@ -134,4 +134,9 @@
     hay guys
   :headers:
     body:
-      hay guys
+      hay guys
+:with_attachment:
+  :filename:
+    "email_with_attachment"
+  :reply_text:
+    HELLO

data/spec/spec_helper.rb

@@ -15,6 +15,10 @@ class FakeMessage
       "date" => "Wed, 23 Sep 2009 09:11:23 -0700"
     }
   end
+  
+  def self.load_mail(name)
+    Mail::Message.new(File.read(File.expand_path(File.dirname(__FILE__) + "/#{name}.eml")))
+  end
 
   def self.new_mail(mail_class, custom_headers={})
     headers = default_mail_headers.merge(custom_headers)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Max Ogden
@@ -74,6 +74,7 @@ files:
 - bodyparts.gemspec
 - lib/bodyparts.rb
 - spec/bodyparts_spec.rb
+- spec/email_with_attachment.eml
 - spec/emails.yml
 - spec/spec_helper.rb
 has_rdoc: true