jpmobile 2.0.2 → 2.0.3

data/README.rdoc

@@ -271,7 +271,10 @@ trans_sid を使用する際には、例えば config/initializers/session_store
 * au は ISO-2022-JP エンコードで送信
 * ビューやレイアウトの自動振り分け
   * docomo であれば app/views/mobile_mailer/registration_mobile_docomo.html.erb など
-* 受信に関しては、docomo/SoftBank でテストできないため、実験版とします。
+* 受信に関しては、docomo/SoftBank でテストできていないため、実験版とします。
+  * テストして問題あれば随時報告してください。
+* オプションに :decorated => true を追加すると、各キャリアのデコメに適したフォーマットで送信します。
+  * ただし docomo/SoftBank でテスト出来ていないため、実験版とします。
 
 == テストに必要なgemパッケージ
 テストを実行するためには以下のgemパッケージが必要です。

data/VERSION.yml

@@ -1,5 +1,5 @@
 ---
 :major: 2
 :minor: 0
-:patch: 2
+:patch: 3
 :build: !!null 

data/lib/jpmobile/emoticon.rb

@@ -203,5 +203,56 @@ module Jpmobile
         end
       end
     end
+
+    @@pc_emoticon_image_path = nil
+    @@pc_emoticon_yaml       = nil
+    @@pc_emoticon_hash       = nil
+
+    def self.pc_emoticon_image_path
+      @@pc_emoticon_image_path
+    end
+    def self.pc_emoticon_image_path=(path)
+      @@pc_emoticon_image_path=(path)
+    end
+
+    def self.pc_emoticon_yaml=(file)
+      @@pc_emoticon_yaml = file
+    end
+    def self.pc_emoticon_yaml
+      @@pc_emoticon_yaml
+    end
+
+    def self.pc_emoticon?
+      if @@pc_emoticon_yaml and File.exist?(@@pc_emoticon_yaml) and @@pc_emoticon_image_path
+
+        unless @@pc_emoticon_hash
+          begin
+            yaml_hash = YAML.load_file(@@pc_emoticon_yaml)
+            @@pc_emoticon_hash = Hash[*(yaml_hash.values.inject([]){ |r, v| r += v.to_a.flatten; r})]
+            @@pc_emoticon_image_path.chop if @@pc_emoticon_image_path.match(/\/$/)
+
+            return true
+          rescue => ex
+          end
+        else
+          return true
+        end
+      end
+
+      return false
+    end
+
+    def self.emoticons_to_image(str)
+      if @@pc_emoticon_hash
+        utf8_to_unicodecr(str).gsub(/&#x([0-9a-f]{4});/i) do |match|
+          img = @@pc_emoticon_hash[$1.upcase] || (@@pc_emoticon_hash[("%x" % ($1.scanf("%x").first - 0x1000)).upcase] rescue nil)
+          if img
+            "<img src=\"#{@@pc_emoticon_image_path}/#{img}.gif\" alt=\"#{img}\" />"
+          else
+            ""
+          end
+        end
+      end
+    end
   end
 end

data/lib/jpmobile/mail.rb

@@ -66,7 +66,8 @@ module Mail
 
         self.body.charset = @charset
         self.body.mobile  = @mobile
-        self.header['Content-Transfer-Encoding'] = '8bit'
+        self.header['Content-Transfer-Encoding'] = @mobile.content_transfer_encoding(self.header)
+        self.header['Content-ID'] = nil if @mobile.decorated? and !self.content_type.match(/image\//)
 
         buffer = header.encoded
         buffer << "\r\n"
@@ -137,6 +138,93 @@ module Mail
     alias_method :body_lazy_without_jpmobile, :body_lazy
     alias_method :body_lazy, :body_lazy_with_jpmobile
 
+# -- docomo
+# multipart/mixed
+#   |- multipart/related
+#   |    |- multipart/alternative
+#   |    |    |- text/plain
+#   |    |    |- text/html
+#   |    |- image/xxxx (インライン画像)
+#   |- image/xxxx (添付画像)
+
+# -- au
+# multipart/mixed
+#   |- multipart/alternative
+#   |    |- text/plain
+#   |    |- text/html
+#   |- image/xxxx (インライン画像)
+#   |- image/xxxx (添付画像)
+
+# -- normal
+# multipart/mixed
+#   |- multipart/alternative
+#   |    |- text/plain
+#   |    |- text/html
+#   |    |- image/xxxx (インライン画像)
+#   |- image/xxxx (添付画像)
+
+    def rearrange!
+      if @mobile and @mobile.decoratable?
+        @mobile.decorated = true
+        text_body_part = find_part_by_content_type("text/plain").first
+        html_body_part = find_part_by_content_type("text/html").first
+        html_body_part.transport_encoding = 'quoted-printable' if html_body_part
+        inline_images  = []
+        attached_files = []
+        attachments.each do |p|
+          if p.content_type.match(/^image\//)  and p.content_disposition.match(/^inline/)
+            p.header['Content-Disposition'] = nil
+            inline_images << p
+          elsif p.content_disposition
+            attached_files << p
+          end
+        end
+
+        alternative_part = Mail::Part.new{content_type 'multipart/alternative'}
+        alternative_part.add_part(text_body_part) if text_body_part
+        alternative_part.add_part(html_body_part) if html_body_part
+
+        if @mobile.require_related_part?
+          related_part = Mail::Part.new{content_type 'multipart/related'}
+          related_part.add_part(alternative_part)
+          inline_images.each do |inline_image|
+            related_part.add_part(inline_image)
+          end
+          inline_images.clear
+        else
+          related_part = alternative_part
+        end
+
+        unless self.header['Content-Type'].sub_type == 'mixed'
+          self.header['Content-Type'] = self.content_type.gsub(/#{self.header['Content-Type'].sub_type}/, 'mixed')
+        end
+        self.parts.clear
+        self.body = nil
+
+        self.add_part(related_part)
+        inline_images.each do |inline_image|
+          self.add_part(inline_image)
+        end
+        attached_files.each do |attached_file|
+          self.add_part(attached_file)
+        end
+      end
+    end
+
+    def find_part_by_content_type(content_type)
+      finded_parts = []
+
+      self.parts.each do |part|
+        if part.multipart?
+          finded_parts << part.find_part_by_content_type(content_type)
+        elsif part.content_type.match(/^#{content_type}/)
+          finded_parts << part
+        end
+      end
+
+      finded_parts.flatten
+    end
+
     private
     def convert_encoding_jpmobile
       # decide mobile carrier
@@ -219,8 +307,17 @@ module Mail
       if @mobile and !multipart?
         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)
         else
-          @mobile.to_mail_body(Jpmobile::Util.force_encode(@raw_source, @charset, Jpmobile::Util::UTF8))
+          if transfer_encoding == '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))
+          else
+            @mobile.to_mail_body(Jpmobile::Util.force_encode(@raw_source, @charset, Jpmobile::Util::UTF8))
+          end
         end
       else
         encoded_without_jpmobile(transfer_encoding)
@@ -278,7 +375,7 @@ module Mail
       if @mobile
         Jpmobile::Util.encode(crlf_boundary_without_jpmobile, @charset)
       else
-        epilogue_without_jpmobile
+        crlf_boundary_without_jpmobile
       end
     end
 
@@ -286,7 +383,7 @@ module Mail
       if @mobile
         Jpmobile::Util.encode(end_boundary_without_jpmobile, @charset)
       else
-        epilogue_without_jpmobile
+        end_boundary_without_jpmobile
       end
     end
 

data/lib/jpmobile/mailer.rb

@@ -23,11 +23,16 @@ module Jpmobile
                   end
         self.lookup_context.mobile = @mobile.variants
 
+        @mobile.decorated = headers.delete(:decorated)
+
         m = super(headers, &block)
 
         m.mobile  = @mobile
         m.charset = @mobile.mail_charset
 
+        # for decorated-mail manipulation
+        m.rearrange! if @mobile.decorated?
+
         m
       end
 

data/lib/jpmobile/mobile/abstract_mobile.rb

@@ -16,6 +16,8 @@ module Jpmobile::Mobile
     USER_AGENT_REGEXP = nil
     # 対応するメールアドレスの正規表現
     MAIL_ADDRESS_REGEXP = nil
+    # テキスト部分の content-transfer-encoding
+    MAIL_CONTENT_TRANSFER_ENCODING = '7bit'
 
     # 緯度経度があれば Position のインスタンスを返す。
     def position; return nil; end
@@ -115,6 +117,21 @@ module Jpmobile::Mobile
       # (charset.nil? or charset == "") ? self.class::MAIL_CHARSET : charset
       self.class::MAIL_CHARSET
     end
+    def content_transfer_encoding(headers)
+      transfer_encoding = headers['Content-Transfer-Encoding']
+      case headers['Content-Type'].to_s
+      when /text\/plain/
+        transfer_encoding.to_s == MAIL_CONTENT_TRANSFER_ENCODING ? transfer_encoding : MAIL_CONTENT_TRANSFER_ENCODING
+      when /text\/html/
+        if self.decorated?
+          'quoted-printable'
+        else
+          transfer_encoding.to_s == MAIL_CONTENT_TRANSFER_ENCODING ? transfer_encoding : MAIL_CONTENT_TRANSFER_ENCODING
+        end
+      else
+        transfer_encoding
+      end
+    end
     def to_mail_encoding(str)
       str = Jpmobile::Emoticon.utf8_to_unicodecr(str)
       str = Jpmobile::Emoticon.unicodecr_to_external(str, Jpmobile::Emoticon::CONVERSION_TABLE_TO_PC_EMAIL, false)
@@ -144,6 +161,18 @@ module Jpmobile::Mobile
       body = to_mail_internal(body, nil)
       Jpmobile::Util.force_encode(body, charset, Jpmobile::Util::UTF8)
     end
+    def decoratable?
+      false
+    end
+    def require_related_part?
+      false
+    end
+    def decorated=(boolean)
+      @decorated = boolean
+    end
+    def decorated?
+      @decorated
+    end
 
     # リクエストがこのクラスに属するか調べる
     # メソッド名に関して非常に不安

data/lib/jpmobile/mobile/au.rb

@@ -118,6 +118,10 @@ module Jpmobile::Mobile
       str
     end
 
+    def decoratable?
+      true
+    end
+
     private
     def to_mail_encoding(str)
       str = Jpmobile::Emoticon.utf8_to_unicodecr(str)

data/lib/jpmobile/mobile/docomo.rb

@@ -10,6 +10,8 @@ module Jpmobile::Mobile
     MAIL_ADDRESS_REGEXP = /.+@docomo\.ne\.jp/
     # メールのデフォルトのcharset
     MAIL_CHARSET = "Shift_JIS"
+    # テキスト部分の content-transfer-encoding
+    MAIL_CONTENT_TRANSFER_ENCODING = '8bit'
 
     # オープンiエリアがあればエリアコードを +String+ で返す。無ければ +nil+ を返す。
     def areacode
@@ -114,6 +116,12 @@ module Jpmobile::Mobile
     def to_mail_body_encoded?(str)
       Jpmobile::Util.shift_jis?(str)
     end
+    def decoratable?
+      true
+    end
+    def require_related_part?
+      true
+    end
 
     # i-mode ブラウザのバージョンを返す。
     # http://labs.unoh.net/2009/07/i_20.html

data/lib/jpmobile/mobile/softbank.rb

@@ -11,6 +11,8 @@ module Jpmobile::Mobile
     MAIL_ADDRESS_REGEXP = /.+@(?:softbank\.ne\.jp|disney\.ne\.jp)/
     # メールのデフォルトのcharset
     MAIL_CHARSET = "Shift_JIS"
+    # テキスト部分の content-transfer-encoding
+    MAIL_CONTENT_TRANSFER_ENCODING = '8bit'
 
     # 製造番号を返す。無ければ +nil+ を返す。
     def serial_number
@@ -80,6 +82,12 @@ module Jpmobile::Mobile
     def to_mail_body_encoded?(str)
       Jpmobile::Util.shift_jis?(str)
     end
+    def decoratable?
+      true
+    end
+    def require_related_part?
+      true
+    end
 
     private
     def to_mail_encoding(str)

data/lib/jpmobile/rack/filter.rb

@@ -27,17 +27,10 @@ module Jpmobile
           if type and charset
             env['Content-Type'] = "#{type}; charset=#{charset}"
           end
-        elsif pc_emoticon?
+        elsif Jpmobile::Emoticon.pc_emoticon?
           body = response_to_body(response)
 
-          response = body.gsub(/&#x([0-9a-f]{4});/i) do |match|
-            img = @pc_emoticon_hash[$1.upcase] || (@pc_emoticon_hash[("%x" % ($1.scanf("%x").first - 0x1000)).upcase] rescue nil)
-            if img
-              "<img src=\"#{@@pc_emoticon_image_path}/#{img}.gif\" alt=\"#{img}\" />"
-            else
-              ""
-            end
-          end
+          response = Jpmobile::Emoticon.emoticons_to_image(body)
         end
 
         new_response = ::Rack::Response.new(response, status, env)
@@ -45,25 +38,6 @@ module Jpmobile
       end
 
       private
-      def pc_emoticon?
-        if @@pc_emoticon_yaml and File.exist?(@@pc_emoticon_yaml) and
-            @@pc_emoticon_image_path and FileTest.directory?(@@pc_emoticon_image_path)
-
-          unless @pc_emoticon_hash
-            begin
-              yaml_hash = YAML.load_file(@@pc_emoticon_yaml)
-              @pc_emoticon_hash = Hash[*(yaml_hash.values.inject([]){ |r, v| r += v.to_a.flatten; r})]
-              @@pc_emoticon_image_path.chop if @@pc_emoticon_image_path.match(/\/$/)
-
-              return true
-            rescue => ex
-            end
-          end
-        end
-
-        return false
-      end
-
       def response_to_body(response)
         if response.respond_to?(:to_str)
           response.to_str
@@ -77,18 +51,6 @@ module Jpmobile
           body
         end
       end
-
-      @@pc_emoticon_image_path = nil
-      @@pc_emoticon_yaml       = nil
-      class << self
-        def pc_emoticon_image_path=(path)
-          @@pc_emoticon_image_path = path
-        end
-
-        def pc_emoticon_yaml=(file)
-          @@pc_emoticon_yaml = file
-        end
-      end
     end
   end
 end

data/lib/jpmobile/util.rb

@@ -102,9 +102,11 @@ module Jpmobile
       utf8_str = minus_sign_to_fullwidth_hyphen_minus(utf8_str)
 
       if utf8_str.respond_to?(:encode)
-        utf8_str.encode(SJIS, :crlf_newline => true,:undef => :replace,:replace => '?')
+        utf8_str.
+        gsub(/(\r\n|\r|\n)/, "\r\n").
+        encode(SJIS, :undef => :replace, :replace => '?')
       else
-        NKF.nkf("-m0 -x -W --oc=cp932 --fb-subchar=63", utf8_str).gsub(/\n/, "\r\n")
+        NKF.nkf("-m0 -x -W --oc=cp932 --fb-subchar=63", utf8_str).gsub(/(\r\n|\r|\n)/, "\r\n")
       end
     end
 
@@ -112,7 +114,7 @@ module Jpmobile
       utf8_str = if sjis_str.respond_to?(:encode)
                    sjis_str.encode("UTF-8", :universal_newline => true)
                  else
-                   NKF.nkf("-m0 -x -w --ic=cp932", sjis_str).gsub(/\r\n/, "\n")
+                   NKF.nkf("-m0 -x -w --ic=cp932", sjis_str).gsub(/\r\n?/, "\n")
                  end
 
       # 波ダッシュ対策
@@ -120,10 +122,15 @@ module Jpmobile
     end
 
     def utf8_to_jis(utf8_str)
+      # 波ダッシュ対策
+      utf8_str = fullwidth_tilde_to_wavedash(utf8_str)
+
       if utf8_str.respond_to?(:encode)
-        utf8_str.encode(JIS, :crlf_newline => true)
+        utf8_str.
+        gsub(/(\r\n|\r|\n)/, "\r\n").
+        encode(JIS, :undef => :replace, :replace => '?')
       else
-        NKF.nkf("-m0 -x -Wj", utf8_str).gsub(/\n/, "\r\n")
+        NKF.nkf("-m0 -x -Wj --fb-subchar=63", utf8_str).gsub(/(\r\n|\r|\n)/, "\r\n")
       end
     end
 
@@ -131,7 +138,7 @@ module Jpmobile
       if jis_str.respond_to?(:encode)
         jis_str.encode(UTF8, :universal_newline => true)
       else
-        NKF.nkf("-m0 -x -Jw", jis_str).gsub(/\r\n/, "\n")
+        NKF.nkf("-m0 -x -Jw", jis_str).gsub(/\r\n?/, "\n")
       end
     end
 
@@ -184,11 +191,17 @@ module Jpmobile
     end
 
     def encode(str, charset)
-      if Object.const_defined?(:Encoding)
-        (charset.nil? or charset == "" or str.nil? or str == "") ? str : str.encode(charset)
+      if (charset.nil? or charset == "" or str.nil? or str == "")
+        str
+      elsif utf8?(str) and charset.match(/iso-2022-jp/i)
+        utf8_to_jis(str)
+      elsif utf8?(str) and charset.match(/shift_jis/i)
+        utf8_to_sjis(str)
+      elsif utf8?(str) and charset.match(/utf-8/i)
+        str
       else
-        if str.nil?
-          str
+        if Object.const_defined?(:Encoding)
+          str.encode(charset)
         else
           case charset
           when /iso-2022-jp/i

data/spec/rack/jpmobile/emoticon_spec.rb

@@ -57,13 +57,17 @@ describe "絵文字が" do
 
       @res = Rack::MockRequest.env_for("/", 'Content-Type' => 'text/html; charset=utf-8')
 
-      Jpmobile::Rack::Filter.pc_emoticon_yaml               = "tmp/emoticon.yaml"
-      Jpmobile::Rack::Filter.pc_emoticon_image_path = @path = "tmp/emoticons"
+      Jpmobile::Emoticon.pc_emoticon_yaml               = "tmp/emoticon.yaml"
+      Jpmobile::Emoticon.pc_emoticon_image_path = @path = "tmp/emoticons"
     end
 
     after(:each) do
-      Jpmobile::Rack::Filter.pc_emoticon_yaml       = nil
-      Jpmobile::Rack::Filter.pc_emoticon_image_path = nil
+      Jpmobile::Emoticon.pc_emoticon_yaml       = nil
+      Jpmobile::Emoticon.pc_emoticon_image_path = nil
+    end
+
+    it "Jpmobile::Emoticon.pc_emoticon? がtrueになること" do
+      Jpmobile::Emoticon.pc_emoticon?.should be_true
     end
 
     it "docomo 絵文字が画像に変換されること" do
@@ -71,9 +75,9 @@ describe "絵文字が" do
       response_body(response).should == "<img src=\"#{@path}/sun.gif\" alt=\"sun\" />"
     end
 
-    it "docomo 絵文字コードの埋込みは変換されないこと" do
+    it "docomo 絵文字コードが画像に変換されること" do
       response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@docomo_utf8))).call(@res)[2]
-      response_body(response).should == @docomo_utf8
+      response_body(response).should == "<img src=\"#{@path}/sun.gif\" alt=\"sun\" />"
     end
 
     it "au 絵文字が画像に変換されること" do
@@ -81,9 +85,9 @@ describe "絵文字が" do
       response_body(response).should == "<img src=\"#{@path}/sun.gif\" alt=\"sun\" />"
     end
 
-    it "au 絵文字コードの埋込みは変換されないこと" do
+    it "au 絵文字コードが画像に変換されること" do
       response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@au_utf8))).call(@res)[2]
