jpmobile 0.1.6 → 1.0.0.pre

data/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/lib/jpmobile/hook_action_controller.rb

@@ -1,17 +1,4 @@
 # -*- coding: utf-8 -*-
-module AbstractController
-  module ViewPaths
-    def lookup_context_with_jpmobile
-      jpmobile_context = lookup_context_without_jpmobile
-      jpmobile_context.view_paths.controller = self
-
-      jpmobile_context
-    end
-
-    alias_method_chain :lookup_context, :jpmobile
-  end
-end
-
 module ActionController
   class Base
     include Jpmobile::Helpers
@@ -29,3 +16,4 @@ module ActionController
 end
 
 ActionController::Request.send :include, Jpmobile::Encoding
+ActionView::LookupContext.register_detail(:mobile) {nil}

data/lib/jpmobile/hook_action_view.rb

@@ -1,72 +1,12 @@
 # -*- coding: utf-8 -*-
-# = viewの自動切り替え
-#
 #:stopdoc:
 # helperを追加
 ActionView::Base.class_eval { include Jpmobile::Helpers }
 #:startdoc:
 
-# ActionView を拡張して携帯からのアクセスの場合に携帯向けビューを優先表示する。
-# Vodafone携帯(request.mobile == Jpmobile::Mobile::Vodafone)の場合、
-#   index_mobile_vodafone.html.erb
-#   index_mobile_softbank.html.erb
-#   index_mobile.html.erb
-#   index.html.erb
-# の順にテンプレートが検索される。
-# BUG: 現状、上記の例では index.html.erb が存在しない場合に振り分けが行われない
-# (ダミーファイルを置くことで回避可能)。
+# :stopdoc:
+# accept-charset に charset を変更できるようにする
 module ActionView
-  class PathSet
-    attr_accessor :controller
-
-    def find_with_jpmobile(path, prefix = nil, partial = false, details = {}, key = nil) #:nodoc:
-      if controller and controller.kind_of?(ActionController::Base) and
-          (controller.request.mobile? or controller.request.smart_phone?)
-        return path if path.respond_to?(:render)
-        template_candidates = mobile_template_candidates
-
-        each do |load_path|
-          template_candidates.each do |template_postfix|
-            templates = load_path.find_all("#{path}_#{template_postfix}", prefix, partial, details, key)
-            return templates.first unless templates.empty?
-          end
-        end
-      end
-
-      find_without_jpmobile(path, prefix, partial, details, key)
-    end
-
-    alias_method_chain :find, :jpmobile  #:nodoc:
-
-    def mobile_template_candidates #:nodoc:
-      candidates = []
-
-      view_class, parent_class, template_prefix = case controller.request.mobile
-      when ::Jpmobile::Mobile::SmartPhone
-        [controller.request.mobile.class, ::Jpmobile::Mobile::SmartPhone, "smart_phone"]
-      when ::Jpmobile::Mobile::AbstractMobile
-        [controller.request.mobile.class, ::Jpmobile::Mobile::AbstractMobile, "mobile"]
-      else
-        [nil, nil, nil]
-      end
-
-      if view_class and parent_class
-        find_mobile_template(view_class, parent_class, template_prefix).push(template_prefix)
-      else
-        []
-      end
-    end
-
-    private
-    def find_mobile_template(klass, parent, prefix)
-      if klass == parent
-        []
-      else
-        find_mobile_template(klass.superclass, parent, prefix).unshift("#{prefix}_#{klass.to_s.split(/::/).last.underscore}")
-      end
-    end
-  end
-
   module Helpers
     module FormTagHelper
       private
@@ -85,3 +25,4 @@ module ActionView
     end
   end
 end
+#:startdoc:

data/lib/jpmobile/mail.rb

