jpmobile 3.0.5 → 3.0.6

data/VERSION.yml

@@ -1,5 +1,5 @@
 ---
 :major: 3
 :minor: 0
-:patch: 5
+:patch: 6
 :build: 

data/jpmobile.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jpmobile}
-  s.version = "3.0.5"
+  s.version = "3.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Yoji Shidara", "Shin-ichiro OGAWA"]

data/lib/jpmobile/mail.rb

@@ -18,7 +18,7 @@ module Mail
 
       # change encoding
       def self.b_value_encode(str, encoding)
-        str = Jpmobile::Util.encode(str, encoding)
+        str = Jpmobile::Util.encode(str, encoding.to_s)
         [Ruby19.encode_base64(str), encoding]
       end
     end
@@ -48,9 +48,10 @@ module Mail
       if @mobile = m
         @charset = m.mail_charset(@charset)
 
-        if @body
-          @body.charset = @charset
-          @body.mobile = m
+        if self.body
+          self.body.content_type_with_jpmobile = self.content_type
+          self.body.charset = @charset
+          self.body.mobile = m
         end
       end
     end
@@ -60,7 +61,7 @@ module Mail
         header['subject'].mobile = @mobile if header['subject']
         header['from'].mobile    = @mobile if header['from']
         header['to'].mobile      = @mobile if header['to']
-        self.charset             = @mobile.mail_charset(@charset)
+        self.charset             = @mobile.mail_charset
 
         ready_to_send!
 
@@ -116,17 +117,18 @@ module Mail
       if @mobile
         @body.charset = @charset
         @body.mobile = @mobile
+        @body.content_type_with_jpmobile = self.content_type
 
         if has_content_transfer_encoding? and
-            ["base64", "quoted-printable"].include?(content_transfer_encoding) and
+            ["base64", "quoted-printable"].include?(self.content_transfer_encoding) and
             ["text"].include?(@mobile_main_type)
           @body.decode_transfer_encoding
         end
 
         if @body.multipart?
           @body.parts.each do |p|
-            p.charset = @charset
-            p.mobile = @mobile
+            p.charset = @mobile.mail_charset(p.charset)
+            p.mobile  = @mobile
           end
         end
       end
@@ -272,7 +274,16 @@ module Mail
         end
       end
 
-      if @body_part_jpmobile and @mobile
+      if @body_part_jpmobile and @mobile and !@charset.blank?
+        if ["base64", "quoted-printable"].include?(self.content_transfer_encoding) and
+            self.content_type.match(/text/)
+          @body_part_jpmobile = Jpmobile::Util.decode(@body_part_jpmobile, self.content_transfer_encoding, @charset)
+          self.content_transfer_encoding = @mobile.class::MAIL_CONTENT_TRANSFER_ENCODING
+        end
+        unless Jpmobile::Util.check_charset(@body_part_jpmobile, @charset)
+          @body_part_jpmobile = Jpmobile::Util.correct_encoding(@body_part_jpmobile)
+          @charset            = @body_part_jpmobile.encoding.to_s
+        end
         @body_part_jpmobile = @mobile.decode_transfer_encoding(@body_part_jpmobile, @charset)
       end
     end
@@ -315,7 +326,7 @@ module Mail
   end
 
   class Body
-    attr_accessor :mobile
+    attr_accessor :mobile, :content_type_with_jpmobile
 
     # convert encoding
     def encoded_with_jpmobile(transfer_encoding = '8bit')
@@ -323,10 +334,16 @@ module Mail
         if @mobile.to_mail_body_encoded?(@raw_source)
           @raw_source
         elsif Jpmobile::Util.ascii_8bit?(@raw_source)
-          enc = Mail::Encodings::get_encoding(get_best_encoding(transfer_encoding))
-          Jpmobile::Util.force_encode(enc.encode(@raw_source), nil, @charset)
+          _raw_source = if transfer_encoding == encoding
+                          @raw_source
+                        else
+                          enc = Mail::Encodings::get_encoding(get_best_encoding(transfer_encoding))
+                          enc.encode(@raw_source)
+                        end
+          Jpmobile::Util.force_encode(_raw_source, nil, @charset)
         else
