jpmobile 0.1.6 → 1.0.0.pre

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

@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+require 'jpmobile/mail'
+
+module Jpmobile
+  module Mailer
+    class Base < ActionMailer::Base
+      self._view_paths = self._view_paths.dup
+      self.view_paths.unshift(Jpmobile::Resolver.new(File.join(::Rails.root, "app/views")))
+
+      def mail(headers={}, &block)
+        tos = headers[:to].split(/,/)
+
+        @mobile = if tos.size == 1
+                    # for mobile
+                    (Jpmobile::Email.detect(tos.first) || Jpmobile::Mobile::AbstractMobile).new(nil, nil)
+                  else
+                    # for multi to addresses
+                    Jpmobile::Mobile::AbstractMobile.new(nil, nil)
+                  end
+        self.lookup_context.mobile = @mobile.variants
+
+        m = super(headers, &block)
+
+        m.mobile  = @mobile
+        m.charset = @mobile.mail_charset
+
+        m
+      end
+    end
+  end
+end

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

@@ -4,6 +4,9 @@ require 'ipaddr'
 module Jpmobile::Mobile
   # 携帯電話の抽象クラス。
   class AbstractMobile
+    # メールのデフォルトのcharset
+    MAIL_CHARSET = "ISO-2022-JP"
+
     def initialize(env, request)
       @env     = env
       @request = request
@@ -66,6 +69,29 @@ module Jpmobile::Mobile
       "UTF-8"
     end
 
+    # for view selector
+    def variants
+      return @_variants if @_variants
+
+      @_variants = self.class.ancestors.select {|c| c.to_s =~ /^Jpmobile/}.map do |klass|
+        klass = klass.to_s.
+          gsub(/Jpmobile::/, '').
+          gsub(/AbstractMobile::/, '').
+          gsub(/Mobile::SmartPhone/, 'smart_phone').
+          gsub(/::/, '_').
+          gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').
+          gsub(/([a-z\d])([A-Z])/, '\1_\2').
+          downcase
+        klass =~ /abstract/ ? "mobile" : klass
+      end
+
+      if @_variants.include?("smart_phone")
+        @_variants = @_variants.reject{|v| v == "mobile"}.map{|v| v.gsub(/mobile/, "smart_phone")}
+      end
+
+      @_variants
+    end
+
     # メール送信用
     def to_mail_subject(str)
       "=?#{mail_charset}?B?" + [to_mail_encoding(str)].pack('m').strip + "?="
@@ -73,8 +99,8 @@ module Jpmobile::Mobile
     def to_mail_body(str)
       to_mail_encoding(str)
     end
-    def mail_charset
-      "ISO-2022-JP"
+    def mail_charset(charset = nil)
+      (charset.nil? or charset == "") ? self.class::MAIL_CHARSET : charset
     end
     def to_mail_encoding(str)
       str = Jpmobile::Emoticon.unicodecr_to_external(str, Jpmobile::Emoticon::CONVERSION_TABLE_TO_PC_EMAIL, false)
@@ -90,7 +116,7 @@ module Jpmobile::Mobile
         str
       end
     end
-    def to_mail_internal(str, val)
+    def to_mail_internal(str, charset)
       str
     end
     def to_mail_subject_encoded?(str)
@@ -99,6 +125,11 @@ module Jpmobile::Mobile
     def to_mail_body_encoded?(str)
       Jpmobile::Util.jis?(str)
     end
+    def decode_transfer_encoding(body, charset)
+      body = Jpmobile::Util.set_encoding(body, charset)
+      body = to_mail_internal(body, nil)
+      Jpmobile::Util.force_encode(body, charset, Jpmobile::Util::UTF8)
+    end
 
     # リクエストがこのクラスに属するか調べる
     # メソッド名に関して非常に不安

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

@@ -111,12 +111,9 @@ module Jpmobile::Mobile
     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)
+    def to_mail_internal(str, charset)
+      if Jpmobile::Util.jis?(str) or Jpmobile::Util.ascii_8bit?(str) or charset == mail_charset
         # 絵文字を数値参照に変換
         str = Jpmobile::Emoticon.external_to_unicodecr_au_mail(Jpmobile::Util.jis(str))
         str = Jpmobile::Util.jis_to_utf8(Jpmobile::Util.jis(str))

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