@@ -0,0 +1,316 @@
+# -*- 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 mobile=(m)
+      @mobile  = m
+      @charset = m.mail_charset(@charset)
+
+      if @body
+        @body.charset = @charset
+        @body.mobile = m
+      end
+    end
+
+    def encoded_with_jpmobile
+      if @mobile
+        header['subject'].mobile = @mobile if header['subject']
+        self.charset             = @mobile.mail_charset(@charset)
+
+        ready_to_send!
+
+        self.body.charset = @charset
+        self.body.mobile  = @mobile
+        self.header['Content-Transfer-Encoding'] = '8bit'
+
+        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
+      header_part, body_part = raw_source.split(/#{CRLF}#{WSP}*#{CRLF}/m, 2)
+
+      self.header = header_part
+
+      @body_part_jpmobile = body_part
+      convert_encoding_jpmobile
+      body_part = @body_part_jpmobile
+
+      self.body   = body_part
+    end
+
+    def init_with_string(string)
+      # convert to ASCII-8BIT for ascii incompatible encodings
+      s = Jpmobile::Util.ascii_8bit(string)
+      self.raw_source = s
+      set_envelope_header
+      parse_message
+      @separate_parts = multipart?
+    end
+
+    def process_body_raw_with_jpmobile
+      process_body_raw_without_jpmobile
+
+      @body.charset = @charset
+      @body.mobile = @mobile
+
+      if has_content_transfer_encoding? and
+          ["base64", "quoted-printable"].include?(content_transfer_encoding) and
+          ["text", nil].include?(@mobile_main_type)
+        @body.decode_transfer_encoding
+      end
+
+      if @body.multipart?
+        @body.parts.each do |p|
+          p.charset = @charset
+          p.mobile = @mobile
+        end
+      end
+    end
+
+    def body_lazy_with_jpmobile(value, index)
+      body_lazy_without_jpmobile(value, index)
+    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 :process_body_raw_without_jpmobile, :process_body_raw
+    alias_method :process_body_raw, :process_body_raw_with_jpmobile
+
+    alias_method :body_lazy_without_jpmobile, :body_lazy
+    alias_method :body_lazy, :body_lazy_with_jpmobile
+
+    private
+    def convert_encoding_jpmobile
+      # decide mobile carrier
+      if self.header['From']
+        mobile_class = Jpmobile::Email.detect_from_mail_header(self.header['From'].value)
+        @mobile ||= (mobile_class || Jpmobile::Mobile::AbstractMobile ).new(nil, nil)
+      end
+
+      # override charset
+      if self.header['Content-Type']
+        @charset = Jpmobile::Util.extract_charset(self.header['Content-Type'].value)
+        self.header['Content-Type'].parameters[:charset] = @charset
+        @mobile_main_type = self.header['Content-Type'].main_type
+      end
+
+      # convert header(s)
+      if self.header['Subject']
+        subject_charset = Jpmobile::Util.extract_charset(self.header['Subject'].value)
+
+        # override subject encoding if @charset is blank
+        @charset = subject_charset if !subject_charset.blank? and @charset.blank?
+
+        self.header['Subject'].charset = subject_charset
+
+        if @mobile
+          v = @mobile.to_mail_internal(
+            Encodings.value_decode(self.header['Subject'].value), subject_charset)
+          self.header['Subject'].value = Jpmobile::Util.force_encode(v, @mobile.mail_charset(@charset), Jpmobile::Util::UTF8)
+        end
+      end
+
+      if @body_part_jpmobile and @mobile
+        @body_part_jpmobile = @mobile.decode_transfer_encoding(@body_part_jpmobile, @charset)
+      end
+    end
+  end
+
+  class Part
+    def init_with_string(string)
+      self.raw_source = string
+      set_envelope_header
+      parse_message
+      @separate_parts = multipart?
+    end
+
+    def parse_message_with_jpmobile
+      header_part, body_part = raw_source.split(/#{CRLF}#{WSP}*#{CRLF}/m, 2)
+
+      if header_part =~ HEADER_LINE
+        self.header = header_part
+      else
+        self.header = "Content-Type: text/plain\r\n"
+      end
+
+      @body_part_jpmobile = body_part
+      convert_encoding_jpmobile
+      body_part = @body_part_jpmobile
+
+      self.body   = body_part
+    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
+      decoded_without_jpmobile
+    end
+
+    # fix charset
+    def set_charset_with_jpmobile
+      @charset ||= only_us_ascii? ? 'US-ASCII' : nil
+    end
+
+    def mobile=(m)
+      @mobile = m
+
+      if self.multipart?
+        self.parts.each do |part|
+          part.charset      = @charset
+          part.mobile       = @mobile
+          part.body.charset = @charset
+          part.body.mobile  = @mobile
+        end
+      end
+    end
+
+    def decode_transfer_encoding
+      _raw_source = Encodings.get_encoding(encoding).decode(@raw_source)
+      _raw_source = Jpmobile::Util.set_encoding(_raw_source, @charset)
+
+      @raw_source = @mobile.decode_transfer_encoding(_raw_source, @charset)
+    end
+
+    def preamble_with_jpmobile
+      if @mobile
+        Jpmobile::Util.encode(@preamble, @charset)
+      else
+        preamble_without_jpmobile
+      end
+    end
+
+    def epilogue_with_jpmobile
+      if @mobile
+        Jpmobile::Util.encode(@epilogue, @charset)
+      else
+        epilogue_without_jpmobile
+      end
+    end
+
+    def crlf_boundary_with_jpmobile
+      if @mobile
+        Jpmobile::Util.encode(crlf_boundary_without_jpmobile, @charset)
+      else
+        epilogue_without_jpmobile
+      end
+    end
+
+    def end_boundary_with_jpmobile
+      if @mobile
+        Jpmobile::Util.encode(end_boundary_without_jpmobile, @charset)
+      else
+        epilogue_without_jpmobile
+      end
+    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
+
+    alias_method :preamble_without_jpmobile, :preamble
+    alias_method :preamble, :preamble_with_jpmobile
+
+    alias_method :crlf_boundary_without_jpmobile, :crlf_boundary
+    alias_method :crlf_boundary, :crlf_boundary_with_jpmobile
+
+    alias_method :end_boundary_without_jpmobile, :end_boundary
+    alias_method :end_boundary, :end_boundary_with_jpmobile
+
+    alias_method :epilogue_without_jpmobile, :epilogue
+    alias_method :epilogue, :epilogue_with_jpmobile
+  end
+
+  class UnstructuredField
+    attr_accessor :mobile
+  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
+
+    alias_method :encoded_without_jpmobile, :encoded
+    alias_method :encoded, :encoded_with_jpmobile
+  end
+end