-          if transfer_encoding == 'quoted-printable'
+          case transfer_encoding
+          when /quoted-printable/
             # [str].pack("M").gsub(/\n/, "\r\n")
             Jpmobile::Util.force_encode([@mobile.to_mail_body(Jpmobile::Util.force_encode(@raw_source, @charset, Jpmobile::Util::UTF8))].pack("M").gsub(/\n/, "\r\n"), Jpmobile::Util::BINARY, @charset)
             # @mobile.to_mail_body(Jpmobile::Util.force_encode(@raw_source, @charset, Jpmobile::Util::UTF8))
@@ -351,24 +368,25 @@ module Mail
     def mobile=(m)
       @mobile = m
 
+      if ["base64", "quoted-printable"].include?(self.encoding) and
+          /text/.match(self.content_type_with_jpmobile)
+        self.decode_transfer_encoding
+      end
+
       if self.multipart? and @mobile
         self.parts.each do |part|
-          part.charset      = @charset
+          part.charset      = @mobile.mail_charset(part.charset)
           part.mobile       = @mobile
-          part.body.charset = @charset
+          part.body.charset = part.charset
           part.body.mobile  = @mobile
         end
       end
     end
 
     def decode_transfer_encoding
-      _raw_source = Encodings.get_encoding(encoding).decode(@raw_source)
-      _extract_charset = Jpmobile::Util.extract_charset(_raw_source)
-      unless _extract_charset.blank? or _extract_charset == @charset
-        @charset = Jpmobile::Util.extract_charset(_raw_source)
-      end
-      _raw_source = Jpmobile::Util.set_encoding(_raw_source, @charset)
+      _raw_source = Jpmobile::Util.decode(@raw_source, self.encoding, @charset)
       @raw_source = @mobile.decode_transfer_encoding(_raw_source, @charset)
+      self.encoding = 'text'
     end
 
     def preamble_with_jpmobile
@@ -469,15 +487,15 @@ module Mail
 
     def mobile=(m)
       if @mobile = m
-        self.charset = @mobile.mail_charset(@charset)
-        self.value = @jpmobile_raw_text
+        self.charset = @mobile.mail_charset
+        self.value   = @jpmobile_raw_text
         self.parse
       end
     end
 
     def encoded_with_jpmobile
       if @mobile
-        self.charset = @mobile.mail_charset(@charset)
+        self.charset = @mobile.mail_charset
       end
 
       encoded_without_jpmobile
@@ -498,15 +516,15 @@ module Mail
 
     def mobile=(m)
       if @mobile = m
-        self.charset = @mobile.mail_charset(@charset)
-        self.value = @jpmobile_raw_text
+        self.charset = @mobile.mail_charset
+        self.value   = @jpmobile_raw_text
         self.parse
       end
     end
 
     def encoded_with_jpmobile
       if @mobile
-        self.charset = @mobile.mail_charset(@charset)
+        self.charset = @mobile.mail_charset
       end
 
       encoded_without_jpmobile

data/lib/jpmobile/mailer.rb

@@ -21,7 +21,7 @@ module Jpmobile
                     # for multi to addresses
                     Jpmobile::Mobile::AbstractMobile.new(nil, nil)
                   end
-        self.lookup_context.mobile = @mobile.variants
+        self.lookup_context.mobile = @mobile.mail_variants
 
         @mobile.decorated = headers.delete(:decorated)
 

data/lib/jpmobile/mobile/abstract_mobile.rb

@@ -101,11 +101,16 @@ module Jpmobile::Mobile
 
       @_variants || []
     end
+    def mail_variants
+      return @_mail_variants if @_mail_variants
+
+      @_mail_variants = variants == ['mobile'] ? [] : variants
+    end
 
     # メール送信用
     def to_mail_subject(str)
       Jpmobile::Util.fold_text(Jpmobile::Emoticon.unicodecr_to_utf8(str)).
-        map{|text| "=?#{mail_charset}?B?" + [to_mail_encoding(text)].pack('m').strip + "?=" }.
+        map{|text| "=?#{mail_charset}?B?" + [to_mail_encoding(text)].pack('m').gsub(/\n/, '') + "?=" }.
         join("\n\s")
     end
     def to_mail_body(str)
@@ -113,7 +118,8 @@ module Jpmobile::Mobile
     end
     def mail_charset(charset = nil)
       # (charset.nil? or charset == "") ? self.class::MAIL_CHARSET : charset
