test/rails/2.3.2/spec/controllers/trans_sid_spec.rb test/rails/overrides/app/controllers/application_controller.rb @@ -1,18 +1,34 @@ +# -*- coding: utf-8 -*- # = セッションIDの付与 +require 'active_support/version' + +module ParamsOverCookie + # cookie よりも params を先に見るパッチ + def load_session(env) + request = Rack::Request.new(env) + unless @cookie_only + sid = request.params[@key] + end + sid ||= request.cookies[@key] + + sid, session = get_session(env, sid) + [sid, session] + end +end module ActionController # cookie よりも params を先に見るパッチ module Session class AbstractStore - def load_session(env) - request = Rack::Request.new(env) - unless @cookie_only - sid = request.params[@key] + if ActiveSupport::VERSION::TINY == 2 + # for 2.3.2 + include ParamsOverCookie + end + class SessionHash + if ActiveSupport::VERSION::TINY == 2 + # for 2.3.3 + include ParamsOverCookie end - sid ||= request.cookies[@key] - - sid, session = get_session(env, sid) - [sid, session] end end end @@ -56,6 +72,7 @@ module ActionController private # trans_sidを適用すべきかを返す。 def apply_trans_sid? + return false if (jpmobile_session_id rescue nil).blank? return false if trans_sid_mode == :none return true if trans_sid_mode == :always if trans_sid_mode == :mobile @@ -87,7 +104,7 @@ module Jpmobile::TransSid #:nodoc: private # session_keyを返す。 def session_key - (request.session_options || ActionController::Base.session_options)[:key] + ActionController::Base.session_options.merge(request.session_options || {})[:key] end # session_idを返す def jpmobile_session_id lib/jpmobile/trans_sid.rb @@ -26,39 +26,54 @@ namespace :test do t.verbose = true end desc "Generate rails app and run jpmobile tests in the app" - task :rails do |t, args| - puts "Running tests in Rails 2.3.2" + task :rails, [:versions] do |t, args| + rails_root = "test/rails/rails_root" + relative_root = "../../../" + rails_versions = args.versions.split("/") rescue ["2.3.3"] - # generate rails app - rails_root = "test/rails/rails_root" - FileUtils.rm_rf(rails_root) - FileUtils.mkdir_p(rails_root) - system "rails _2.3.2_ --force #{rails_root}" + puts "Running tests in Rails #{rails_versions.join(', ')}" - # setup jpmobile - plugin_path = File.join(rails_root, 'vendor', 'plugins', 'jpmobile') - FileUtils.mkdir_p(plugin_path) - FileList["*"].exclude("test").each do |file| - FileUtils.cp_r(file, plugin_path) - end + rails_versions.each do |rails_version| + puts " for #{rails_version}" + # generate rails app + FileUtils.rm_rf(rails_root) + FileUtils.mkdir_p(rails_root) + system "rails _#{rails_version}_ --force #{rails_root}" - # setup tests - FileList["test/rails/overrides/*"].each do |file| - FileUtils.cp_r(file, rails_root) - end + # setup jpmobile + plugin_path = File.join(rails_root, 'vendor', 'plugins', 'jpmobile') + FileUtils.mkdir_p(plugin_path) + FileList["*"].exclude("test").each do |file| + FileUtils.cp_r(file, plugin_path) + end + + # setup tests + FileList["test/rails/overrides/*"].each do |file| + FileUtils.cp_r(file, rails_root) + end + + # for 2.3.2 + if rails_version == "2.3.2" + FileList["test/rails/2.3.2/*"].each do |file| + FileUtils.cp_r(file, rails_root) + end + end - # for 2.3.2 - config_path = File.join(rails_root, 'config', 'environment.rb') - File.open(config_path, 'a') do |file| - file.write <<-END + # for cookie_only option + config_path = File.join(rails_root, 'config', 'environment.rb') + File.open(config_path, 'a') do |file| + file.write <<-END ActionController::Base.session = {:key => "_session_id", :cookie_only => false} END - end + end + + # run tests in rails + cd rails_root + sh "rake db:migrate" + sh "rake spec" - # run tests in rails - cd rails_root - sh "rake db:migrate" - sh "rake spec" + cd relative_root + end end end tasks/jpmobile_tasks.rake @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- require File.dirname(__FILE__) + '/../spec_helper' describe "trans_sid が起動しないとき", :shared => true do @@ -17,7 +18,7 @@ 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 @@ -52,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 test/rails/overrides/spec/controllers/trans_sid_spec.rb test/rails/overrides/app/controllers/application.rb ecb66814fcd79317ebf4e4ddeff02d44c27cd83e Shin-ichiro OGAWA rust.stnard+git@gmail.com http://github.com/darashi/jpmobile/commit/3ca47ea693743f4fa825f2610258f1c1f689410e 3ca47ea693743f4fa825f2610258f1c1f689410e 2009-08-05T22:26:59-07:00 2009-08-05T22:26:59-07:00 Rails 2.3.3対応 Rails 2.3.3への対応とテストの一部修正 session が有効でないときにも trans_sid が有効になっていた問題の対処 Signed-off-by: Shin-ichiro OGAWA <rust.stnard+git@gmail.com> 557caec9d6a91c16ae6869c4c226ac90ca099678 Shin-ichiro OGAWA rust.stnard+git@gmail.com