bodyparts 0.1.8 → 0.1.9

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.1.9

data/bodyparts.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bodyparts}
-  s.version = "0.1.8"
+  s.version = "0.1.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Max Ogden"]
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
      "spec/bodyparts_spec.rb",
      "spec/email_with_attachment.eml",
      "spec/emails.yml",
+     "spec/quoted_printable.eml",
      "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/maxogden/bodyparts}

data/lib/bodyparts.rb

@@ -26,19 +26,19 @@ class BodyParts
   end
   
   def self.extract_mail_attributes(mail_object)
-    if mail_encoding = mail_object['content_transfer_encoding']
-      content_encoding = mail_encoding.encoding
+    if mail_object.find_first_mime_type('text/plain')
+      part = mail_object.text_part
     else
-      content_encoding = "not known"
+      part = mail_object
     end
     
-    if mail_object.find_first_mime_type('text/plain')
-      body = mail_object.text_part.body.raw_source
+    if mail_encoding = part['content_transfer_encoding'] || mail_encoding = mail_object['content_transfer_encoding']
+      content_encoding = mail_encoding.encoding
     else
-      body = mail_object.body.raw_source
+      content_encoding = "not known"
     end
 
-    {:content_encoding => content_encoding, :body => body}
+    {:content_encoding => content_encoding, :body => part.body.raw_source}
   end
   
   def self.find_reply_in(email)

data/spec/bodyparts_spec.rb

@@ -1,6 +1,7 @@
 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]
@@ -35,7 +36,7 @@ describe "BodyParts" do
     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
+  it "should parse quoted printable messages" 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]
@@ -44,12 +45,18 @@ describe "BodyParts" do
   describe "encodings" do  
     [TMail::Mail, Mail].each do |mail_type|
       ["base64", "Quoted-printable"].each do |encoding|
-        it "should correctly parse #{encoding} encoded #{mail_type} messages" do
+        it "should correctly parse #{mail_type} objects where the entire message is encoded as #{encoding}" do
           encoded_message = FakeMessage.fake_emails[encoding.to_sym]
           message = FakeMessage.new_mail(mail_type, encoded_message[:headers])
           BodyParts.find_reply_in(message)[:new_message].strip.should == encoded_message[:reply_text]
         end
+
+        it "should correctly parse #{mail_type} objects where only the individual parts are encoded as #{encoding}"do
+          quoted_printable = FakeMessage.fake_emails[:individual_parts_quoted_printable]
+          message = FakeMessage.load_mail(quoted_printable[:filename])
+          BodyParts.find_reply_in(message)[:new_message].should == quoted_printable[:reply_text].gsub("\n", "\r\n").strip
+        end
       end
-    end      
+    end
   end
 end

data/spec/emails.yml

@@ -156,4 +156,13 @@
       Quoted-printable
     body: |
       To make your upload take a significantly less amount of time, you can use W=
-      indows Movie Maker to shrink your video before uploading it.=20
+      indows Movie Maker to shrink your video before uploading it.=20
+:individual_parts_quoted_printable:
+  :filename:
+    "quoted_printable"
+  :reply_text: |
+    thou need to doeth passage to instain thy mother. thou need to doeth passage
+    to instain thy mother. thou need to doeth passage to instain thy
+    mother. thou need to doeth passage to instain thy mother. thou need to doeth
+    passage to instain thy mother. thou need to doeth passage to instain thy
+    mother.

data/spec/quoted_printable.eml

@@ -0,0 +1,40 @@
+                                                                                                                                                                                                                                                               
+MIME-Version: 1.0
+Received: by 10.150.12.18 with HTTP; Mon, 21 Jun 2010 16:04:47 -0700 (PDT)
+In-Reply-To: <AANLkTimRQQOmvw4Y_C2pH5Nc9j8YuBnR0hjhabex1PMD@mail.gmail.com>
+References: <AANLkTimRQQOmvw4Y_C2pH5Nc9j8YuBnR0hjhabex1PMD@mail.gmail.com>
+Date: Mon, 21 Jun 2010 16:04:47 -0700
+Delivered-To: max@revelationglobal.com
+Message-ID: <AANLkTikEayrsOYxKILM2gB9ToaemBlbtENxw9s8m_f7J@mail.gmail.com>
+Subject: Re: testing
+From: max <max@revelationglobal.com>
+To: Max Ogden <max@revelationglobal.com>
+Content-Type: multipart/alternative; boundary=000e0cd47c22cfc52104899254f5
+
+--000e0cd47c22cfc52104899254f5
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: quoted-printable
+
+thou need to doeth passage to instain thy mother. thou need to doeth pass=
+age
+to instain thy mother. thou need to doeth passage to instain thy
+mother. thou need to doeth passage to instain thy mother. thou need to do=
+eth
+passage to instain thy mother. thou need to doeth passage to instain thy
+mother.=
+
+
+--000e0cd47c22cfc52104899254f5
+Content-Type: text/html; charset=ISO-8859-1
+Content-Transfer-Encoding: quoted-printable
+
+thou need to doeth passage to instain thy mother. thou need to doeth pass=
+age
+to instain thy mother. thou need to doeth passage to instain thy
+mother. thou need to doeth passage to instain thy mother. thou need to do=
+eth
+passage to instain thy mother. thou need to doeth passage to instain thy
+mother.=
+
+
+--000e0cd47c22cfc52104899254f5--

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - Max Ogden
@@ -76,6 +76,7 @@ files:
 - spec/bodyparts_spec.rb
 - spec/email_with_attachment.eml
 - spec/emails.yml
+- spec/quoted_printable.eml
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/maxogden/bodyparts