Fixed failing encoding / decoding test - reverted commit f721e24

Author: mikel

lib/tmail/attachments.rb

@@ -41,7 +41,7 @@ def attachments
     end
 
     private
-    
+    require 'ruby-debug'
     def attachment(part)
       if part.multipart?
         part.attachments

lib/tmail/quoting.rb

@@ -60,8 +60,17 @@ class Attachment
 
     include TextUtils
 
+    def quoted?(string)
+      !!((string =~ /.+'\w\w'.+/) || (string =~ /=\?.+\?.\?.+\?=/))
+    end
+    
+    # Only unquote if quoted
     def original_filename(to_charset = 'utf-8')
-      Unquoter.unquote_and_convert_to(quoted_filename, to_charset).chomp
+      if quoted?(quoted_filename)
+        Unquoter.unquote_and_convert_to(quoted_filename, to_charset).chomp
+      else
+        quoted_filename
+      end
     end
   end
 

test/fixtures/raw_email_with_wrong_splitted_multibyte_encoded_word_subject

@@ -0,0 +1,15 @@
+Return-path: <[email protected]>
+Envelope-to: [email protected]
+Delivery-date: Mon, 09 Mar 2009 13:18:38 +0100
+Message-Id: <[email protected]>
+From: Stefan Haubold <[email protected]>
+To: Stefan Haubold <[email protected]>
+Content-Type: text/plain; charset=US-ASCII; format=flowed
+Content-Transfer-Encoding: 7bit
+Mime-Version: 1.0 (Apple Message framework v930.3)
+Subject: =?UTF-8?Q?Stefan_Haubold_hat_dich_als_FreundIn_auf_Facebook_hinzugef=C3?= 
+    =?UTF-8?Q?=BCgt_...?=
+Date: Mon, 9 Mar 2009 13:18:26 +0100
+X-Mailer: Apple Mail (2.930.3)
+ 
+test

test/test_attachments.rb

@@ -44,7 +44,9 @@ def test_decode_encoded_attachment_filename
     fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email8")
     mail = TMail::Mail.parse(fixture)
     attachment = mail.attachments.last
-    assert_equal "01 Quien Te Dij\302\212at. Pitbull.mp3", attachment.original_filename unless RUBY_VERSION.match(/1.9/)
+    expected = "01 Quien Te Dij\212at. Pitbull.mp3"
+    expected.force_encoding(Encoding::ASCII_8BIT) if expected.respond_to?(:force_encoding)
+    assert_equal expected, attachment.original_filename
   end
 
   def test_attachment_with_quoted_filename

tmail.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mikel Lindsaar <raasdnil AT gmail.com>"]
-  s.date = %q{2009-05-17}
+  s.date = %q{2010-01-06}
   s.description = %q{TMail is a Ruby-based mail handler. It allows you to compose stadards compliant emails in a very Ruby-way.}
   s.email = %q{raasdnil AT gmail.com}
   s.extensions = ["ext/tmailscanner/tmail/extconf.rb"]