-      response_body(response).should == @au_utf8
+      response_body(response).should == "<img src=\"#{@path}/sun.gif\" alt=\"sun\" />"
     end
 
     it "softbank 絵文字が画像に変換されること" do
@@ -91,9 +95,9 @@ describe "絵文字が" do
       response_body(response).should == "<img src=\"#{@path}/sun.gif\" alt=\"sun\" />"
     end
 
-    it "softbank 絵文字コードの埋込みは変換されないこと" do
+    it "softbank 絵文字コードが画像に変換されること" do
       response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)[2]
-      response_body(response).should == @softbank_utf8
+      response_body(response).should == "<img src=\"#{@path}/sun.gif\" alt=\"sun\" />"
     end
   end
 

data/spec/rack/jpmobile/softbank_spec.rb

@@ -70,7 +70,7 @@ describe Jpmobile::Rack::MobileCarrier, "softbank" do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
         'HTTP_USER_AGENT' => "Vodafone/1.0/V903T/TJ001 Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0",
-        "REMOTE_ADDR"=>"210.175.1.130")
+        "REMOTE_ADDR"=>"210.146.7.199")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
       env['rack.jpmobile'].valid_ip?.should be_true

data/spec/unit/decorated_mail_spec.rb

@@ -0,0 +1,76 @@
+# -*- coding: utf-8 -*-
+require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+require 'mail'
+require 'jpmobile/mail'
+
+describe "decorated mails" do
+  include Jpmobile::Util
+
+  before(:each) do
+    @mail           = Mail.new
+    @mail.subject   = "万葉"
+    @mail.text_part = Mail::Part.new do
+      body 'ほげ'
+    end
+    @mail.from      = "ちはやふる <info@jpmobile-rails.org>"
+    @mail.to        = "むすめふさほせ <info+to@jpmobile-rails.org>"
+
+    @photo = open(File.join(File.expand_path(File.dirname(__FILE__)), "email-fixtures/photo.jpg")).read
+    @mail.attachments.inline['photo.jpg'] = @photo
+    @inline_url = @mail.attachments['photo.jpg'].url
+  end
+
+  describe "docomo" do
+    before(:each) do
+      inline_url = @inline_url
+      @mobile = Jpmobile::Mobile::Docomo.new(nil, nil)
+      charset = @mobile.mail_charset
+      @mail.html_part = Mail::Part.new do
+        body '<img src="' + inline_url + '" />'
+        content_type "text/html; charset=#{charset}"
+      end
+      @mail.mobile = @mobile
+    end
+
+    it "top level content-type should be 'multipart/mixed'" do
+      @mail.rearrange!
+      @mail.content_type.should match('multipart/mixed')
+    end
+  end
+
+  describe "au" do
+    before(:each) do
+      inline_url = @inline_url
+      @mobile = Jpmobile::Mobile::Au.new(nil, nil)
+      charset = @mobile.mail_charset
+      @mail.html_part = Mail::Part.new do
+        body '<img src="' + inline_url + '" />'
+        content_type "text/html; charset=#{charset}"
+      end
+      @mail.mobile = @mobile
+    end
+
+    it "top level content-type should be 'multipart/mixed'" do
+      @mail.rearrange!
+      @mail.content_type.should match('multipart/mixed')
+    end
+  end
+
+  describe "softbank" do
+    before(:each) do
+      inline_url = @inline_url
+      @mobile = Jpmobile::Mobile::Softbank.new(nil, nil)
+      charset = @mobile.mail_charset
+      @mail.html_part = Mail::Part.new do
+        body '<img src="' + inline_url + '" />'
+        content_type "text/html; charset=#{charset}"
+      end
+      @mail.mobile = @mobile
+    end
+
+    it "top level content-type should be 'multipart/mixed'" do
+      @mail.rearrange!
+      @mail.content_type.should match('multipart/mixed')
+    end
+  end
+end

