jpmobile 0.1.5 → 0.1.6

data/test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/emoticon/z_combine.rb

@@ -4,30 +4,33 @@ end
 
 module Jpmobile
   module Emoticon
+    GETA = 0x3013
+
     SJIS_TO_UNICODE = {}
     SJIS_TO_UNICODE.update(DOCOMO_SJIS_TO_UNICODE)
     SJIS_TO_UNICODE.update(AU_SJIS_TO_UNICODE)
     SJIS_TO_UNICODE.freeze
     UNICODE_TO_SJIS = SJIS_TO_UNICODE.invert.freeze
 
-    if Object.const_defined?(:Encoding)
-      sjis_regexp = Proc.new do |sjis|
-        Regexp.compile(Regexp.escape([sjis].pack('n').force_encoding("Shift_JIS")))
-      end
-    else
-      sjis_regexp = Proc.new do |sjis|
-        Regexp.compile(Regexp.escape([sjis].pack('n'),"s"),nil,'s')
-      end
-    end
-
-    SJIS_REGEXP = Regexp.union(*SJIS_TO_UNICODE.keys.map{|s| sjis_regexp[s]})
+    # for au email
+    SJIS_TO_EMAIL_JIS = {0x81ac => 0x222E}
+    SJIS_TO_EMAIL_JIS.update(AU_SJIS_TO_EMAIL_JIS)
+    SJIS_TO_EMAIL_JIS.freeze
+
+    SJIS_REGEXP = Regexp.union(*SJIS_TO_UNICODE.keys.map{|s| Jpmobile::Util.sjis_regexp(s)})
     SOFTBANK_WEBCODE_REGEXP = Regexp.union(*([/(?!)/n]+SOFTBANK_WEBCODE_TO_UNICODE.keys.map{|x| "\x1b\x24#{x}\x0f"}))
 
-    DOCOMO_SJIS_REGEXP      = Regexp.union(*DOCOMO_SJIS_TO_UNICODE.keys.map{|s| sjis_regexp[s]})
-    AU_SJIS_REGEXP          = Regexp.union(*AU_SJIS_TO_UNICODE.keys.map{|s| sjis_regexp[s]})
+    DOCOMO_SJIS_REGEXP      = Regexp.union(*DOCOMO_SJIS_TO_UNICODE.keys.map{|s| Jpmobile::Util.sjis_regexp(s)})
+    AU_SJIS_REGEXP          = Regexp.union(*AU_SJIS_TO_UNICODE.keys.map{|s| Jpmobile::Util.sjis_regexp(s)})
     SOFTBANK_UNICODE_REGEXP = Regexp.union(*SOFTBANK_UNICODE_TO_WEBCODE.keys.map{|x| [x].pack('U')}).freeze
 
     EMOTICON_UNICODES = UNICODE_TO_SJIS.keys|SOFTBANK_UNICODE_TO_WEBCODE.keys.map{|k|k+0x1000}
     UTF8_REGEXP = Regexp.union(*EMOTICON_UNICODES.map{|x| [x].pack('U')}).freeze
+
+    # for PC conversion "GETA"
+    CONVERSION_TABLE_TO_PC_EMAIL = Hash[*(CONVERSION_TABLE_TO_SOFTBANK.keys|CONVERSION_TABLE_TO_DOCOMO.keys|CONVERSION_TABLE_TO_AU.keys).map{|k| [k, GETA]}.flatten]
+
+    SOFTBANK_SJIS_REGEXP = Regexp.union(*SOFTBANK_SJIS_TO_UNICODE.keys.map{|s| Jpmobile::Util.sjis_regexp(s)}).freeze
+    AU_EMAILJIS_REGEXP = Regexp.union(*AU_EMAILJIS_TO_UNICODE.keys.map{|s| Jpmobile::Util.jis_regexp(s)})
   end
 end

data/test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/hook_action_mailer.rb

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+require 'jpmobile/mail'
+
+module Jpmobile
+  module Mailer
+    class Base < ActionMailer::Base
+      def mail(headers={}, &block)
+        m = super(headers, &block)
+
+        if m.to.size == 1
+          # for mobile
+          m.mobile = (Jpmobile::Email.detect(m.to.first) || Jpmobile::Mobile::AbstractMobile).new(nil, nil)
+        else
+          # for multi to addresses
+          m.mobile = Jpmobile::Mobile::AbstractMobile.new(nil, nil)
+        end
+
+        m
+      end
+    end
+  end
+end

data/test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mail.rb

