jpmobile 0.1.6 → 1.0.0.pre

data/test/rails/rails_root/spec/models/normal_mailer_spec.rb

@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe NormalMailer do
+  include Jpmobile::Util
+
+  before(:each) do
+    ActionMailer::Base.deliveries = []
+
+    @to      = ["outer@jp.mobile", "outer1@jp.mobile"]
+    @subject = "日本語題名"
+    @text    = "日本語テキスト"
+  end
+
+  context "PC宛メール" do
+    it "正常に送信できること" do
+      email = NormalMailer.msg(@to, "題名", "本文").deliver
+
+      ActionMailer::Base.deliveries.size.should == 1
+      (email.to - @to).should be_empty
+    end
+
+    it "UTF-8のままであること" do
+      email = NormalMailer.msg(@to, @subject, @text).deliver
+
+      ActionMailer::Base.deliveries.size.should == 1
+
+      raw_mail = ascii_8bit(email.to_s)
+      raw_mail.should match(/UTF-8/i)
+      raw_mail.should match(Regexp.escape("=E6=97=A5=E6=9C=AC=E8=AA=9E=E9=A1=8C=E5=90=8D"))
+      raw_mail.should match(Regexp.escape([@text].pack("m").strip))
+    end
+  end
+end

data/test/rails/rails_root/spec/requests/template_path_spec.rb

@@ -13,7 +13,7 @@ describe TemplatePathController, "DoCoMo SH902i からのアクセス" do
   it 'テンプレートの探索順が正しいこと' do
     get "/template_path/index", {}, { "HTTP_USER_AGENT" => @user_agent}
 
-    controller.view_paths.mobile_template_candidates.should == [ 'mobile_docomo', 'mobile' ]
+    controller.lookup_context.mobile.should == [ 'mobile_docomo', 'mobile' ]
   end
 end
 
@@ -24,7 +24,7 @@ describe TemplatePathController, "au CA32 からのアクセス" do
   it 'テンプレートの探索順が正しいこと' do
     get "/template_path/index", {}, { "HTTP_USER_AGENT" => @user_agent}
 
-    controller.view_paths.mobile_template_candidates.should == [ 'mobile_au', 'mobile' ]
+    controller.lookup_context.mobile.should == [ 'mobile_au', 'mobile' ]
   end
 end
 
@@ -35,7 +35,7 @@ describe TemplatePathController, "Vodafone V903T からのアクセス" do
   it 'テンプレートの探索順が正しいこと' do
     get "/template_path/index", {}, { "HTTP_USER_AGENT" => @user_agent}
 
-    controller.view_paths.mobile_template_candidates.should == [ 'mobile_vodafone', 'mobile_softbank', 'mobile' ]
+    controller.lookup_context.mobile.should == [ 'mobile_vodafone', 'mobile_softbank', 'mobile' ]
   end
 end
 
@@ -46,7 +46,7 @@ describe TemplatePathController, "SoftBank 910T からのアクセス" do
   it 'テンプレートの探索順が正しいこと' do
     get "/template_path/index", {}, { "HTTP_USER_AGENT" => @user_agent}
 
-    controller.view_paths.mobile_template_candidates.should == [ 'mobile_softbank', 'mobile' ]
+    controller.lookup_context.mobile.should == [ 'mobile_softbank', 'mobile' ]
   end
 end
 
@@ -57,7 +57,7 @@ describe TemplatePathController, "iPhone からのアクセス" do
   it 'テンプレートの探索順が正しいこと' do
     get "/template_path/index", {}, { "HTTP_USER_AGENT" => @user_agent}
 
-    controller.view_paths.mobile_template_candidates.should == [ 'smart_phone_iphone', 'smart_phone' ]
+    controller.lookup_context.mobile.should == [ 'smart_phone_iphone', 'smart_phone' ]
   end
 end
 
@@ -68,7 +68,7 @@ describe TemplatePathController, "Android からのアクセス" do
   it 'テンプレートの探索順が正しいこと' do
     get "/template_path/index", {}, { "HTTP_USER_AGENT" => @user_agent}
 
-    controller.view_paths.mobile_template_candidates.should == [ 'smart_phone_android', 'smart_phone' ]
+    controller.lookup_context.mobile.should == [ 'smart_phone_android', 'smart_phone' ]
   end
 end
 
@@ -79,7 +79,7 @@ describe TemplatePathController, "Windows Phone からのアクセス" do
   it 'テンプレートの探索順が正しいこと' do
     get "/template_path/index", {}, { "HTTP_USER_AGENT" => @user_agent}
 
-    controller.view_paths.mobile_template_candidates.should == [ 'smart_phone_windows_phone', 'smart_phone' ]
+    controller.lookup_context.mobile.should == [ 'smart_phone_windows_phone', 'smart_phone' ]
   end
 end
 
@@ -111,6 +111,12 @@ describe TemplatePathController, "integrated_views" do
 
         response.should have_tag("h1", :content => "show_mobile_docomo.html.erb")
       end
+
+      it 'disable_mobile_view! のときには index.html.erb が使用されること' do
+        get "/template_path/index", {:pc => true}, { "HTTP_USER_AGENT" => @user_agent}
+
+        response.should have_tag("h1", :content => "index.html.erb")
+      end
     end
 
     context "SoftBankからのアクセスの場合" do

data/test/rails/rails_root/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'

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

@@ -50,7 +50,8 @@ module Jpmobile
   end
   autoload :Configuration, 'jpmobile/rack'
 
