tmail 1.2.6 → 1.2.7

data/lib/tmail/attachments.rb

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

data/lib/tmail/quoting.rb

@@ -60,8 +60,17 @@ module TMail
     
     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
 

data/lib/tmail/version.rb

@@ -32,7 +32,7 @@ module TMail
   module VERSION
     MAJOR = 1
     MINOR = 2
-    TINY  = 6
+    TINY  = 7
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/test_attachments.rb

@@ -44,7 +44,9 @@ HERE
     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

data/tmail.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tmail}
-  s.version = "1.2.6"
+  s.version = "1.2.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mikel Lindsaar <raasdnil AT gmail.com>"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tmail
 version: !ruby/object:Gem::Version 
-  version: 1.2.6
+  version: 1.2.7
 platform: ruby
 authors: 
 - Mikel Lindsaar <raasdnil AT gmail.com>