@@ -0,0 +1,265 @@
+# -*- coding: utf-8 -*-
+require 'mail'
+
+module Jpmobile
+  module Mail
+    module_function
+  end
+end
+
+module Mail
+  # encoding patch
+  if self.const_defined?(:Ruby19)
+    Ruby19.class_eval do
+      def self.b_value_decode(str)
+        match = str.match(/\=\?(.+)?\?[Bb]\?(.+)?\?\=/m)
+        if match
+          encoding = match[1]
+          str = self.decode_base64(match[2])
+          str.force_encoding(fix_encoding(encoding))
+        end
+        # if str contains some emoticon, the following line raises Encoding error
+        str.encode("utf-8", :invalid => :replace, :replace => "") rescue Jpmobile::Util.ascii_8bit(str)
+      end
+    end
+  elsif self.const_defined?(:Ruby18)
+    Ruby18.class_eval do
+      def self.b_value_decode(str)
+        match = str.match(/\=\?(.+)?\?[Bb]\?(.+)?\?\=/m)
+        if match
+          encoding = match[1]
+          str = Ruby18.decode_base64(match[2])
+        end
+        str
+      end
+    end
+  end
+
+  class Message
+    attr_accessor :mobile
+
+    def encoded_with_jpmobile
+      if @mobile
+        header['subject'].mobile = @mobile if header['subject']
+        self.charset             = @mobile.mail_charset
+
+        ready_to_send!
+
+        self.body.mobile = @mobile
+        self.header['Content-Transfer-Encoding'] = '8bit'
+
+        if self.header['Content-Type']
+pp          self.body.charset = case self.header['Content-Type'].value
+                              when /iso-2022-jp/i
+                                "ISO-2022-JP"
+                              when /shift_jis/i
+                                "Shift_JIS"
+                              else
+                                "UTF-8"
+                              end
+          unless self.header['Content-Type'] == self.body.charset
+            self.header['Content-Type'] = self.body.charset
+          end
+pp self.header['Content-Type'].charset
+pp self.header['Content-Type'].value
+pp self.header['Content-Type']
+pp self.body.charset
+        end
+
+        buffer = header.encoded
+        buffer << "\r\n"
+        buffer = @mobile.utf8_to_mail_encode(buffer)
+        buffer << body.encoded(content_transfer_encoding)
+        buffer
+      else
+        encoded_without_jpmobile
+      end
+    end
+
+    def parse_message_with_jpmobile
+      parse_message_without_jpmobile
+
+      if !multipart? and self.header['Content-Type']
+        self.body.charset = case self.header['Content-Type'].value
+                            when /iso-2022-jp/i
+                              "ISO-2022-JP"
+                            when /shift_jis/i
+                              "Shift_JIS"
+                            else
+                              "UTF-8"
+                            end
+      end
+      self.header['subject'].mobile = @mobile if self.header['subject']
+    end
+
+    def init_with_string_with_jpmobile(string)
+      # Jpmobile::Mobile class from 'From: ' header
+      s = Jpmobile::Util.ascii_8bit(string)
+
+      mobile_class = nil
+      content_has_from = false
+      s.split(/\n|\r/).each do |line|
+        if line =~ /^From:/
+          content_has_from = true
+          break if mobile_class = Jpmobile::Email.detect_from_mail_header(line)
+        end
+      end
+
+      if content_has_from
+        @mobile = (mobile_class || Jpmobile::Mobile::AbstractMobile).new(nil, nil)
+
+        init_with_string_without_jpmobile(s)
+
+        self.body.mobile = @mobile
+        self.body.set_encoding_jpmobile
+        if self.body.multipart?
+          self.body.parts.each do |part|
+            part.body.mobile = @mobile
+            part.body.set_encoding_jpmobile
+          end
+        end
+      else
+        init_with_string_without_jpmobile(s)
+      end
+    end
+
+    def process_body_raw_with_jpmobile
+      process_body_raw_without_jpmobile
+
+      self.body.mobile = @mobile
+    end
+
+    alias_method :encoded_without_jpmobile, :encoded
+    alias_method :encoded, :encoded_with_jpmobile
+
+    alias_method :parse_message_without_jpmobile, :parse_message
+    alias_method :parse_message, :parse_message_with_jpmobile
+
+    alias_method :init_with_string_without_jpmobile, :init_with_string
+    alias_method :init_with_string, :init_with_string_with_jpmobile
+
+    alias_method :process_body_raw_without_jpmobile, :process_body_raw
+    alias_method :process_body_raw, :process_body_raw_with_jpmobile
+  end
+
+  class Part
+    def parse_message_with_jpmobile
+      parse_message_without_jpmobile
+
+      if !multipart? and self.header['Content-Type']
+        @charset = case self.header['Content-Type'].value
+                   when /iso-2022-jp/i
+                     "ISO-2022-JP"
+                   when /shift_jis/i
+                     "Shift_JIS"
+                   else
+                     "UTF-8"
+                   end
+        self.body.charset = @charset
+      end
+    end
+
+    alias_method :parse_message_without_jpmobile, :parse_message
+    alias_method :parse_message, :parse_message_with_jpmobile
+  end
+
+  class Body
+    attr_accessor :mobile
+
+    # convert encoding
+    def encoded_with_jpmobile(transfer_encoding = '8bit')
+      if @mobile and !multipart?
+        if @mobile.to_mail_body_encoded?(raw_source)
+          raw_source
+        else
+          @mobile.to_mail_body(Jpmobile::Util.force_encode(raw_source, @charset, Jpmobile::Util::UTF8))
+        end
+      else
+        encoded_without_jpmobile(transfer_encoding)
+      end
+    end
+    def decoded_with_jpmobile
+      if @mobile and !multipart?
+        @raw_source = @mobile.to_mail_internal(@raw_source, nil) unless @jpmobile_decoded
+        @jpmobile_decoded = true
+      end
+
+      if @charset
+        @raw_source = Jpmobile::Util.force_encode(@raw_source, @charset, Jpmobile::Util::UTF8)
+      end
+
+      decoded_without_jpmobile
+    end
+
+    # fix charset
+    def set_charset_with_jpmobile
+      @charset ||= only_us_ascii? ? 'US-ASCII' : nil
+    end
+
+    # set encoding to @raw_source in init
+    def set_encoding_jpmobile
+      @raw_source = Jpmobile::Util.set_encoding(@raw_source, @charset)
+    end
+
+    def mobile=(m)
+      if self.multipart?
+        self.parts.each do |part|
+          part.body.mobile = @mobile
+          part.body.set_encoding_jpmobile
+        end
+      end
+
+      @mobile = m
+      self.set_encoding_jpmobile
+    end
+
+    alias_method :encoded_without_jpmobile, :encoded
+    alias_method :encoded, :encoded_with_jpmobile
+
+    alias_method :decoded_without_jpmobile, :decoded
+    alias_method :decoded, :decoded_with_jpmobile
+
+    alias_method :set_charset_without_jpmobile, :set_charset
+    alias_method :set_charset, :set_charset_with_jpmobile
+  end
+
+  class UnstructuredField
+    attr_accessor :mobile
+
+    def do_decode
+      result = value.blank? ? nil : Encodings.decode_encode(value, :decode)
+
+      result = @mobile.to_mail_internal(result, value) if @mobile
+
+      # result.encode!(value.encoding || "UTF-8") if RUBY_VERSION >= '1.9' && !result.blank?
+      result.blank? ? result : Jpmobile::Util.force_encode(result, nil, Jpmobile::Util::UTF8)
+    end
+  end
+
+  # for subject
+  class SubjectField < UnstructuredField
+    # FIXME: not folding subject -> folding
+    def encoded_with_jpmobile
+      if @mobile
+        if @mobile.to_mail_subject_encoded?(value)
+          "#{name}: #{value}\r\n"
+        else
+          # convert encoding
+          "#{name}: " + @mobile.to_mail_subject(value) + "\r\n"
+        end
+      else
+        encoded_without_jpmobile
+      end
+    end
+
+    # def decoded_with_jpmobile
+    #   decoded_without_jpmobile
+    # end
+
+    alias_method :encoded_without_jpmobile, :encoded
+    alias_method :encoded, :encoded_with_jpmobile
+
+    # alias_method :decoded_without_jpmobile, :decoded
+    # alias_method :decoded, :decoded_with_jpmobile
+  end
+end

