jpmobile 0.1.5 → 0.1.6

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

@@ -6,7 +6,7 @@ module Jpmobile::Mobile
   class Emobile < AbstractMobile
     USER_AGENT_REGEXP = %r{^emobile/|^Mozilla/5.0 \(H11T; like Gecko; OpenBrowser\) NetFront/3.4$|^Mozilla/4.0 \(compatible; MSIE 6.0; Windows CE; IEMobile 7.7\) S11HT$}
     # 対応するメールアドレスの正規表現
-    MAIL_ADDRESS_REGEXP = /^.+@emnet\.ne\.jp$/
+    MAIL_ADDRESS_REGEXP = /.+@emnet\.ne\.jp/
     # EMnet対応端末から通知されるユニークなユーザIDを取得する。
     def em_uid
       @request.env['HTTP_X_EM_UID']

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

@@ -8,7 +8,7 @@ module Jpmobile::Mobile
     # 対応するuser-agentの正規表現
     USER_AGENT_REGEXP = /^(?:SoftBank|Semulator)/
     # 対応するメールアドレスの正規表現　ディズニーモバイル対応
-    MAIL_ADDRESS_REGEXP = /^.+@(?:softbank\.ne\.jp|disney\.ne\.jp)$/
+    MAIL_ADDRESS_REGEXP = /.+@(?:softbank\.ne\.jp|disney\.ne\.jp)/
 
     # 製造番号を返す。無ければ +nil+ を返す。
     def serial_number
@@ -58,5 +58,38 @@ module Jpmobile::Mobile
 
       [str, charset]
     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
+      "Shift_JIS"
+    end
+    def to_mail_internal(str, val)
+      # 絵文字を数値参照に変換
+      if Jpmobile::Util.shift_jis?(str) or Jpmobile::Util.ascii_8bit?(str)
+        # Shift_JIS
+        str = Jpmobile::Emoticon.external_to_unicodecr_softbank_sjis(Jpmobile::Util.sjis(str))
+      elsif Jpmobile::Util.utf8?(str)
+        # UTF-8
+        str = Jpmobile::Emoticon.external_to_unicodecr_softbank(Jpmobile::Util.utf8(str))
+      end
+
+      str
+    end
+    def to_mail_body_encoded?(str)
+      Jpmobile::Util.shift_jis?(str)
+    end
+
+    private
+    def to_mail_encoding(str)
+      str = Jpmobile::Emoticon.utf8_to_unicodecr(str)
+      str = Jpmobile::Util.utf8_to_sjis(str)
+      Jpmobile::Emoticon.unicodecr_to_softbank_email(str)
+    end
   end
 end

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

@@ -7,7 +7,7 @@ module Jpmobile::Mobile
     # 対応するUser-Agentの正規表現
     USER_AGENT_REGEXP = /^(Vodafone|Vemulator)/
     # 対応するメールアドレスの正規表現
-    MAIL_ADDRESS_REGEXP = /^.+@[dhtcrknsq]\.vodafone\.ne\.jp$/
+    MAIL_ADDRESS_REGEXP = /.+@[dhtcrknsq]\.vodafone\.ne\.jp/
 
     # cookieに対応しているか？
     def supports_cookie?

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