data/spec/unit/mail_spec.rb

@@ -19,6 +19,31 @@ describe "Jpmobile::Mail" do
     end
   end
 
+  describe "Non-mobile" do
+    before(:each) do
+      @mail = Mail.new do
+        subject "万葉"
+        from "ちはやふる <info@jpmobile-rails.org>"
+      end
+    end
+    context "has multipart body" do
+      before(:each) do
+        @mail.parts << Mail::Part.new { body "ほげ" }
+        @mail.parts << Mail::Part.new { body "ほげほげ" }
+        @mail.parts.each{|p| p.charset = "ISO-2022-JP" }
+      end
+      context "to_s" do
+        subject {
+          Mail.new ascii_8bit(@mail.to_s)
+        }
+        it "should be able to decode bodies" do
+          subject.parts[0].body == "ほげ"
+          subject.parts[1].body == "ほげほげ"
+        end
+      end
+    end
+  end
+
   describe "AbstractMobile" do
     before(:each) do
       @mobile = Jpmobile::Mobile::AbstractMobile.new(nil, nil)
@@ -229,4 +254,50 @@ describe "Jpmobile::Mail" do
       end
     end
   end
+
+  context "with attachments" do
+    before(:each) do
+      @mobile = Jpmobile::Mobile::AbstractMobile.new(nil, nil)
+      @mail.mobile = @mobile
+      @mail.to = "むすめふさほせ <info+to@jpmobile-rails.org>"
+      @photo = open(File.join(File.expand_path(File.dirname(__FILE__)), "email-fixtures/photo.jpg")).read
+    end
+
+    it "should encodes itself successfully" do
+      @mail.attachments['photo.jpg'] = @photo
+
+      lambda {
+        @mail.to_s
+      }.should_not raise_error
+    end
+
+    it "should encodes itself successfully with an inline attachment" do
+      @mail.attachments.inline['photo.jpg'] = @photo
+
+      lambda {
+        @mail.to_s
+      }.should_not raise_error
+    end
+  end
+
+  context "encoding conversion" do
+    before(:each) do
+      @mobile = Jpmobile::Mobile::AbstractMobile.new(nil, nil)
+      @mail.mobile = @mobile
+      @mail.to = "むすめふさほせ <info+to@jpmobile-rails.org>"
+      @photo = open(File.join(File.expand_path(File.dirname(__FILE__)), "email-fixtures/photo.jpg")).read
+    end
+
+    it "wave dash converting correctly" do
+      @mail.body = '10:00〜12:00'
+
+      ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape(ascii_8bit("\x31\x30\x3a\x30\x30\x1b\x24\x42\x21\x41\x1b\x28\x42\x31\x32\x3a\x30\x30"))))
+    end
+
+    it "full width tilde converting correctly" do
+      @mail.body = "10:00#{[0xff5e].pack("U")}12:00"
+
+      ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape(ascii_8bit("\x31\x30\x3a\x30\x30\x1b\x24\x42\x21\x41\x1b\x28\x42\x31\x32\x3a\x30\x30"))))
+    end
+  end
 end