-      self.class::MAIL_CHARSET
+      # self.class::MAIL_CHARSET
+      charset.nil? || charset == '' || charset =~ /US-ASCII/i ? self.class::MAIL_CHARSET : charset
     end
     def content_transfer_encoding(headers)
       transfer_encoding = headers['Content-Transfer-Encoding']

data/lib/jpmobile/util.rb

@@ -400,5 +400,37 @@ module Jpmobile
       end
       result
     end
+
+    def decode(str, encoding, charset)
+      _str = case encoding
+             when /quoted-printable/i
+               str.unpack('M').first.strip
+             when /base64/i
+               str.unpack('m').first.strip
+             else
+               str
+             end
+
+      _extract_charset = Jpmobile::Util.extract_charset(_str)
+      charset = _extract_charset unless _extract_charset.blank? or _extract_charset == charset
+      Jpmobile::Util.set_encoding(_str, charset)
+    end
+
+    def check_charset(str, charset)
+      if Object.const_defined?(:Encoding)
+        # use NKF.guess
+        ::Encoding.compatible?(NKF.guess(str), ::Encoding.find(charset))
+      else
+        true
+      end
+    end
+
+    def correct_encoding(str)
+      if str.encoding != ::Encoding::ASCII_8BIT and NKF.guess(str) != str.encoding
+        str.force_encoding(NKF.guess(str))
+      end
+
+      str
+    end
   end
 end

data/spec/unit/email-fixtures/bounce_with_utf8_part.eml