-  autoload :Mailer, 'jpmobile/hook_action_mailer'
+  autoload :Mailer,   'jpmobile/mailer'
+  autoload :Resolver, 'jpmobile/resolver'
 end
 
 if defined?(Rails)

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

@@ -9,7 +9,7 @@ module Jpmobile
     %w( DOCOMO_SJIS_TO_UNICODE DOCOMO_UNICODE_TO_SJIS ).each do |const|
       autoload const, 'jpmobile/emoticon/docomo'
     end
-    %w( AU_SJIS_TO_UNICODE AU_UNICODE_TO_EMAILJIS AU_SJIS_TO_EMAIL_JIS ).each do |const|
+    %w( AU_SJIS_TO_UNICODE AU_UNICODE_TO_EMAILJIS AU_SJIS_TO_EMAIL_JIS AU_EMAILJIS_TO_UNICODE ).each do |const|
       autoload const, 'jpmobile/emoticon/au'
     end
     %w(
@@ -51,10 +51,12 @@ module Jpmobile
     # +str+ のなかでau絵文字をUnicode数値文字参照に置換した文字列を返す。(メール専用)
     def self.external_to_unicodecr_au_mail(in_str)
       str = Jpmobile::Util.ascii_8bit(in_str)
-      str.gsub(AU_EMAILJIS_REGEXP) do |match|
-        jis = match.unpack('n').first
-        unicode = AU_EMAILJIS_TO_UNICODE[jis]
-        unicode ? Jpmobile::Util.ascii_8bit("\x1b\x28\x42&#x%04x;\x1b\x24\x42"%unicode) : match
+      str.gsub(Jpmobile::Util.jis_string_regexp) do |jis_string|
+        jis_string.gsub(/[\x21-\x7e]{2}/) do |match|
+          jis = match.unpack('n').first
+          unicode = AU_EMAILJIS_TO_UNICODE[jis]
+          unicode ? Jpmobile::Util.ascii_8bit("\x1b\x28\x42&#x%04x;\x1b\x24\x42"%unicode) : match
+        end
       end
     end
 

data/test/rails/rails_root/vendor/plugins/jpmobile/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/test/rails/rails_root/vendor/plugins/jpmobile/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/test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mail.rb

@@ -38,34 +38,27 @@ module Mail
   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
+        self.charset             = @mobile.mail_charset(@charset)
 
         ready_to_send!
 
-        self.body.mobile = @mobile
+        self.body.charset = @charset
+        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)
@@ -77,56 +70,48 @@ pp self.body.charset
     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']
+      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_with_jpmobile(string)
-      # Jpmobile::Mobile class from 'From: ' header
+    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
 
-      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
+    def process_body_raw_with_jpmobile
+      process_body_raw_without_jpmobile
 
-      if content_has_from
-        @mobile = (mobile_class || Jpmobile::Mobile::AbstractMobile).new(nil, nil)
+      @body.charset = @charset
+      @body.mobile = @mobile
 
-        init_with_string_without_jpmobile(s)
+      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
 
-        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
+      if @body.multipart?
+        @body.parts.each do |p|
+          p.charset = @charset
+          p.mobile = @mobile
         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
+    def body_lazy_with_jpmobile(value, index)
+      body_lazy_without_jpmobile(value, index)
     end
 
     alias_method :encoded_without_jpmobile, :encoded
@@ -135,28 +120,71 @@ pp self.body.charset
     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
+
+    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
-      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
+      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
@@ -169,25 +197,17 @@ pp self.body.charset
     # convert encoding
     def encoded_with_jpmobile(transfer_encoding = '8bit')
       if @mobile and !multipart?
-        if @mobile.to_mail_body_encoded?(raw_source)
-          raw_source
+        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))
+          @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
 
+    def decoded_with_jpmobile
       decoded_without_jpmobile
     end
 
@@ -196,21 +216,56 @@ pp self.body.charset
       @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)
+      @mobile = m
+
       if self.multipart?
         self.parts.each do |part|
-          part.body.mobile = @mobile
-          part.body.set_encoding_jpmobile
+          part.charset      = @charset
+          part.mobile       = @mobile
+          part.body.charset = @charset
+          part.body.mobile  = @mobile
         end
       end
+    end
 
-      @mobile = m
-      self.set_encoding_jpmobile
+    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
@@ -221,19 +276,22 @@ pp self.body.charset
 
     alias_method :set_charset_without_jpmobile, :set_charset
     alias_method :set_charset, :set_charset_with_jpmobile
-  end
 
-  class UnstructuredField
-    attr_accessor :mobile
+    alias_method :preamble_without_jpmobile, :preamble
+    alias_method :preamble, :preamble_with_jpmobile
 
-    def do_decode
-      result = value.blank? ? nil : Encodings.decode_encode(value, :decode)
+    alias_method :crlf_boundary_without_jpmobile, :crlf_boundary
+    alias_method :crlf_boundary, :crlf_boundary_with_jpmobile
 
-      result = @mobile.to_mail_internal(result, value) if @mobile
+    alias_method :end_boundary_without_jpmobile, :end_boundary
+    alias_method :end_boundary, :end_boundary_with_jpmobile
 
-      # 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
+    alias_method :epilogue_without_jpmobile, :epilogue
+    alias_method :epilogue, :epilogue_with_jpmobile
+  end
+
+  class UnstructuredField
+    attr_accessor :mobile
   end
 
   # for subject
@@ -252,14 +310,7 @@ pp self.body.charset
       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