@@ -8,6 +8,8 @@ module Jpmobile::Mobile
     USER_AGENT_REGEXP = /^DoCoMo/
     # 対応するメールアドレスの正規表現
     MAIL_ADDRESS_REGEXP = /.+@docomo\.ne\.jp/
+    # メールのデフォルトのcharset
+    MAIL_CHARSET = "Shift_JIS"
 
     # オープンiエリアがあればエリアコードを +String+ で返す。無ければ +nil+ を返す。
     def areacode
@@ -102,11 +104,8 @@ module Jpmobile::Mobile
     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)
+    def to_mail_internal(str, charset)
+      if Jpmobile::Util.shift_jis?(str) or Jpmobile::Util.ascii_8bit?(str) or charset == mail_charset
         # 絵文字を数値参照に変換
         str = Jpmobile::Emoticon.external_to_unicodecr_docomo(Jpmobile::Util.sjis(str))
       end

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

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

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

@@ -0,0 +1,40 @@
+module Jpmobile
+  class PathSet < Array
+    %w(initialize << concat insert push unshift).each do |method|
+      class_eval <<-METHOD, __FILE__, __LINE__ + 1
+        def #{method}(*args)
+          super
+          typecast!
+        end
+      METHOD
+    end
+
+    def find(path, prefix = nil, partial = false, details = {}, key = nil)
+      template = find_all(path, prefix, partial, details, key).first
+      raise MissingTemplate.new(self, "#{prefix}/#{path}", details, partial) unless template
+      template
+    end
+
+    def find_all(*args)
+      each do |resolver|
+        templates = resolver.find_all(*args)
+        return templates unless templates.empty?
+      end
+      []
+    end
+
+    def exists?(*args)
+      find_all(*args).any?
+    end
+
+    protected
+
+    def typecast!
+      each_with_index do |path, i|
+        path = path.to_s if path.is_a?(Pathname)
+        next unless path.is_a?(String)
+        self[i] = Jpmobile::Resolver.new(path)
+      end
+    end
+  end
+end

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

@@ -37,7 +37,7 @@ module Jpmobile
           k, v = param_pair.split("=")
           k = to_internal(k) if k
           v = to_internal(v) if v
-          new_array << "#{k}=#{v}" if k and v
+          new_array << "#{k}=#{v}" if k
         end
 
         new_array.join("&")

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

@@ -21,3 +21,27 @@ ActiveSupport.on_load(:before_configuration) do
     end
   end
 end
