From 058dc9a09680e9e2a5777c441b966a6f5e12cf82 Mon Sep 17 00:00:00 2001 From: brainopia Date: Fri, 10 Aug 2012 09:59:37 +0400 Subject: Revert "Revert "Merge pull request #6084 from brainopia/support_for_magic_domain_on_all_stores"" This reverts commit a48ea6800ef712440b08c551f8041feb35de8cb4. --- .../lib/action_dispatch/middleware/session/abstract_store.rb | 7 +++++++ actionpack/test/activerecord/active_record_store_test.rb | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb index f75b4d4d04..c04fee21dc 100644 --- a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb +++ b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb @@ -74,6 +74,13 @@ module ActionDispatch class AbstractStore < Rack::Session::Abstract::ID include Compatibility include StaleSessionCheck + + private + + def set_cookie(env, session_id, cookie) + request = ActionDispatch::Request.new(env) + request.cookie_jar[key] = cookie + end end end end diff --git a/actionpack/test/activerecord/active_record_store_test.rb b/actionpack/test/activerecord/active_record_store_test.rb index 768ac713ca..6dc2eaff54 100644 --- a/actionpack/test/activerecord/active_record_store_test.rb +++ b/actionpack/test/activerecord/active_record_store_test.rb @@ -256,6 +256,13 @@ class ActiveRecordStoreTest < ActionDispatch::IntegrationTest end end + def test_session_store_with_all_domains + with_test_route_set(:domain => :all) do + get '/set_session_value' + assert_response :success + end + end + private def with_test_route_set(options = {}) -- cgit v1.2.3 From bbe634e72cfbe9d66f08e0e22b0c718f136ae934 Mon Sep 17 00:00:00 2001 From: brainopia Date: Mon, 30 Apr 2012 16:55:06 +0400 Subject: Dont stream back cookie value if it was set to the same value --- actionpack/lib/action_dispatch/middleware/cookies.rb | 10 ++++++---- actionpack/test/dispatch/cookies_test.rb | 14 +++++++++++++- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/actionpack/lib/action_dispatch/middleware/cookies.rb b/actionpack/lib/action_dispatch/middleware/cookies.rb index 2f46a375b1..2e9f7e569b 100644 --- a/actionpack/lib/action_dispatch/middleware/cookies.rb +++ b/actionpack/lib/action_dispatch/middleware/cookies.rb @@ -170,12 +170,14 @@ module ActionDispatch options = { :value => value } end - @cookies[key.to_s] = value - handle_options(options) - @set_cookies[key.to_s] = options - @delete_cookies.delete(key.to_s) + if @cookies[key.to_s] != value or options[:expires] + @cookies[key.to_s] = value + @set_cookies[key.to_s] = options + @delete_cookies.delete(key.to_s) + end + value end diff --git a/actionpack/test/dispatch/cookies_test.rb b/actionpack/test/dispatch/cookies_test.rb index 6ebd02e85c..6b93e2fa75 100644 --- a/actionpack/test/dispatch/cookies_test.rb +++ b/actionpack/test/dispatch/cookies_test.rb @@ -179,6 +179,18 @@ class CookiesTest < ActionController::TestCase assert_equal({"user_name" => "david"}, @response.cookies) end + def test_setting_the_same_value_to_cookie + request.cookies[:user_name] = 'david' + get :authenticate + assert response.cookies.empty? + end + + def test_setting_the_same_value_to_permanent_cookie + request.cookies[:user_name] = 'Jamie' + get :set_permanent_cookie + assert response.cookies, 'user_name' => 'Jamie' + end + def test_setting_with_escapable_characters get :set_with_with_escapable_characters assert_cookie_header "that+%26+guy=foo+%26+bar+%3D%3E+baz; path=/" @@ -564,4 +576,4 @@ class CookiesTest < ActionController::TestCase assert_not_equal expected.split("\n"), header end end -end \ No newline at end of file +end -- cgit v1.2.3 From ca07bc0de7282cf95376a507a2a5e1dd3ac66481 Mon Sep 17 00:00:00 2001 From: brainopia Date: Fri, 10 Aug 2012 09:48:26 +0400 Subject: Test actual content of permanent cookie --- actionpack/test/dispatch/cookies_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actionpack/test/dispatch/cookies_test.rb b/actionpack/test/dispatch/cookies_test.rb index 6b93e2fa75..2b043db030 100644 --- a/actionpack/test/dispatch/cookies_test.rb +++ b/actionpack/test/dispatch/cookies_test.rb @@ -188,7 +188,7 @@ class CookiesTest < ActionController::TestCase def test_setting_the_same_value_to_permanent_cookie request.cookies[:user_name] = 'Jamie' get :set_permanent_cookie - assert response.cookies, 'user_name' => 'Jamie' + assert_equal response.cookies, 'user_name' => 'Jamie' end def test_setting_with_escapable_characters -- cgit v1.2.3 From 2e04a343eb668fe73864156ed9f3c373d42a588c Mon Sep 17 00:00:00 2001 From: brainopia Date: Sat, 11 Aug 2012 23:19:12 +0400 Subject: Update changelog to reflect support of cookie jar options for all session stores --- actionpack/CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 9d413c8fb3..6a7087a4bd 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -2,6 +2,11 @@ * `javascript_include_tag :all` will now not include `application.js` if the file does not exists. *Prem Sichanugrist* +* Support cookie jar options (e.g., domain :all) for all session stores. + Fixes GH#3047, GH#2483. + + *Ravil Bayramgalin* + ## Rails 3.2.8 (Aug 9, 2012) ## -- cgit v1.2.3