data/spec/unit/spec_helper.rb

@@ -18,5 +18,5 @@ RSpec.configure do |c|
   c.run_all_when_everything_filtered = true
   c.color_enabled = true
   c.filter_run_excluding :broken => true
-  # c.full_backtrace = true
+  c.full_backtrace = true
 end

data/spec/unit/util_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
 require 'stringio'
 require 'nkf'
 
-describe Jpmobile::Util, ".deep_apply" do
+describe Jpmobile::Util do
   include Jpmobile::Util
 
   it 'nilのときはnilを返すこと' do
@@ -34,8 +34,8 @@ describe Jpmobile::Util, ".deep_apply" do
     utf8_to_sjis("اللغة العربية").should == sjis("????? ???????")
   end
 
-  it "utf8_to_sjis で改行コードが CRLF に変更されること" do
-    utf8_to_sjis("UTF8\nTEXT\n").should == sjis("UTF8\r\nTEXT\r\n")
+  it "utf8_to_sjis ですべての改行コードが CRLF に変更されること" do
+    utf8_to_sjis("UTF8\rSAMPLE\nTEXT\r\n").should == sjis("UTF8\r\nSAMPLE\r\nTEXT\r\n")
   end
 
   it "0x8150がU+FFE3に変換されること" do
@@ -63,6 +63,22 @@ describe Jpmobile::Util, ".deep_apply" do
     jis_to_utf8(jis("\x1b\x24\x42#{$1}\x1b\x28\x42")).should == "しからずんばこじをえず"
   end
 