data/test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/abstract_mobile.rb

@@ -65,6 +65,41 @@ module Jpmobile::Mobile
     def default_charset
       "UTF-8"
     end
+
+    # メール送信用
+    def to_mail_subject(str)
+      "=?#{mail_charset}?B?" + [to_mail_encoding(str)].pack('m').strip + "?="
+    end
+    def to_mail_body(str)
+      to_mail_encoding(str)
+    end
+    def mail_charset
+      "ISO-2022-JP"
+    end
+    def to_mail_encoding(str)
+      str = Jpmobile::Emoticon.unicodecr_to_external(str, Jpmobile::Emoticon::CONVERSION_TABLE_TO_PC_EMAIL, false)
+      Jpmobile::Util.encode(str, mail_charset)
+    end
+    def utf8_to_mail_encode(str)
+      case mail_charset
+      when /ISO-2022-JP/i
+        Jpmobile::Util.utf8_to_jis(str)
+      when /Shift_JIS/i
+        Jpmobile::Util.utf8_to_sjis(str)
+      else
+        str
+      end
+    end
+    def to_mail_internal(str, val)
+      str
+    end
+    def to_mail_subject_encoded?(str)
+      str.match(/\=\?#{mail_charset}\?B.+\?\=/i)
+    end
+    def to_mail_body_encoded?(str)
+      Jpmobile::Util.jis?(str)
+    end
+
     # リクエストがこのクラスに属するか調べる
     # メソッド名に関して非常に不安
     def self.check_carrier(env)

data/test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/au.rb

@@ -9,7 +9,7 @@ module Jpmobile::Mobile
     # User-Agent文字列中に "UP.Browser" を含むVodafoneの端末があるので注意が必要
     USER_AGENT_REGEXP = /^(?:KDDI|UP.Browser\/.+?)-(.+?) /
     # 対応するメールアドレスの正規表現
-    MAIL_ADDRESS_REGEXP = /^.+@ezweb\.ne\.jp$/
+    MAIL_ADDRESS_REGEXP = /.+@ezweb\.ne\.jp/
     # 簡易位置情報取得に対応していないデバイスID
     # http://www.au.kddi.com/ezfactory/tec/spec/eznavi.html
     LOCATION_UNSUPPORTED_DEVICE_ID = ["PT21", "TS25", "KCTE", "TST9", "KCU1", "SYT5", "KCTD", "TST8", "TST7", "KCTC", "SYT4", "KCTB", "KCTA", "TST6", "KCT9", "TST5", "TST4", "KCT8", "SYT3", "KCT7", "MIT1", "MAT3", "KCT6", "TST3", "KCT5", "KCT4", "SYT2", "MAT1", "MAT2", "TST2", "KCT3", "KCT2", "KCT1", "TST1", "SYT1"]
@@ -86,7 +86,6 @@ module Jpmobile::Mobile
       str = Jpmobile::Util.sjis_to_utf8(str)
       # 数値参照を UTF-8 に変換
       Jpmobile::Emoticon::unicodecr_to_utf8(str)
-      # 半角->全角変換
     end
     def to_external(str, content_type, charset)
       # UTF-8を数値参照に
@@ -104,5 +103,32 @@ module Jpmobile::Mobile
     def default_charset
       "Shift_JIS"
     end
+
+    # メール送信用
+    def to_mail_subject(str)
+      "=?#{mail_charset}?B?" + [to_mail_encoding(str)].pack('m').strip + "?="
+    end
+    def to_mail_body(str)
+      to_mail_encoding(str)
+    end
+    def mail_charset
+      "ISO-2022-JP"
+    end
+
+    def to_mail_internal(str, val)
+      if Jpmobile::Util.jis?(str) or Jpmobile::Util.ascii_8bit?(str)
+        # 絵文字を数値参照に変換
+        str = Jpmobile::Emoticon.external_to_unicodecr_au_mail(Jpmobile::Util.jis(str))
+        str = Jpmobile::Util.jis_to_utf8(Jpmobile::Util.jis(str))
+      end
+      str
+    end
+
+    private
+    def to_mail_encoding(str)
+      str = Jpmobile::Emoticon.utf8_to_unicodecr(str)
+      str = Jpmobile::Util.utf8_to_jis(str)
+      Jpmobile::Util.jis(Jpmobile::Emoticon.unicodecr_to_au_email(str))
+    end
   end
 end

data/test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/docomo.rb

@@ -7,7 +7,7 @@ module Jpmobile::Mobile
     # 対応するUser-Agentの正規表現
     USER_AGENT_REGEXP = /^DoCoMo/
     # 対応するメールアドレスの正規表現
-    MAIL_ADDRESS_REGEXP = /^.+@docomo\.ne\.jp$/
+    MAIL_ADDRESS_REGEXP = /.+@docomo\.ne\.jp/
 
     # オープンiエリアがあればエリアコードを +String+ で返す。無ければ +nil+ を返す。
     def areacode
@@ -94,6 +94,29 @@ module Jpmobile::Mobile
       "Shift_JIS"
     end
 
+    # メール送信用
+    def to_mail_subject(str)
+      str = to_external(str, nil, nil).first
+      "=?#{mail_charset}?B?" + [str].pack('m').strip + "?="
+    end
+    def to_mail_body(str)
+      to_external(str, nil, nil).first
+    end
+    def mail_charset
+      "Shift_JIS"
+    end
+    def to_mail_internal(str, val)
+      if Jpmobile::Util.shift_jis?(str) or Jpmobile::Util.ascii_8bit?(str)
+        # 絵文字を数値参照に変換
+        str = Jpmobile::Emoticon.external_to_unicodecr_docomo(Jpmobile::Util.sjis(str))
+      end
+
+      str
+    end
+    def to_mail_body_encoded?(str)
+      Jpmobile::Util.shift_jis?(str)
+    end
+
     # i-mode ブラウザのバージョンを返す。
     # http://labs.unoh.net/2009/07/i_20.html
     def imode_browser_version