jpmobile 0.0.6 → 0.0.7

data/test/rails/rails_root/public/index.html

@@ -229,6 +229,7 @@
               <li><a href="http://api.rubyonrails.org/">Rails API</a></li>
               <li><a href="http://stdlib.rubyonrails.org/">Ruby standard library</a></li>
               <li><a href="http://corelib.rubyonrails.org/">Ruby core</a></li>
+              <li><a href="http://guides.rubyonrails.org/">Rails Guides</a></li>
             </ul>
           </li>
         </ul>

data/test/rails/rails_root/script/about

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path('../../config/boot',  __FILE__)
 $LOAD_PATH.unshift "#{RAILTIES_PATH}/builtin/rails_info"
-require 'commands/about'
+require 'commands/about'

data/test/rails/rails_root/script/console

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path('../../config/boot',  __FILE__)
 require 'commands/console'

data/test/rails/rails_root/script/dbconsole

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path('../../config/boot',  __FILE__)
 require 'commands/dbconsole'

data/test/rails/rails_root/script/destroy

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path('../../config/boot',  __FILE__)
 require 'commands/destroy'

data/test/rails/rails_root/script/generate

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path('../../config/boot',  __FILE__)
 require 'commands/generate'

data/test/rails/rails_root/script/performance/benchmarker

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../../config/boot'
+require File.expand_path('../../../config/boot',  __FILE__)
 require 'commands/performance/benchmarker'

data/test/rails/rails_root/script/performance/profiler

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../../config/boot'
+require File.expand_path('../../../config/boot',  __FILE__)
 require 'commands/performance/profiler'

data/test/rails/rails_root/script/plugin

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path('../../config/boot',  __FILE__)
 require 'commands/plugin'

data/test/rails/rails_root/script/runner

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path('../../config/boot',  __FILE__)
 require 'commands/runner'

data/test/rails/rails_root/script/server

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path('../../config/boot',  __FILE__)
 require 'commands/server'

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

@@ -56,30 +56,60 @@ end
 
 describe TemplatePathController, "integrated_views" do
   integrate_views
-  context "PCからのアクセスの場合" do
-    before do
-      get :index
+  describe "index" do
+    context "PCからのアクセスの場合" do
+      before do
+        get :index
+      end
+      it 'index.html.erbが使用されること' do
+        response.should have_tag("h1", "index.html.erb")
+      end
     end
-    it 'index.html.erbが使用されること' do
-      response.should have_tag("h1", "index.html.erb")
+    context "DoCoMoからのアクセスの場合" do
+      before do
+        request.user_agent = "DoCoMo/2.0 SH902i(c100;TB;W24H12)"
+        get :index
+      end
+      it 'index_mobile_docomo.html.erbが使用されること' do
+        response.should have_tag("h1", "index_mobile_docomo.html.erb")
+      end
     end
-  end
-  context "DoCoMoからのアクセスの場合" do
-    before do
-      request.user_agent = "DoCoMo/2.0 SH902i(c100;TB;W24H12)"
-      get :index
-    end
-    it 'index_mobile_docomo.html.erbが使用されること' do
-      response.should have_tag("h1", "index_mobile_docomo.html.erb")
+    context "SoftBankからのアクセスの場合" do
+      before do
+        request.user_agent = "SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1"
+        get :index
+      end
+      it 'index_mobile.html.erbが使用されること' do
+        response.should have_tag("h1", "index_mobile.html.erb")
+      end
     end
   end
-  context "SoftBankからのアクセスの場合" do
-    before do
-      request.user_agent = "SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1"
-      get :index
+  describe "partial" do
+    context "PCからのアクセスの場合" do
+      before do
+        get :partial
+      end
+      it '_partial.html.erbが使用されること' do
+        response.should have_tag("h2", "_partial.html.erb")
+      end
+    end
+    context "DoCoMoからのアクセスの場合" do
+      before do
+        request.user_agent = "DoCoMo/2.0 SH902i(c100;TB;W24H12)"
+        get :partial
+      end
+      it '_partial_mobile_docomo.html.erbが使用されること' do
+        response.should have_tag("h2", "_partial_mobile_docomo.html.erb")
+      end
     end
-    it 'index_mobile.html.erbが使用されること' do
-      response.should have_tag("h1", "index_mobile.html.erb")
+    context "SoftBankからのアクセスの場合" do
+      before do
+        request.user_agent = "SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1"
+        get :partial
+      end
+      it '_partial_mobile.html.erbが使用されること' do
+        response.should have_tag("h2", "_partial_mobile.html.erb")
+      end
     end
   end
 end