@@ -0,0 +1,42 @@
+Return-Path: <au@ezweb.ne.jp>
+Delivered-To: ogawa@jpmobile-info.co.jp
+Subject: =?iso-2022-jp?B?RndkOiAbJEIhWhsoQk51cnNlcnlNYWlsGyRCIVtGfEZ8GyhC?=
+From: au@ezweb.ne.jp
+Content-Type: multipart/alternative;
+	boundary=Apple-Mail-453BF7C8-E087-4CEB-A163-18A4B0CBB56C
+Message-Id: <5C2DBDE0-7AE2-4BD2-B932-97B59EAFED85@ezweb.ne.jp>
+Date: Tue, 31 Jul 2012 10:44:23 +0900 (JST)
+To: test@jpmobile-info.org
+Content-Transfer-Encoding: 7bit
+MIME-Version: 1.0
+
+--Apple-Mail-453BF7C8-E087-4CEB-A163-18A4B0CBB56C
+Content-Transfer-Encoding: quoted-printable
+Content-Type: text/plain;
+	charset=iso-2022-jp
+
+
+
+iPhone=1B$B$+$iAw?.=1B(B
+
+Begin forwarded message:
+
+> =1B$B$H$j$"$($:#H#T#M#L$NK\J8$G=1B(B
+> =1B$B$"$l$P$$$$2DG=3D@-$r9MN8$7$F$O=1B(B
+> =1B$B8+$?$,$d$O$j$Y!<$9$m$/$h$s!J>P!K$G=1B(B
+> =1B$B$"$l$P$$$$$h$&$J5$$,=1B(B
+> =1B$B$7$?$N$G%@%_!<$NJ8;zNs$r=1B(B
+> =1B$B9M$($F8+$kD+!#=1B(B=
+
+--Apple-Mail-453BF7C8-E087-4CEB-A163-18A4B0CBB56C
+Content-Transfer-Encoding: base64
+Content-Type: text/html;
+	charset=utf-8
+
+44Go44KK44GC44GI44Ga77yo77y077yt77ys44Gu5pys5paH44Gn44GC44KM
+44Gw44GE44GE5Y+v6IO95oCn44KS6ICD5oWu44GX44Gm44Gv6KaL44Gf44GM
+44KE44Gv44KK44G544O844GZ44KN44GP44KI44KT77yI56yR77yJ44Gn44GC
+44KM44Gw44GE44GE44KI44GG44Gq5rCX44GM44GX44Gf44Gu44Gn44OA44Of
+44O844Gu5paH5a2X5YiX44KS6ICD44GI44Gm6KaL44KL5pyd44CC
+--Apple-Mail-453BF7C8-E087-4CEB-A163-18A4B0CBB56C--
+

data/spec/unit/email-fixtures/iphone-mail3.eml

@@ -0,0 +1,56 @@
+X-Mozilla-Status: 0011
+X-Mozilla-Status2: 00000000
+X-Mozilla-Keys:                                                                                 
+Return-Path: <au@ezweb.ne.jp>
+Delivered-To: au@ezweb.ne.jp
+References: <503ef27994050_75cf4344bfe77fe@jpmobile.jp.mail>
+In-Reply-To: <503ef27994050_75cf4344bfe77fe@jpmobile.jp.mail>
+Mime-Version: 1.0 (1.0)
+Content-Transfer-Encoding: base64
+Content-Type: text/plain;
+	charset=utf-8
+Message-Id: <6D015993-FD10-4EE9-8B60-A4588D554649@ezweb.ne.jp>
+X-Mailer: iPhone Mail (9B206)
+From: "au@ezweb.ne.jp" <au@ezweb.ne.jp>
+Subject: =?iso-2022-jp?B?UmU6IBskQiFaGyhCTktTQxskQiFbGyhCdGVzdA==?=
+Date: Thu, 30 Aug 2012 14:49:20 +0900
+To: "info@jpmobile.jp" <info@jpmobile.jp>
+
+DQoNCmlQaG9uZeOBi+OCiemAgeS/oeKXi+KXjg0KDQpPbiAyMDEyLzA4LzMw
+LCBhdCAxMzo1NiwgaW5mb0BqcG1vYmlsZS5qcCB3cm90ZToNCg0KPiDmnKzm
+lofmlLnooYzjgarjgZfvvL/vvJXvvJHvvJLmloflrZfvvL/jgYLjgYLjgYLj
+gYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLj
+gYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLj
+gYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLj
+gYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLj
+gYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLj
+gYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLj
+gYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLj
+gYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLj
+gYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLj
+gYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLj
+gYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLj
+gYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLj
+gYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLj
+gYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLj
+gYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLj
+gYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLj
+gYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLj
+gYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLj
+gYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLj
+gYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLj
+gYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLj
+gYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLj
+gYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLj
+gYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLj
+gYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLj
+gYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLj
+gYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLj
+gYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLj
+gYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLj
+gYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLj
+gYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLj
+gYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLjgYLvv73vv73ilrPi
+lrPilrPilrPilrPilrPilrPilrPilrPilrPilrPilrPilrPilrPilrPilrPi
+lrPilrPvv70NCg==
+

data/spec/unit/email-fixtures/iphone-message.eml

@@ -0,0 +1,27 @@
+X-Account-Key: account2
+X-UIDL: 1345598846.M744553P8903V000000000000FD00I00000000C0120BDF_0.jpjp.jp,S=1186.000031434a023554
+X-Mozilla-Status: 0001
+X-Mozilla-Status2: 00000000
+X-Mozilla-Keys:                                                                                 
+Return-Path: <au@ezweb.ne.jp>
+Delivered-To: ogawa@jpmobile.jp
+Received: (qmail 8893 invoked by SAV 20120821.022 by uid 0); 22 Aug 2012 10:27:26 +0900
+Received: from unknown (HELO mmsmta08.ezweb.ne.jp) (59.135.39.241)
+  by dc6.etius.jp (124.146.201.109) with ESMTPS (DHE-RSA-AES256-SHA encrypted); 22 Aug 2012 10:27:26 +0900
+Received-SPF: pass (dc6.etius.jp: SPF record at spf-nm.ezweb.ne.jp designates 59.135.39.241 as permitted sender)
+Received: from cm (pl0_4-mms [172.22.116.39])
+	by mmsmta08.ezweb.ne.jp (Sentrion-MTA-4.1.0/Switch-3.3.4) with SMTP id q7M1RQgt001822
+	for <info@jpmobile.jp>; Wed, 22 Aug 2012 10:27:26 +0900
+From:au@ezweb.ne.jp
+To:ogawa@jpmobile.jp
+Subject:=?UTF-8?B?aVBob25lIGF1IOODoeODg+OCu+ODvOOCuA==?=
+Message-ID: <212212358846052174@-212212358846052175>
+Date: Tue, 22 Aug 2012 01:27:26 +0000
+MIME-Version:1.0
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: base64
+
+JVvlnJLlhZDlkI1dJeOBriVb5L+d6K236ICF5ZCNXSUg5qeYCgrmlr3oqK3jgavpgIHkv6HjgIIK
+6YG45oqeMeOBryVb44Ki44OJ44Os44K5MV0l44G4CumBuOaKnjLjga8lW+OCouODieODrOOCuTJd
+JeOBuArov5Tkv6HjgZfjgabkuIvjgZXjgYTjgIIKCmlQaG9uZSBhdSDjg6Hjg4Pjgrvjg7zjgrg=
+

data/spec/unit/mail_spec.rb

@@ -255,6 +255,31 @@ describe "Jpmobile::Mail" do
     end
   end
 
+  describe "long subject with half-characters" do
+    before(:each) do
+      @mail         = Mail.new
+      @mail.subject = "西暦2012年09月03日は今日になるわけだが10時16分現在のこの時間ではどうかな"
+      @mail.body    = "株式会社・・"
+      @mail.from    = "info@jpmobile-rails.org"
+    end
+
+    describe "AbstractMobile" do
+      before(:each) do
+        @mobile = Jpmobile::Mobile::AbstractMobile.new(nil, nil)
+        @mail.mobile = @mobile
+        @mail.to = "むすめふさほせ <info+to@jpmobile-rails.org>"
+      end
+
+      context "to_s" do
+        it "should contain encoded subject" do
+          ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCQD5OcRsoQjIwMTIbJEJHLxsoQjA5GyRCN24bKEIwMxskQkZ8JE86IxsoQg==?=")))
+          ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCRnwkSyRKJGskbyQxJEAkLBsoQjEwGyRCO34bKEIxNhskQkosOD0bKEI=?=")))
+          ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCOl8kTiQzJE47fjRWJEckTyRJJCYkKyRKGyhC?=")))
+        end
+      end
+    end
+  end
+
   context "with attachments" do
     before(:each) do
       @mobile = Jpmobile::Mobile::AbstractMobile.new(nil, nil)
@@ -278,6 +303,14 @@ describe "Jpmobile::Mail" do
         @mail.to_s
       }.should_not raise_error
     end
+
+    it "should encodes itself successfully with an UTF-8 filename attachment" do
+      @mail.attachments.inline['日本語のファイル名です.jpg'] = @photo
+
+      lambda {
+        @mail.to_s
+      }.should_not raise_error
+    end
   end
 
   context "encoding conversion" do
@@ -317,4 +350,40 @@ describe "Jpmobile::Mail" do
       Mail::TestMailer.deliveries.size
     end
   end
+
+  context 'sending with carrier from' do
+    before do
+      @mail         = Mail.new
+      @mail.subject = "万葉"
+      @mail.to      = "ちはやふる <info@jpmobile-rails.org>"
+    end
+
+    it 'should convert content-transfer-encoding' do
+      mobile = Jpmobile::Mobile::Au.new(nil, nil)
+      @mail.content_transfer_encoding = 'base64'
+      @mail.body = ['ほげ'].pack('m')
+      @mail.charset = 'UTF-8'
+
+      @mail.mobile = mobile
+      @mail.from = '<えーゆー> au@ezweb.ne.jp'
+
+      @mail.encoded.should match(/content-transfer-encoding: 7bit/i)
+    end
+
+    it 'should not convert content-transfer-encoding with BINARY' do
+      mobile = Jpmobile::Mobile::Au.new(nil, nil)
+      data = ['ほげ'].pack('m').strip
+
+      @mail.content_transfer_encoding = 'base64'
+      @mail.content_type = 'image/jpeg'
+      @mail.body = data
+      @mail.charset = 'UTF-8'
+
+      @mail.mobile = mobile
+      @mail.from = '<えーゆー> au@ezweb.ne.jp'
+
+      @mail.encoded.should match(/content-transfer-encoding: base64/i)
+      @mail.encoded.should match(data)
+    end
+  end
 end

data/spec/unit/receive_mail_spec.rb

@@ -148,6 +148,14 @@ describe "Jpmobile::Mail#receive" do
         end
       end
     end
+
+    context 'bounced mail' do
+      it 'should parse sub-part charset correctly' do
+        @mail = Mail.new(open(File.join(File.expand_path(File.dirname(__FILE__)), "email-fixtures/bounce_with_utf8_part.eml")).read)
+        @mail.parts.first.charset.should match(/iso-2022-jp/i)
+        @mail.parts.last.charset.should  match(/utf-8/i)
+      end
+    end
   end
 
   describe "Docomo" do
@@ -234,6 +242,32 @@ describe "Jpmobile::Mail#receive" do
         @mail = Mail.new(open(File.join(File.expand_path(File.dirname(__FILE__)), "email-fixtures/au-decomail2.eml")).read)
       }.should_not raise_error
     end
+
+    context 'From au iPhone' do
+      it 'charset should be UTF-8' do
+        @mail = Mail.new(open(File.join(File.expand_path(File.dirname(__FILE__)), "email-fixtures/iphone-message.eml")).read)
+        @mail.mobile.should be_a(Jpmobile::Mobile::Au)
+        @mail.charset.should match(/utf-8/i)
+      end
+
+      it 'should be encoded correctly' do
+        @mail = Mail.new(open(File.join(File.expand_path(File.dirname(__FILE__)), "email-fixtures/iphone-message.eml")).read)
+        @mail.encoded
+      end
+    end
+
+    context 'From iPad' do
+      it 'charset should be UTF-8' do
+        @mail = Mail.new(open(File.join(File.expand_path(File.dirname(__FILE__)), "email-fixtures/iphone-mail3.eml")).read)
+        @mail.mobile.should be_a(Jpmobile::Mobile::AbstractMobile)
+        @mail.charset.should match(/utf-8/i)
+      end
+
+      it 'should be encoded correctly' do
+        @mail = Mail.new(open(File.join(File.expand_path(File.dirname(__FILE__)), "email-fixtures/iphone-mail3.eml")).read)
+        @mail.encoded
+      end
+    end
   end
 
   describe "Softbank" do
@@ -302,6 +336,18 @@ describe "Jpmobile::Mail#receive" do
     end
   end
 
+  describe 'bounced mail' do
+    context "has jp address" do
+      before(:each) do
+        @mail = Mail.new(open(File.join(File.expand_path(File.dirname(__FILE__)), "../../test/rails/overrides/spec/fixtures/mobile_mailer/bounced-jp.eml")).read)
+      end
+
+      it "mobile should abstract mobile" do
+        @mail.mobile.should be_a Jpmobile::Mobile::AbstractMobile
+      end
+    end
+  end
+
   describe "non-Japanese mail" do
     context "us-ascii" do
       before(:each) do

data/spec/unit/util_spec.rb

@@ -132,4 +132,23 @@ describe Jpmobile::Util do
       hash[0xE6FB].should == 0x1F526
     end
   end
+
+  describe 'check_charset' do
+    it 'returns true if compatible' do
+      str = 'ABC'.force_encoding('ASCII-8BIT')
+      check_charset(str, 'UTF-8').should be_true
+    end
+
+    it 'returns false if incompatible' do
+      str = '再現'.encode('ISO-2022-JP')
+      check_charset(str, 'UTF-8').should be_false
+    end
+  end
+
+  describe 'correct_encoding' do
+    it 'updates encoding correctly' do
+      str = '再現'.force_encoding('ISO-2022-JP')
+      correct_encoding(str).encoding.should == Encoding::UTF_8
+    end
+  end
 end

data/spec/unit/variants_spec.rb

@@ -0,0 +1,128 @@
+# -*- coding: utf-8 -*-
+require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+require 'mail'
+require 'jpmobile/mail'
+
+describe Jpmobile::Mobile::AbstractMobile do
+  subject{ Jpmobile::Mobile::AbstractMobile.new(nil, nil) }
+
+  describe '#variants' do
+    its(:variants){ should === ['mobile'] }
+  end
+
+  describe '#mail_variants' do
+    its(:mail_variants){ should == [] }
+  end
+end
+
+describe Jpmobile::Mobile::Docomo do
+  subject{ Jpmobile::Mobile::Docomo.new(nil, nil) }
+
+  describe '#variants' do
+    its(:variants){ should == ['mobile_docomo', 'mobile'] }
+  end
+
+  describe '#mail_variants' do
+    it 'have same value as #variants' do
+      subject.mail_variants == subject.variants
+    end
+  end
+end
+
+describe Jpmobile::Mobile::Au do
+  subject{ Jpmobile::Mobile::Au.new(nil, nil) }
+
+  describe '#variants' do
+    its(:variants){ should == ['mobile_au', 'mobile'] }
+  end
+
+  describe '#mail_variants' do
+    it 'have same value as #variants' do
+      subject.mail_variants == subject.variants
+    end
+  end
+end
+
+describe Jpmobile::Mobile::Softbank do
+  subject{ Jpmobile::Mobile::Softbank.new(nil, nil) }
+
+  describe '#variants' do
+    its(:variants){ should == ['mobile_softbank', 'mobile'] }
+  end
+
+  describe '#mail_variants' do
+    it 'have same value as #variants' do
+      subject.mail_variants == subject.variants
+    end
+  end
+end
+
+describe Jpmobile::Mobile::Android do
+  subject{ Jpmobile::Mobile::Android.new(nil, nil) }
+
+  describe '#variants' do
+    its(:variants){ should == ['smart_phone_android', 'smart_phone'] }
+  end
+
+  describe '#mail_variants' do
+    it 'have same value as #variants' do
+      subject.mail_variants == subject.variants
+    end
+  end
+end
+
+describe Jpmobile::Mobile::AndroidTablet do
+  subject{ Jpmobile::Mobile::AndroidTablet.new(nil, nil) }
+
+  describe '#variants' do
+    its(:variants){ should == ['tablet_android_tablet', 'tablet', 'smart_phone'] }
+  end
+
+  describe '#mail_variants' do
+    it 'have same value as #variants' do
+      subject.mail_variants == subject.variants
+    end
+  end
+end
+
+describe Jpmobile::Mobile::Iphone do
+  subject{ Jpmobile::Mobile::Iphone.new(nil, nil) }
+
+  describe '#variants' do
+    its(:variants) { should == ['smart_phone_iphone', 'smart_phone'] }
+  end
+
+  describe '#mail_variants' do
+    it 'have same value as #variants' do
+      subject.mail_variants == subject.variants
+    end
+  end
+end
+
+describe Jpmobile::Mobile::Ipad do
+  subject{ Jpmobile::Mobile::Ipad.new(nil, nil) }
+
+  describe '#variants' do
+    its(:variants){ should == ['tablet_ipad', 'tablet', 'smart_phone'] }
+  end
+
+  describe '#mail_variants' do
+    it 'have same value as #variants' do
+      subject.mail_variants == subject.variants
+    end
+  end
+end
+
+describe Jpmobile::Mobile::WindowsPhone do
+  subject{ Jpmobile::Mobile::WindowsPhone.new(nil, nil) }
+
+  describe '#variants' do
+    its(:variants){ should == ['smart_phone_windows_phone', 'smart_phone'] }
+  end
+
+  describe '#mail_variants' do
+    it 'have same value as #variants' do
+      subject.mail_variants == subject.variants
+    end
+  end
+end

data/test/rails/overrides/spec/fixtures/mobile_mailer/bounced-jp.eml

@@ -0,0 +1,72 @@
+Return-Path: <>
+X-Original-To: info@example.jp
+Delivered-To: info@example.jp
+Received: by localhost (Postfix)
+	id 081F8161D92; Fri, 17 Aug 2012 23:05:01 +0900 (JST)
+Date: Fri, 17 Aug 2012 23:05:01 +0900 (JST)
+From: MAILER-DAEMON@example.jp (Mail Delivery System)
+Subject: Undelivered Mail Returned to Sender
+To: info@example.jp
+Auto-Submitted: auto-replied
+MIME-Version: 1.0
+Content-Type: multipart/report; report-type=delivery-status;
+	boundary="EAE03161D91.1345212301/localhost"
+Message-Id: <20120817140501.081F8161D92@localhost>
+
+This is a MIME-encapsulated message.
+
+--EAE03161D91.1345212301/localhost
+Content-Description: Notification
+Content-Type: text/plain; charset=us-ascii
+
+This is the mail system at host localhost.
+
+I'm sorry to have to inform you that your message could not
+be delivered to one or more recipients. It's attached below.
+
+For further assistance, please send mail to postmaster.
+
+If you do so, please include this problem report. You can
+delete your own text from the attached returned message.
+
+                   The mail system
+
+<unknown@docomo.ne.jp>: host mfsmax.docomo.ne.jp[203.138.181.112] said: 550
+    Unknown user unknown@docomo.ne.jp (in reply to end of DATA command)
+
+--EAE03161D91.1345212301/localhost
+Content-Description: Delivery report
+Content-Type: message/delivery-status
+
+Reporting-MTA: dns; localhost
+X-Postfix-Queue-ID: EAE03161D91
+X-Postfix-Sender: rfc822; info@example.jp
+Arrival-Date: Fri, 17 Aug 2012 23:05:00 +0900 (JST)
+
+Final-Recipient: rfc822; unknown@docomo.ne.jp
+Action: failed
+Status: 5.0.0
+Remote-MTA: dns; mfsmax.docomo.ne.jp
+Diagnostic-Code: smtp; 550 Unknown user unknown@docomo.ne.jp
+
+--EAE03161D91.1345212301/localhost
+Content-Description: Undelivered Message
+Content-Type: message/rfc822
+
+Return-Path: <info@example.jp>
+Received: by localhost (Postfix, from userid 1004)
+	id EAE03161D91; Fri, 17 Aug 2012 23:05:00 +0900 (JST)
+Date: Fri, 17 Aug 2012 23:05:00 +0900
+From: info@example.jp
+To: unknown@docomo.ne.jp
+Message-ID: <502e4f8c8dc0a_1ed1cbf30467885@mail>
+Subject: =?Shift_JIS?B?dGVzdA==?=
+Mime-Version: 1.0
+Content-Type: text/plain;
+ charset=Shift_JIS
+Content-Transfer-Encoding: 7bit
+
+test
+
+--EAE03161D91.1345212301/localhost--
+

data/test/rails/overrides/spec/mailers/mobile_mailer_spec.rb

@@ -78,6 +78,7 @@ describe MobileMailer do
       raw_mail.should match(/iso-2022-jp/i)
       raw_mail.should match(Regexp.compile(Regexp.escape(ascii_8bit([utf8_to_jis("題名")].pack('m').strip))))
       raw_mail.should match(Regexp.compile(Regexp.escape(ascii_8bit(utf8_to_jis("本文")))))
+      raw_mail.should match(/For PC/)
     end
   end
 
@@ -663,6 +664,15 @@ describe MobileMailer, "receiving" do
         parts.first.body.should match(/テストです/)
         parts.last.body.raw_source.should match(/テストです/)
       end
+
+      context 'iPhone' do
+        it 'should parse correctly' do
+          lambda {
+            @mail = MobileMailer.receive(open(File.join(Rails.root, "../../../spec/unit/email-fixtures/iphone-message.eml")).read)
+            @mail.encoded
+          }.should_not raise_error
+        end
+      end
     end
 
     describe "softbank(sjis) の場合" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jpmobile
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-10 00:00:00.000000000 Z
+date: 2012-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
@@ -380,9 +380,12 @@ files:
 - spec/unit/email-fixtures/au-emoji.eml
 - spec/unit/email-fixtures/au-emoji2.eml
 - spec/unit/email-fixtures/au-emoji5.eml
+- spec/unit/email-fixtures/bounce_with_utf8_part.eml
 - spec/unit/email-fixtures/docomo-emoji.eml
 - spec/unit/email-fixtures/docomo-gmail-sjis.eml
 - spec/unit/email-fixtures/docomo-jis.eml
+- spec/unit/email-fixtures/iphone-mail3.eml
+- spec/unit/email-fixtures/iphone-message.eml
 - spec/unit/email-fixtures/pc-mail-multi.eml
 - spec/unit/email-fixtures/pc-mail-single.eml
 - spec/unit/email-fixtures/photo.jpg
@@ -400,6 +403,7 @@ files:
 - spec/unit/spec_helper.rb
 - spec/unit/util_spec.rb
 - spec/unit/valid_ip_spec.rb
+- spec/unit/variants_spec.rb
 - test/rails/.gitignore
 - test/rails/overrides/.rspec
 - test/rails/overrides/Gemfile
@@ -489,6 +493,7 @@ files:
 - test/rails/overrides/spec/fixtures/mobile_mailer/au-emoji.eml
 - test/rails/overrides/spec/fixtures/mobile_mailer/au-emoji2.eml
 - test/rails/overrides/spec/fixtures/mobile_mailer/au-emoji5.eml
+- test/rails/overrides/spec/fixtures/mobile_mailer/bounced-jp.eml
 - test/rails/overrides/spec/fixtures/mobile_mailer/docomo-emoji.eml
 - test/rails/overrides/spec/fixtures/mobile_mailer/docomo-gmail-sjis.eml
 - test/rails/overrides/spec/fixtures/mobile_mailer/docomo-jis.eml