+
+module Jpmobile
+  module ViewSelector
+    def self.included(base)
+      base.class_eval do
+        before_filter :register_mobile
+
+        self._view_paths = self._view_paths.dup
+        self.view_paths.unshift(Jpmobile::Resolver.new(File.join(Rails.root, "app/views")))
+      end
+    end
+
+    def register_mobile
+      if request.mobile
+        # register mobile
+        self.lookup_context.mobile = request.mobile.variants
+      end
+    end
+
+    def disable_mobile_view!
+      self.lookup_context.mobile = nil
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+module Jpmobile
+  class Resolver < ActionView::FileSystemResolver
+    # EXTENSION_ORDER = [:variants, :locale, :formats, :handlers]
+
+    def find_templates(name, prefix, partial, details)
+      path = build_path(name, prefix, partial, details)
+      query(path, EXTENSION_ORDER.map { |ext| details[ext] }, details[:formats], details[:mobile])
+    end
+
+    def build_path(name, prefix, partial, details)
+      path = ""
+      path << "#{prefix}/" unless prefix.empty?
+      path << (partial ? "_#{name}" : name)
+      path
+    end
+
+    def query(path, exts, formats, mobile)
+      query = File.join(@path, path)
+      query << '{' << mobile.map {|v| "_#{v}"}.join(',') << ',}' if mobile and mobile.respond_to?(:map)
+
+      exts.each do |ext|
+        query << '{' << ext.map {|e| e && ".#{e}" }.join(',') << ',}'
+      end
+
+      query.gsub!(/\{\.html,/, "{.html,.text.html,")
+      query.gsub!(/\{\.text,/, "{.text,.text.plain,")
+
+      Dir[query].reject { |p| File.directory?(p) }.map do |p|
+        handler, format = extract_handler_and_format(p, formats)
+
+        contents = File.open(p, "rb") {|io| io.read }
+
+        ActionView::Template.new(contents, File.expand_path(p), handler,
+          :virtual_path => path, :format => format)
+      end
+    end
+  end
+end

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

@@ -54,29 +54,29 @@ module Jpmobile
       new_obj
     end
 
-    def sjis(ascii_8bit)
-      if ascii_8bit.respond_to?(:force_encoding)
-        ascii_8bit.force_encoding(SJIS)
+    def sjis(str)
+      if str.respond_to?(:force_encoding) and !shift_jis?(str)
+        str.force_encoding(SJIS)
       end
-      ascii_8bit
+      str
     end
 
-    def utf8(ascii_8bit)
-      if ascii_8bit.respond_to?(:force_encoding)
-        ascii_8bit.force_encoding(UTF8)
+    def utf8(str)
+      if str.respond_to?(:force_encoding) and !utf8?(str)
+        str.force_encoding(UTF8)
       end
-      ascii_8bit
+      str
     end
 
-    def jis(ascii_8bit)
-      if ascii_8bit.respond_to?(:force_encoding)
-        ascii_8bit.force_encoding(JIS)
+    def jis(str)
+      if str.respond_to?(:force_encoding) and !jis?(str)
+        str.force_encoding(JIS)
       end
-      ascii_8bit
+      str
     end
 
     def ascii_8bit(str)
-      if str.respond_to?(:force_encoding)
+      if str.respond_to?(:force_encoding) and !ascii_8bit?(str)
         str.force_encoding(BINARY)
       end
       str
@@ -157,25 +157,34 @@ module Jpmobile
       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
+        # Regexp.compile(Regexp.escape(jis_str.force_encoding("stateless-ISO-2022-JP-KDDI"))) # for au only
+        Regexp.compile(Regexp.escape(jis_str.force_encoding(BINARY))) # for au only
       else
         Regexp.compile(Regexp.escape(jis_str,"j"),nil,'j')
       end
     end
 
+    def jis_string_regexp
+      Regexp.compile(Regexp.escape(ascii_8bit("\x1b\x24\x42")) + "(.+)" + Regexp.escape(ascii_8bit("\x1b\x28\x42")))
+    end
+
     def encode(str, charset)
       if Object.const_defined?(:Encoding)
-        str.encode(charset)
+        (charset.nil? or charset == "" or str.nil? or str == "") ? str : 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
+        if str.nil?
           str
+        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
     end
@@ -233,6 +242,7 @@ module Jpmobile
     def set_encoding(str, encoding)
       if encoding and Object.const_defined?(:Encoding)
         encoding = SJIS if encoding =~ /shift_jis/i
+
         str.force_encoding(encoding)
       end
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jpmobile
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
-  - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 0
+  - 0
+  - pre
+  version: 1.0.0.pre
 platform: ruby
 authors: 
 - Yoji Shidara
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-21 00:00:00 +09:00
+date: 2011-01-28 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -270,11 +271,13 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
+- README
 - README.rdoc
 files: 
 - CHANGELOG
 - Gemfile
 - MIT-LICENSE
+- README
 - README.rdoc
 - Rakefile
 - VERSION.yml
@@ -295,6 +298,8 @@ files:
 - lib/jpmobile/helpers.rb
 - lib/jpmobile/hook_action_controller.rb
 - lib/jpmobile/hook_action_view.rb
+- lib/jpmobile/mail.rb
+- lib/jpmobile/mailer.rb
 - lib/jpmobile/mobile/abstract_mobile.rb
 - lib/jpmobile/mobile/android.rb
 - lib/jpmobile/mobile/au.rb
@@ -307,6 +312,7 @@ files:
 - lib/jpmobile/mobile/vodafone.rb
 - lib/jpmobile/mobile/willcom.rb
 - lib/jpmobile/mobile/windows_phone.rb
+- lib/jpmobile/path_set.rb
 - lib/jpmobile/position.rb
 - lib/jpmobile/rack.rb
 - lib/jpmobile/rack/filter.rb
@@ -314,6 +320,7 @@ files:
 - lib/jpmobile/rack/params_filter.rb
 - lib/jpmobile/rails.rb
 - lib/jpmobile/request_with_mobile.rb
+- lib/jpmobile/resolver.rb
 - lib/jpmobile/trans_sid.rb
 - lib/jpmobile/util.rb
 - lib/tasks/jpmobile_tasks.rake
@@ -337,12 +344,14 @@ files:
 - spec/rack_helper.rb
 - spec/spec_helper.rb
 - spec/unit/detect_by_email_spec.rb
+- spec/unit/emoticon_spec.rb
+- spec/unit/encoding_spec.rb
 - spec/unit/is_carrier_spec.rb
+- spec/unit/mail_spec.rb
+- spec/unit/receive_mail_spec.rb
 - spec/unit/spec_helper.rb
 - spec/unit/util_spec.rb
 - spec/unit/valid_ip_spec.rb
-- test/legacy/emoticon_test.rb
-- test/legacy/helper.rb
 - test/rails/overrides/app/controllers/application_controller.rb
 - test/rails/overrides/app/controllers/docomo_guid_always_controller.rb
 - test/rails/overrides/app/controllers/docomo_guid_base_controller.rb
@@ -360,6 +369,8 @@ 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/models/user.rb
 - test/rails/overrides/autotest/discover.rb
 - test/rails/overrides/config/initializers/jpmobile_generator.rb
@@ -367,6 +378,8 @@ files:
 - test/rails/overrides/db/migrate/001_add_sessions_table.rb
 - test/rails/overrides/db/migrate/20100824062306_create_users.rb
 - 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/requests/docomo_guid_spec.rb
 - test/rails/overrides/spec/requests/docomo_spec.rb
 - test/rails/overrides/spec/requests/emobile_spec.rb
@@ -396,6 +409,7 @@ files:
 - 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/normal_mailer.rb
 - test/rails/rails_root/app/models/user.rb
 - test/rails/rails_root/autotest/discover.rb
 - test/rails/rails_root/config/application.rb
@@ -417,6 +431,7 @@ files:
 - 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/models/normal_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
@@ -457,9 +472,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/mailer.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
@@ -472,6 +487,7 @@ files:
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/vodafone.rb
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/willcom.rb
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/windows_phone.rb
+- test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/path_set.rb
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/position.rb
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/rack.rb
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/rack/filter.rb
@@ -479,6 +495,7 @@ files:
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/rack/params_filter.rb
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/rails.rb
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/request_with_mobile.rb
+- test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/resolver.rb
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/trans_sid.rb
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/util.rb
 - test/rails/rails_root/vendor/plugins/jpmobile/tmp/conversion-table.rb
@@ -523,11 +540,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
@@ -550,12 +569,14 @@ test_files:
 - spec/rack_helper.rb
 - spec/spec_helper.rb
 - spec/unit/detect_by_email_spec.rb
+- spec/unit/emoticon_spec.rb
+- spec/unit/encoding_spec.rb
 - spec/unit/is_carrier_spec.rb
+- spec/unit/mail_spec.rb
+- spec/unit/receive_mail_spec.rb
 - spec/unit/spec_helper.rb
 - spec/unit/util_spec.rb
 - spec/unit/valid_ip_spec.rb
-- test/legacy/emoticon_test.rb
-- test/legacy/helper.rb
 - test/rails/overrides/app/controllers/application_controller.rb
 - test/rails/overrides/app/controllers/docomo_guid_always_controller.rb
 - test/rails/overrides/app/controllers/docomo_guid_base_controller.rb
@@ -573,6 +594,8 @@ test_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/models/user.rb
 - test/rails/overrides/autotest/discover.rb
 - test/rails/overrides/config/initializers/jpmobile_generator.rb
@@ -580,6 +603,8 @@ test_files:
 - test/rails/overrides/db/migrate/001_add_sessions_table.rb
 - test/rails/overrides/db/migrate/20100824062306_create_users.rb
 - 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/requests/docomo_guid_spec.rb
 - test/rails/overrides/spec/requests/docomo_spec.rb
 - test/rails/overrides/spec/requests/emobile_spec.rb
@@ -609,6 +634,7 @@ test_files:
 - 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/normal_mailer.rb
 - test/rails/rails_root/app/models/user.rb
 - test/rails/rails_root/autotest/discover.rb
 - test/rails/rails_root/config/application.rb
@@ -630,6 +656,7 @@ test_files:
 - 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/models/normal_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
@@ -670,9 +697,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/mailer.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
@@ -685,6 +712,7 @@ test_files:
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/vodafone.rb
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/willcom.rb
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/windows_phone.rb
+- test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/path_set.rb
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/position.rb
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/rack.rb
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/rack/filter.rb
@@ -692,6 +720,7 @@ test_files:
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/rack/params_filter.rb
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/rails.rb
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/request_with_mobile.rb
+- test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/resolver.rb
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/trans_sid.rb
 - test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/util.rb
 - test/rails/rails_root/vendor/plugins/jpmobile/tmp/conversion-table.rb