data/test/rails/rails_root/spec/controllers/trans_sid_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe "trans_sid が起動しないとき", :shared => true do
@@ -9,11 +10,15 @@ describe "trans_sid が起動しないとき", :shared => true do
     get :form
     response.body.should =~ %r{^<form action="/.+?/form" method="post">Hello</form>$}
   end
+  it "で redirect の自動書き換えが行われない" do
+    get :redirect
+    response.should redirect_to('/')
+  end
 end
 
 describe "trans_sid が起動するとき", :shared => true do
   before :each do
-    request.session.session_id = "mysessionid"
+    request.session_options[:id] = "mysessionid"
   end
   it "で link_to の自動書き換えが行われる" do
     get :link
@@ -23,6 +28,10 @@ describe "trans_sid が起動するとき", :shared => true do
     get :form
     response.body.should =~ %r{^<form action="/.+?/form\?_session_id=mysessionid" method="post">Hello<input type="hidden" name="_session_id" value="mysessionid" /></form>$}
   end
+  it "で redirect の自動書き換えが行われる" do
+    get :redirect
+    response.should redirect_to('/?_session_id=mysessionid')
+  end
 end
 
 describe TransSidBaseController, "という trans_sid が有効になっていないコントローラ" do
@@ -44,7 +53,7 @@ end
 describe TransSidAlwaysController, "という trans_sid :always が指定されているコントローラ" do
   controller_name :trans_sid_always
   before :each do
-    request.session.session_id = "mysessionid"
+    request.session_options[:id] = "mysessionid"
   end
   it "の trans_sid_mode は :always" do
     controller.trans_sid_mode.should == :always
@@ -88,9 +97,3 @@ end
 describe_mobile_with_ua "Vodafone/1.0/V903T/TJ001 Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0" do
   it_should_behave_like "trans_sid が起動しないとき"
 end
-
-
-describe TransSidAlwaysAndSessionOffController, "という trans_sid :always と session :off を同時に指定しているコントローラ" do
-  controller_name :trans_sid_always_and_session_off
-  it_should_behave_like "trans_sid が起動しないとき"
-end

data/test/rails/rails_root/test/test_helper.rb

@@ -2,7 +2,7 @@ ENV["RAILS_ENV"] = "test"
 require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
 require 'test_help'
 
-class Test::Unit::TestCase
+class ActiveSupport::TestCase
   # Transactional fixtures accelerate your tests by wrapping each test method
   # in a transaction that's rolled back on completion.  This ensures that the
   # test database remains unchanged so your fixtures don't have to be reloaded

data/test/rails/rails_root/vendor/plugins/jpmobile/MIT-LICENSE

@@ -1,7 +1,7 @@
-Copyright (c) 2006 Yohji Shidara
+Copyright (c) 2006 Yoji Shidara
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/test/rails/rails_root/vendor/plugins/jpmobile/README.rdoc

@@ -15,17 +15,24 @@
 * 文字コード変換機能／絵文字のキャリア間相互変換
 
 == インストール
+Rails の Version に応じて選択してください。
+=== Rails 2.3.3, 2.3.4, 2.3.5
+開発版:
+  % ./script/plugin install git://github.com/darashi/jpmobile.git
 
-=== pluginとしてインストールする場合
+=== Rails 2.3.2
+==== pluginとしてインストールする場合
 
-リリース版:
-  % ./script/plugin install git://github.com/darashi/jpmobile.git -r 'tag x.x.x'
-  (x.x.xはバージョン)
+リリース版: (Version 0.0.6)
+  % git clone git://github.com/darashi/jpmobile.git vendor/plugins/jpmobile
+  % cd vendor/plugins/jpmobile
+  % git checkout 0.0.6
+  % rm -rf .git
 
 開発版:
   % ./script/plugin install git://github.com/darashi/jpmobile.git
 
-=== gemでインストールする場合
+==== gemでインストールする場合
 
   # gem install jpmobile
 としてgemをインストールした後
@@ -34,6 +41,12 @@ RAILS_ROOT/config/environment.rb の Rails::Initializer.run do |config| 〜 end
   config.gem "jpmobile"
 の行を追加する。
 
+=== Rails 2.2.x 以前
+リリース版:
+  % git clone git://github.com/darashi/jpmobile.git vendor/plugins/jpmobile
+  % cd vendor/plugins/jpmobile
+  % git checkout 0.0.5
+  % rm -rf .git
 
 == 使用例
 