+  it "sjis_to_utf8 ですべての改行コードが LF に変更されること" do
+    sjis_to_utf8("SJIS\rSAMPLE\nTEXT\r\n").should == utf8("SJIS\nSAMPLE\nTEXT\n")
+  end
+
+  it "utf8_to_sjis で変換できない文字列が含んでいた場合?に変換される" do
+    utf8_to_jis("اللغة العربية").should == jis("????? ???????")
+  end
+
+  it "utf8_to_jis ですべての改行コードが CRLF に変更されること" do
+    utf8_to_jis("UTF8\rSAMPLE\nTEXT\r\n").should == jis("UTF8\r\nSAMPLE\r\nTEXT\r\n")
+  end
+
+  it "jis_to_utf8 ですべての改行コードが LF に変更されること" do
+    jis_to_utf8("JIS\rSAMPLE\nTEXT\r\n").should == utf8("JIS\nSAMPLE\nTEXT\n")
+  end
+
   it "fold_textでUTF-8の日本語文字列が指定文字数で折り返された配列で返ること" do
     fold_text('長い日本語の題名で折り返されるかようにするには事前に分割していないとダメなことがわかりましたよ', 15).should == [
       '長い日本語の題名で折り返される',
@@ -87,4 +103,9 @@ describe Jpmobile::Util, ".deep_apply" do
     split_text('', 15).should be_nil
     split_text(nil, 15).should be_nil
   end
+
+  it "全角チルダがjisに適切に変換されること" do
+    ascii_8bit(utf8_to_jis("\xef\xbd\x9e")).should == ascii_8bit("\x1b\x24\x42\x21\x41\x1b\x28\x42")
+    ascii_8bit(encode("\xef\xbd\x9e", "ISO-2022-JP")).should == ascii_8bit("\x1b\x24\x42\x21\x41\x1b\x28\x42")
+  end
 end

data/test/rails/overrides/app/mailers/decorated_mailer.rb

@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+class DecoratedMailer < Jpmobile::Mailer::Base
+  default :from => "info@jp.mobile"
+  default :to   => "info@jp.mobile"
+
+  def deco_mail(to_mail)
+    attachments.inline['photo.jpg'] = open(File.join(Rails.root, 'spec/fixtures/mobile_mailer/photo.jpg')).read
+
+    mail(:to => to_mail, :subject => '題名', :decorated => true)
+  end
+end

data/test/rails/overrides/app/views/decorated_mailer/deco_mail.html.erb

@@ -0,0 +1,10 @@
+<html>
+  <body>
+    <p>
+      HTMLメールの本文
+    </p>
+    <p>
+      <%= image_tag attachments['photo.jpg'].url -%>
+    </p>
+  </body>
+</html>

data/test/rails/overrides/app/views/decorated_mailer/deco_mail.text.erb

@@ -0,0 +1 @@
+テキストメールの本文

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

@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+require File.expand_path(File.join(File.dirname(__FILE__), '/../spec_helper'))
+
+describe DecoratedMailer do
+  include Jpmobile::Util
+
+  before(:each) do
+    ActionMailer::Base.deliveries = []
+  end
+
+  shared_examples_for "content-type" do
+    it "sends decorated mail successfully" do
+      DecoratedMailer.deco_mail(@to).deliver
+
+      email = ActionMailer::Base.deliveries.first
+      email.header['Content-Type'].main_type.should == 'multipart'
+      email.header['Content-Type'].sub_type.should == 'mixed'
+    end
+  end
+
+  describe "docomo" do
+    before(:each) do
+      @to = "docomo@docomo.ne.jp"
+    end
+
+    it_behaves_like "content-type"
+  end
+
+  describe "au" do
+    before(:each) do
+      @to = "au@ezweb.ne.jp"
+    end
+
+    it_behaves_like "content-type"
+  end
+
+  describe "softbank" do
+    before(:each) do
+      @to = "softbank@softbank.ne.jp"
+    end
+
+    it_behaves_like "content-type"
+  end
+end

data/test/rails/overrides/spec/spec_helper.rb

@@ -32,7 +32,7 @@ RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.color_enabled = true
   config.filter_run_excluding :broken => true
-  config.full_backtrace = true
+  # config.full_backtrace = true
 end
 
 require 'pp'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jpmobile
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-26 00:00:00.000000000Z
+date: 2011-11-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &20415560 !ruby/object:Gem::Requirement
+  requirement: &21299100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20415560
+  version_requirements: *21299100
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &20415080 !ruby/object:Gem::Requirement
+  requirement: &21298540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *20415080
+  version_requirements: *21298540
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &20393360 !ruby/object:Gem::Requirement
+  requirement: &21298040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20393360
+  version_requirements: *21298040
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &20392880 !ruby/object:Gem::Requirement
+  requirement: &21297560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20392880
+  version_requirements: *21297560
 - !ruby/object:Gem::Dependency
   name: webrat
-  requirement: &20392400 !ruby/object:Gem::Requirement
+  requirement: &21297060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20392400
+  version_requirements: *21297060
 - !ruby/object:Gem::Dependency
   name: geokit
-  requirement: &20391920 !ruby/object:Gem::Requirement
+  requirement: &21296540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20391920
+  version_requirements: *21296540
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &20391440 !ruby/object:Gem::Requirement
+  requirement: &21296000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20391440
+  version_requirements: *21296000
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &20390860 !ruby/object:Gem::Requirement
+  requirement: &21295480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20390860
+  version_requirements: *21295480
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &20390380 !ruby/object:Gem::Requirement
+  requirement: &21294980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *20390380
+  version_requirements: *21294980
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &20389820 !ruby/object:Gem::Requirement
+  requirement: &21294500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: 1.5.1
   type: :development
   prerelease: false
-  version_requirements: *20389820
+  version_requirements: *21294500
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &20389320 !ruby/object:Gem::Requirement
+  requirement: &21294020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *20389320
+  version_requirements: *21294020
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &20388840 !ruby/object:Gem::Requirement
+  requirement: &21293520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *20388840
+  version_requirements: *21293520
 - !ruby/object:Gem::Dependency
   name: webrat
-  requirement: &20388340 !ruby/object:Gem::Requirement
+  requirement: &21293040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *20388340
+  version_requirements: *21293040
 - !ruby/object:Gem::Dependency
   name: geokit
-  requirement: &20387800 !ruby/object:Gem::Requirement
+  requirement: &21292560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,10 +165,10 @@ dependencies:
         version: 1.5.0
   type: :development
   prerelease: false
-  version_requirements: *20387800
+  version_requirements: *21292560
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &20387280 !ruby/object:Gem::Requirement
+  requirement: &21292080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -176,10 +176,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *20387280
+  version_requirements: *21292080
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &20386760 !ruby/object:Gem::Requirement
+  requirement: &21291600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -187,10 +187,10 @@ dependencies:
         version: 0.8.3
   type: :development
   prerelease: false
-  version_requirements: *20386760
+  version_requirements: *21291600
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: &20386260 !ruby/object:Gem::Requirement
+  requirement: &21266300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -198,7 +198,7 @@ dependencies:
         version: 1.2.5
   type: :development
   prerelease: false
-  version_requirements: *20386260
+  version_requirements: *21266300
 description: A Rails plugin for Japanese mobile-phones
 email: dara@shidara.net
 executables: []
@@ -276,6 +276,7 @@ files:
 - spec/rack/jpmobile/windows_phone.rb
 - spec/rack_helper.rb
 - spec/spec_helper.rb
+- spec/unit/decorated_mail_spec.rb
 - spec/unit/email-fixtures/au-attached.eml
 - spec/unit/email-fixtures/au-decomail.eml
 - spec/unit/email-fixtures/au-emoji.eml
@@ -286,6 +287,7 @@ files:
 - spec/unit/email-fixtures/docomo-jis.eml
 - spec/unit/email-fixtures/pc-mail-multi.eml
 - spec/unit/email-fixtures/pc-mail-single.eml
+- spec/unit/email-fixtures/photo.jpg
 - spec/unit/email-fixtures/softbank-blank.eml
 - spec/unit/email-fixtures/softbank-emoji-utf8.eml
 - spec/unit/email-fixtures/softbank-emoji.eml
@@ -320,9 +322,12 @@ files:
 - test/rails/overrides/app/controllers/trans_sid_metal_controller.rb
 - test/rails/overrides/app/controllers/trans_sid_mobile_controller.rb
 - test/rails/overrides/app/controllers/trans_sid_none_controller.rb
-- test/rails/overrides/app/models/mobile_mailer.rb
-- test/rails/overrides/app/models/normal_mailer.rb
+- test/rails/overrides/app/mailers/decorated_mailer.rb
+- test/rails/overrides/app/mailers/mobile_mailer.rb
+- test/rails/overrides/app/mailers/normal_mailer.rb
 - test/rails/overrides/app/models/user.rb
+- test/rails/overrides/app/views/decorated_mailer/deco_mail.html.erb
+- test/rails/overrides/app/views/decorated_mailer/deco_mail.text.erb
 - test/rails/overrides/app/views/filter/index.html.erb
 - test/rails/overrides/app/views/hankaku_filter/index.html.erb
 - test/rails/overrides/app/views/hankaku_input_filter/index.html.erb
@@ -382,14 +387,16 @@ files:
 - test/rails/overrides/spec/fixtures/mobile_mailer/docomo-jis.eml
 - test/rails/overrides/spec/fixtures/mobile_mailer/no-from.eml
 - test/rails/overrides/spec/fixtures/mobile_mailer/non-jp.eml
+- test/rails/overrides/spec/fixtures/mobile_mailer/photo.jpg
 - test/rails/overrides/spec/fixtures/mobile_mailer/softbank-blank.eml
 - test/rails/overrides/spec/fixtures/mobile_mailer/softbank-emoji-utf8.eml
 - test/rails/overrides/spec/fixtures/mobile_mailer/softbank-emoji.eml
 - test/rails/overrides/spec/fixtures/mobile_mailer/softbank-gmail-sjis.eml
 - test/rails/overrides/spec/fixtures/mobile_mailer/softbank-gmail-utf8.eml
 - test/rails/overrides/spec/helpers/helpers_spec.rb
-- test/rails/overrides/spec/models/mobile_mailer_spec.rb
-- test/rails/overrides/spec/models/normal_mailer_spec.rb
+- test/rails/overrides/spec/mailers/decorated_mailer_spec.rb
+- test/rails/overrides/spec/mailers/mobile_mailer_spec.rb
+- test/rails/overrides/spec/mailers/normal_mailer_spec.rb
 - test/rails/overrides/spec/rcov.opts
 - test/rails/overrides/spec/requests/docomo_guid_spec.rb
 - test/rails/overrides/spec/requests/docomo_spec.rb