@@ -7,7 +7,7 @@ module Jpmobile::Mobile
     # 対応するUser-Agentの正規表現
     USER_AGENT_REGEXP = /^Mozilla\/3.0\(WILLCOM/
     # 対応するメールアドレスの正規表現
-    MAIL_ADDRESS_REGEXP = /^.+@(.+\.)?pdx\.ne\.jp$/
+    MAIL_ADDRESS_REGEXP = /.+@((.+\.)?pdx\.ne\.jp|willcom\.com)/
 
     # 位置情報があれば Position のインスタンスを返す。無ければ +nil+ を返す。
     def position

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

@@ -1,6 +1,16 @@
+# -*- coding: utf-8 -*-
 require 'tempfile'
 module Jpmobile
   module Util
+    # SJIS   = "Shift_JIS"
+    SJIS   = "Windows-31J"
+    UTF8   = "UTF-8"
+    JIS    = "ISO-2022-JP"
+    BINARY = "ASCII-8BIT"
+
+    WAVE_DASH = [0x301c].pack("U")
+    FULLWIDTH_TILDE = [0xff5e].pack("U")
+
     module_function
     def deep_apply(obj, &proc)
       case obj
@@ -10,11 +20,12 @@ module Jpmobile
         end
       when Array
         obj.collect!{|value| deep_apply(value, &proc)}
-      when NilClass, TrueClass, FalseClass, Tempfile, StringIO
-        return obj
-      else
+      when String
         obj = obj.to_param if obj.respond_to?(:to_param)
         proc.call(obj)
+      else
+        # NilClass, TrueClass, FalseClass, Tempfile, StringIO, etc...
+        return obj
       end
     end
 
@@ -32,11 +43,12 @@ module Jpmobile
         end
       when Symbol
         new_obj = proc.call(obj.to_s).to_sym
-      when NilClass, TrueClass, FalseClass, Tempfile, StringIO
-        new_obj = obj
-      else
+      when String
         obj = obj.to_param if obj.respond_to?(:to_param)
         new_obj = proc.call(obj)
+      else
+        # NilClass, TrueClass, FalseClass, Tempfile, StringIO, etc...
+        new_obj = obj
       end
 
       new_obj
@@ -44,38 +56,67 @@ module Jpmobile
 
     def sjis(ascii_8bit)
       if ascii_8bit.respond_to?(:force_encoding)
-        ascii_8bit.force_encoding("Shift_JIS")
+        ascii_8bit.force_encoding(SJIS)
       end
       ascii_8bit
     end
 
     def utf8(ascii_8bit)
       if ascii_8bit.respond_to?(:force_encoding)
-        ascii_8bit.force_encoding("utf-8")
+        ascii_8bit.force_encoding(UTF8)
+      end
+      ascii_8bit
+    end
+
+    def jis(ascii_8bit)
+      if ascii_8bit.respond_to?(:force_encoding)
+        ascii_8bit.force_encoding(JIS)
       end
       ascii_8bit
     end
 
     def ascii_8bit(str)
       if str.respond_to?(:force_encoding)
-        str.force_encoding("ASCII-8BIT")
+        str.force_encoding(BINARY)
       end
       str
     end
 
     def utf8_to_sjis(utf8_str)
+      # 波ダッシュ対策
+      utf8_str = wavedash_to_fullwidth_tilde(utf8_str)
+
       if utf8_str.respond_to?(:encode)
-        utf8_str.encode("Shift_JIS", :crlf_newline => true)
+        utf8_str.encode(SJIS, :crlf_newline => true)
       else
         NKF.nkf("-m0 -x -W --oc=cp932", utf8_str).gsub(/\n/, "\r\n")
       end
     end
 
     def sjis_to_utf8(sjis_str)
-      if sjis_str.respond_to?(:encode)
-        sjis_str.encode("UTF-8", :universal_newline => true)
+      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")
+                 end
+
+      # 波ダッシュ対策
+      fullwidth_tilde_to_wavedash(utf8_str)
+    end
+
+    def utf8_to_jis(utf8_str)
+      if utf8_str.respond_to?(:encode)
+        utf8_str.encode(JIS, :crlf_newline => true)
       else
-        NKF.nkf("-m0 -x -w --ic=cp932", sjis_str).gsub(/\r\n/, "\n")
+        NKF.nkf("-m0 -x -Wj", utf8_str).gsub(/\n/, "\r\n")
+      end
+    end
+
+    def jis_to_utf8(jis_str)
+      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")
       end
     end
 
@@ -87,11 +128,171 @@ module Jpmobile
       end
     end
 
+    def regexp_to_sjis(sjis_str)
+      if Object.const_defined?(:Encoding)
+        Regexp.compile(Regexp.escape(sjis(sjis_str)))
+      else
+        Regexp.compile(Regexp.escape(sjis_str,"s"),nil,'s')
+      end
+    end
+
     def hash_to_utf8(hash)
       new_hash = {}
       hash.each do |keu, value|
         new_hash[utf8(key)] = utf8(value)
       end
     end
+
+    def sjis_regexp(sjis)
+      sjis_str = sjis.kind_of?(Numeric) ? [sjis].pack('n') : sjis
+
+      if Object.const_defined?(:Encoding)
+        Regexp.compile(Regexp.escape(sjis_str.force_encoding(SJIS)))
+      else
+        Regexp.compile(Regexp.escape(sjis_str,"s"),nil,'s')
+      end
+    end
+
+    def jis_regexp(jis)
+      jis_str = jis.kind_of?(Numeric) ? [jis].pack('n') : jis
+
+      if Object.const_defined?(:Encoding)
+        Regexp.compile(Regexp.escape(jis_str.force_encoding("stateless-ISO-2022-JP-KDDI"))) # for au only
+      else
+        Regexp.compile(Regexp.escape(jis_str,"j"),nil,'j')
+      end
+    end
+
+    def encode(str, charset)
+      if Object.const_defined?(:Encoding)
+        str.encode(charset)
+      else
+        case charset
+        when /iso-2022-jp/i
+          NKF.nkf("-j", str)
+        when /shift_jis/i
+          NKF.nkf("-s", str)
+        when /utf-8/i
+          NKF.nkf("-w", str)
+        else
+          str
+        end
+      end
+    end
+
+    def wavedash_to_fullwidth_tilde(utf8_str)
+      utf8_str.gsub(WAVE_DASH, FULLWIDTH_TILDE)
+    end
+
+    def fullwidth_tilde_to_wavedash(utf8_str)
+      utf8_str.gsub(FULLWIDTH_TILDE, WAVE_DASH)
+    end
+
+    def force_encode(str, from, to)
+      s = str.dup
+      return str if detect_encoding(str) == to
+
+      if Object.const_defined?(:Encoding)
+        to = SJIS if to =~ /shift_jis/i
+
+        to_enc = ::Encoding.find(to)
+        return str if s.encoding == to_enc
+
+        if from
+          from_enc = ::Encoding.find(from)
+          s.force_encoding(from) unless s.encoding == from_enc
+        end
+
+        s.encode(to)
+      else
+        opt = []
+        opt << case from
+               when /iso-2022-jp/i
+                 "-Jx"
+               when /shift_jis/i
+                 "-Sx"
+               when /utf-8/i
+                 "-Wx"
+               else
+                 ""
+               end
+        opt << case to
+               when /iso-2022-jp/i
+                 "-j"
+               when /shift_jis/i, /windows_31j/i
+                 "-s"
+               when /utf-8/i
+                 "-w"
+               else
+                 ""
+               end
+        NKF.nkf(opt.join(" "), str)
+      end
+    end
+
+    def set_encoding(str, encoding)
+      if encoding and Object.const_defined?(:Encoding)
+        encoding = SJIS if encoding =~ /shift_jis/i
+        str.force_encoding(encoding)
+      end
+
+      str
+    end
+
+    def extract_charset(str)
+      case str
+      when /iso-2022-jp/i
+        "ISO-2022-JP"
+      when /shift_jis/i
+        "Shift_JIS"
+      when /utf-8/i
+        "UTF-8"
+      else
+        ""
+      end
+    end
+
+    def detect_encoding(str)
+      if Object.const_defined?(:Encoding)
+        case str.encoding
+        when ::Encoding::ISO2022_JP
+          JIS
+        when ::Encoding::Shift_JIS, ::Encoding::Windows_31J, ::Encoding::CP932
+          SJIS
+        when ::Encoding::UTF_8
+          UTF8
+        when ::Encoding::ASCII_8BIT
+          BINARY
+        else
+          BINARY
+        end
+      else
+        case NKF.guess(str)
+        when NKF::SJIS
+          SJIS
+        when NKF::JIS
+          JIS
+        when NKF::UTF8
+          UTF8
+        when NKF::BINARY
+          BINARY
+        else
+          BINARY
+        end
+      end
+    end
+
+    def ascii_8bit?(str)
+      detect_encoding(str) == BINARY
+    end
+    def utf8?(str)
+      detect_encoding(str) == UTF8
+    end
+    def shift_jis?(str)
+      detect_encoding(str) == SJIS
+    end
+    def jis?(str)
+      detect_encoding(str) == JIS
+    end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Yoji Shidara
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-20 00:00:00 +09:00
+date: 2011-01-21 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -395,6 +395,7 @@ files:
 - test/rails/rails_root/app/controllers/trans_sid_mobile_controller.rb
 - test/rails/rails_root/app/controllers/trans_sid_none_controller.rb
 - test/rails/rails_root/app/helpers/application_helper.rb
+- test/rails/rails_root/app/models/mobile_mailer.rb
 - test/rails/rails_root/app/models/user.rb
 - test/rails/rails_root/autotest/discover.rb
 - test/rails/rails_root/config/application.rb
@@ -415,6 +416,7 @@ files:
 - test/rails/rails_root/db/schema.rb
 - test/rails/rails_root/db/seeds.rb
 - test/rails/rails_root/spec/helpers/helpers_spec.rb
+- test/rails/rails_root/spec/models/mobile_mailer_spec.rb
 - test/rails/rails_root/spec/requests/docomo_guid_spec.rb
 - test/rails/rails_root/spec/requests/docomo_spec.rb
 - test/rails/rails_root/spec/requests/emobile_spec.rb
@@ -455,7 +457,9 @@ files:
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/filter.rb
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/helpers.rb
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/hook_action_controller.rb
+- test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/hook_action_mailer.rb
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/hook_action_view.rb
+- test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mail.rb
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/abstract_mobile.rb
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/android.rb
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/au.rb
@@ -604,6 +608,7 @@ test_files:
 - test/rails/rails_root/app/controllers/trans_sid_mobile_controller.rb
 - test/rails/rails_root/app/controllers/trans_sid_none_controller.rb
 - test/rails/rails_root/app/helpers/application_helper.rb
+- test/rails/rails_root/app/models/mobile_mailer.rb
 - test/rails/rails_root/app/models/user.rb
 - test/rails/rails_root/autotest/discover.rb
 - test/rails/rails_root/config/application.rb
@@ -624,6 +629,7 @@ test_files:
 - test/rails/rails_root/db/schema.rb
 - test/rails/rails_root/db/seeds.rb
 - test/rails/rails_root/spec/helpers/helpers_spec.rb
+- test/rails/rails_root/spec/models/mobile_mailer_spec.rb
 - test/rails/rails_root/spec/requests/docomo_guid_spec.rb
 - test/rails/rails_root/spec/requests/docomo_spec.rb
 - test/rails/rails_root/spec/requests/emobile_spec.rb
@@ -664,7 +670,9 @@ test_files:
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/filter.rb
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/helpers.rb
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/hook_action_controller.rb
+- test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/hook_action_mailer.rb
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/hook_action_view.rb
+- test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mail.rb
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/abstract_mobile.rb
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/android.rb
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/au.rb