@@ -149,12 +162,19 @@ BUG: 現状、上記の例では index.html.erb が存在しない場合に振
   end
 
 trans_sid 機能を使う場合には cookie session store を使用することができません。
-trans_sid を使用する際には、例えば environment.rb で
-  config.action_controller.session_store = :active_record_store
+trans_sid を使用する際には、例えば config/initializers/session_store.rb で
+  ActionController::Base.session_store = :active_record_store
 として active_record_store を使用します。
 このとき ApplicationController において protect_from_forgery の :secret を指定するか、
 あるいは protect_from_forgery を解除する必要があるでしょう。
 
+また、
+  link_to "hoge", "/controller/action/id"
+のようにリンク先を直接指定するとセッションIDは付加されません。
+  link_to "hoge", :controller => "controller", :action => "action", :id => "id"
+のように指定する必要があります。
+
+
 === 端末の画面サイズ
 request.mobile.display で Jpmobile::Display クラスのインスタンスが返る。
   画面幅 <%= request.mobile.display.width %>
@@ -207,17 +227,13 @@ mobile_filterを有効にすると以下の処理が自動で行われる。
 * spec-fixtures
 
 == リンク
-* Project Website: http://jpmobile-rails.org
-* RDoc Documentation: http://jpmobile.rubyforge.org/rdoc
-* GitHub: http://github.com/darashi/jpmobile/
-* RubyForge Project Page: http://rubyforge.org/projects/jpmobile
-* Mailing List: http://groups.google.com/group/jpmobile
-* IRC Channel #jpmobile@freenode.net
+
+* http://jpmobile-rails.org
 
 == 作者
 
-Copyright 2006 (c) Yohji Shidara, under MIT License.
+Copyright 2006 (c) Yoji Shidara, under MIT License.
 
-Yohji Shidara <dara@shidara.net>
+Yoji Shidara <dara@shidara.net>
 
 http://d.hatena.ne.jp/darashi

data/test/rails/rails_root/vendor/plugins/jpmobile/Rakefile

@@ -64,7 +64,7 @@ spec =
         s.bindir = "bin"
         s.require_path = "lib"
 
-        s.add_runtime_dependency('actionpack', '>=2.2.2')
+        s.add_runtime_dependency('actionpack', '>=2.3.2')
         s.add_development_dependency('rspec', '>=1.1.12')
         s.add_development_dependency('rspec-rails', '>=1.1.12')
         s.add_development_dependency('rspec-fixture', '>=0.0.2')

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

@@ -1,3 +1,5 @@
+require 'nkf'
+
 module Jpmobile
   # 絵文字関連処理
   module Emoticon
@@ -95,7 +97,7 @@ module Jpmobile
           end
         when String
           # 変換先がUnicodeで指定されている。
-          to_sjis ? Kconv::kconv(converted, Kconv::SJIS, Kconv::UTF8) : converted
+          to_sjis ? NKF.nkf('-m0 -x -Ws', converted) : converted
         when nil
           # 変換先が定義されていない。
           match

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

@@ -25,13 +25,8 @@ module Jpmobile
   module Filter
     # 文字コードフィルタのベースクラス。
     class Base
-      def initialize
-        @counter = 0 # render :component 時に多重で適用されるのを防ぐ
-      end
       # 外部コードから内部コードに変換
       def before(controller)
-        @counter += 1
-        return unless @counter == 1
         if respond_to?(:to_internal) && apply_incoming?(controller)
           Util.deep_apply(controller.params) do |value|
             value = to_internal(value, controller)
@@ -40,9 +35,7 @@ module Jpmobile
       end
       # 内部コードから外部コードに変換
       def after(controller)
-        @counter -= 1
-        return unless @counter.zero?
-        if respond_to?(:to_external) && apply_outgoing?(controller)
+        if respond_to?(:to_external) && apply_outgoing?(controller) && controller.response.body.is_a?(String)
           controller.response.body = to_external(controller.response.body, controller)
           after_after(controller) if respond_to? :after_after
         end
@@ -117,8 +110,8 @@ module Jpmobile
     # 半角カナと全角カナのフィルタ
     class HankakuKana < FilterTable
       include ApplyOnlyForMobile
-      @@internal = %w(ガ ギ グ ゲ ゴ ザ ジ ズ ゼ ゾ ダ ヂ ヅ デ ド バ ビ ブ ベ ボ パ ピ プ ペ ポ ヴ ア イ ウ エ オ カ キ ク ケ コ サ シ ス セ ソ タ チ ツ テ ト ナ ニ ヌ ネ ノ ハ ヒ フ ヘ ホ マ ミ ム メ モ ヤ ユ ヨ ラ リ ル レ ロ ワ ヲ ン ャ ュ ョ ァ ィ ゥ ェ ォ ッ ゛ ゜ ー ).freeze
-      @@external = %w(ｶﾞ ｷﾞ ｸﾞ ｹﾞ ｺﾞ ｻﾞ ｼﾞ ｽﾞ ｾﾞ ｿﾞ ﾀﾞ ﾁﾞ ﾂﾞ ﾃﾞ ﾄﾞ ﾊﾞ ﾋﾞ ﾌﾞ ﾍﾞ ﾎﾞ ﾊﾟ ﾋﾟ ﾌﾟ ﾍﾟ ﾎﾟ ｳﾞ ｱ ｲ ｳ ｴ ｵ ｶ ｷ ｸ ｹ ｺ ｻ ｼ ｽ ｾ ｿ ﾀ ﾁ ﾂ ﾃ ﾄ ﾅ ﾆ ﾇ ﾈ ﾉ ﾊ ﾋ ﾌ ﾍ ﾎ ﾏ ﾐ ﾑ ﾒ ﾓ ﾔ ﾕ ﾖ ﾗ ﾘ ﾙ ﾚ ﾛ ﾜ ｦ ﾝ ｬ ｭ ｮ ｧ ｨ ｩ ｪ ｫ ｯ ﾞ ﾟ ｰ).freeze
+      @@internal = %w(ガ ギ グ ゲ ゴ ザ ジ ズ ゼ ゾ ダ ヂ ヅ デ ド バ ビ ブ ベ ボ パ ピ プ ペ ポ ヴ ア イ ウ エ オ カ キ ク ケ コ サ シ ス セ ソ タ チ ツ テ ト ナ ニ ヌ ネ ノ ハ ヒ フ ヘ ホ マ ミ ム メ モ ヤ ユ ヨ ラ リ ル レ ロ ワ ヲ ン ャ ュ ョ ァ ィ ゥ ェ ォ ッ ゛ ゜ ー 。 「 」 、 ・).freeze
+      @@external = %w(ｶﾞ ｷﾞ ｸﾞ ｹﾞ ｺﾞ ｻﾞ ｼﾞ ｽﾞ ｾﾞ ｿﾞ ﾀﾞ ﾁﾞ ﾂﾞ ﾃﾞ ﾄﾞ ﾊﾞ ﾋﾞ ﾌﾞ ﾍﾞ ﾎﾞ ﾊﾟ ﾋﾟ ﾌﾟ ﾍﾟ ﾎﾟ ｳﾞ ｱ ｲ ｳ ｴ ｵ ｶ ｷ ｸ ｹ ｺ ｻ ｼ ｽ ｾ ｿ ﾀ ﾁ ﾂ ﾃ ﾄ ﾅ ﾆ ﾇ ﾈ ﾉ ﾊ ﾋ ﾌ ﾍ ﾎ ﾏ ﾐ ﾑ ﾒ ﾓ ﾔ ﾕ ﾖ ﾗ ﾘ ﾙ ﾚ ﾛ ﾜ ｦ ﾝ ｬ ｭ ｮ ｧ ｨ ｩ ｪ ｫ ｯ ﾞ ﾟ ｰ ｡ ｢ ｣ ､ ･).freeze
     end
 
     # 絵文字変換フィルタ

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

@@ -63,6 +63,8 @@ module Jpmobile
         options[:only_path] = false
         posinfo = options.delete(:posinfo) || "1" # 基地局情報を元に測位した緯度経度情報を要求
         url = url_for(options)
+      else
+        posinfo = "1"
       end
       return "http://w1m.docomo.ne.jp/cp/iarea?ecode=OPENAREACODE&msn=OPENAREAKEY&posinfo=#{posinfo}&nl=#{CGI.escape(url)}"
     end

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

@@ -1,3 +1,5 @@
+require 'action_pack'
+
 class ActionController::Base
   include Jpmobile::Helpers
   before_filter :gettext_force_ja_for_mobile
@@ -8,4 +10,14 @@ class ActionController::Base
     rescue NameError
     end
   end
+
+  class << self
+    def view_paths=(value)
+      @view_paths = ActionView::Base.process_view_paths(value) if value
+    end
+  end
+
+  def view_paths=(value)
+    @view_paths = ActionView::Base.process_view_paths(value, controller) if value
+  end
 end

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

@@ -13,77 +13,78 @@ require 'action_view'
 
 # ActionView::Base を拡張して携帯からのアクセスの場合に携帯向けビューを優先表示する。
 # Vodafone携帯(request.mobile == Jpmobile::Mobile::Vodafone)の場合、
-#   index_mobile_vodafone.rhtml
-#   index_mobile_softbank.rhtml
-#   index_mobile.rhtml
-#   index.rhtml
+#   index_mobile_vodafone.html.erb
+#   index_mobile_softbank.html.erb
+#   index_mobile.html.erb
+#   index.html.erb
 # の順にテンプレートが検索される。
-# BUG: 現状、上記の例では index.rhtml が存在しない場合に振り分けが行われない
+# BUG: 現状、上記の例では index.html.erb が存在しない場合に振り分けが行われない
 # (ダミーファイルを置くことで回避可能)。
 
-class ActionView::Base #:nodoc:
-  delegate :default_url_options, :to => :controller unless respond_to?(:default_url_options)
-
-  if ::ActionPack::VERSION::MAJOR >=2 and ::ActionPack::VERSION::MINOR >= 3
-    ### Rails 2.3 or higher
+module ActionView
+  class PathSet
     alias find_template_without_jpmobile find_template #:nodoc:
-    alias render_partial_without_jpmobile render_partial #:nodoc:
+    alias initialize_without_jpmobile initialize #:nodoc:
 
-    def find_template(template_path)
-      mobile_path = mobile_template_path(template_path)
-      return mobile_path.nil? ? _pick_template_without_jpmobile(template_path) :
-                                _pick_template_without_jpmobile(mobile_path)
-    end
+    attr_accessor :controller
 
-    def render_partial(options = {}) #:nodoc:
-      case partial_path = options[:partial]
-      when String, Symbol, NilClass
-        mobile_path = mobile_template_path(partial_path, true)
-        options = options.merge(:partial => mobile_path) if mobile_path
+    def initialize(*args)
+      if args.first.kind_of?(ActionController::Base)
+        @controller = args.shift
       end
-      render_partial_without_jpmobile(options)
+      initialize_without_jpmobile(*args)
     end
 
-  elsif ::ActionPack::VERSION::MAJOR >=2 and ::ActionPack::VERSION::MINOR >= 2
-    ### Rails 2.2 or higher
-    alias _pick_template_without_jpmobile _pick_template #:nodoc:
-    alias render_partial_without_jpmobile render_partial #:nodoc:
+    # hook ActionView::PathSet#find_template
+    def find_template(original_template_path, format = nil, html_fallback = true) #:nodoc:
+      if controller and controller.kind_of?(ActionController::Base) and controller.request.mobile?
+        return original_template_path if original_template_path.respond_to?(:render)
+        template_path = original_template_path.sub(/^\//, '')
+
+        template_candidates = mobile_template_candidates(controller)
+        format_postfix      = format ? ".#{format}" : ""
+
+        each do |load_path|
+          template_candidates.each do |template_postfix|
+            if template = load_path["#{template_path}_#{template_postfix}#{format_postfix}"]
+              return template
+            end
+          end
+        end
+      end
 
-    def _pick_template(template_path)
-      mobile_path = mobile_template_path(template_path)
-      return mobile_path.nil? ? _pick_template_without_jpmobile(template_path) :
-                                _pick_template_without_jpmobile(mobile_path)
+      return find_template_without_jpmobile(original_template_path, format, html_fallback)
     end
 
-    def render_partial(options = {}) #:nodoc:
-      case partial_path = options[:partial]
-      when String, Symbol, NilClass
-        mobile_path = mobile_template_path(partial_path, true)
-        options = options.merge(:partial => mobile_path) if mobile_path
+    # collect cadidates of mobile_template
+    def mobile_template_candidates(controller)
+      candidates = []
+      c = controller.request.mobile.class
+      while c != Jpmobile::Mobile::AbstractMobile
+        candidates << "mobile_"+c.to_s.split(/::/).last.downcase
+        c = c.superclass
       end
-      render_partial_without_jpmobile(options)
+      candidates << "mobile"
     end
+  end
 
-  else
-    ### Rails 2.1 or lower
-    alias render_file_without_jpmobile render_file #:nodoc:
-    alias render_partial_without_jpmobile render_partial #:nodoc:
+  class Base #:nodoc:
+    delegate :default_url_options, :to => :controller unless respond_to?(:default_url_options)
 
-    def render_file(template_path, use_full_path = true, local_assigns = {})
-      mobile_path = mobile_template_path(template_path)
-      return mobile_path.nil? ? render_file_without_jpmobile(template_path, use_full_path, local_assigns) :
-                                render_file_without_jpmobile(mobile_path, use_full_path, local_assigns)
+    # nothing to do
+    def view_paths=(paths)
+      @view_paths = self.class.process_view_paths(paths, controller)
     end
 
-    def render_partial(partial_path, object_assigns = nil, local_assigns = {}) #:nodoc:
-      mobile_path = mobile_template_path(partial_path, true) if partial_path.class === "String"
-      return mobile_path.nil? ? render_partial_without_jpmobile(partial_path, object_assigns, local_assigns) :
-                                render_partial_without_jpmobile(mobile_path, object_assigns, local_assigns)
+    def self.process_view_paths(value, controller = nil)
+      if controller && controller.is_a?(ActionController::Base)
+        ActionView::PathSet.new(controller, Array(value))
+      else
+        ActionView::PathSet.new(Array(value))
+      end
     end
 
-  end
-
-  def mobile_template_candidates
+    def mobile_template_candidates
       candidates = []
       c = controller.request.mobile.class
       while c != Jpmobile::Mobile::AbstractMobile
@@ -91,52 +92,39 @@ class ActionView::Base #:nodoc:
         c = c.superclass
       end
       candidates << "mobile"
-  end
-
-  def mobile_template_partial mobile_path
-    # ActionView::PartialTemplate#extract_partial_name_and_path の動作を模倣
-    if mobile_path.include?('/')
-      path = File.dirname(mobile_path)
-      partial_name = File.basename(mobile_path)
-    else
-      path = self.controller.class.controller_path
-      partial_name = mobile_path
     end
-    File.join(path, "_#{partial_name}")
-  end
-
-  def mobile_path template_path, type
-    "#{template_path}_#{type}"
-  end
 
-  def mobile_template_path(template_path, partial=false)
-    if controller.is_a?(ActionController::Base) && m = controller.request.mobile
-      mobile_template_candidates.each do |v|
-        mpath = mobile_path template_path, v
-        if partial
-          full_path = mobile_template_partial mpath
-        else
-          full_path = mpath
-        end
-        if template_exists?(full_path)
-          return mpath
-        end
+    def mobile_template_partial mobile_path
+      # ActionView::PartialTemplate#extract_partial_name_and_path の動作を模倣
+      if mobile_path.include?('/')
+        path = File.dirname(mobile_path)
+        partial_name = File.basename(mobile_path)
+      else
+        path = self.controller.class.controller_path
+        partial_name = mobile_path
       end
+      File.join(path, "_#{partial_name}")
     end
-    return nil
-  end
 
-  if ::ActionPack::VERSION::MAJOR >=2 and ::ActionPack::VERSION::MINOR >= 2
-    ### Rails 2.2 or higher
-    def template_exists?(template_name)
-      send(:_pick_template_without_jpmobile, template_name) ? true : false
-    rescue ActionView::MissingTemplate
-      false
+    def mobile_path template_path, type
+      "#{template_path}_#{type}"
     end
-  else
-    ### Rails 2.1 or lower
-    def template_exists?(template_name)
-      finder.file_exists?(template_name)
+
+    def mobile_template_path(template_path, partial=false)
+      if controller.is_a?(ActionController::Base) && m = controller.request.mobile
+        mobile_template_candidates.each do |v|
+          mpath = mobile_path template_path, v
+          if partial
+            full_path = mobile_template_partial mpath
+          else
+            full_path = mpath
+          end
+          if template_exists?(full_path)
+            return mpath
+          end
+        end
+      end
+      return nil
     end
   end
 end

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

@@ -1,13 +1,5 @@
 require 'jpmobile/request_with_mobile'
 
-if ::ActionPack::VERSION::MAJOR >=2 and ::ActionPack::VERSION::MINOR >= 3
-  ### Handle Rails 2.3 case
-  class ActionController::Request
-    include Jpmobile::RequestWithMobile
-  end
-else
-  ### Handle Rails 2.2 or lower case
-  class ActionController::AbstractRequest
-    include Jpmobile::RequestWithMobile
-  end
+class ActionController::Request
+  include Jpmobile::RequestWithMobile
 end