diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2018-02-01 08:13:38 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-01 08:13:38 +0900 |
| commit | 4f0eb1ccd9652118b05d42f152adaa4df7dc3388 (patch) | |
| tree | fe5fbf3a150b1a4cdba655ce5222a480069d6edb /actionpack/lib/action_dispatch | |
| parent | 57cc6f40309f919dfb30fe63f6d663f6ccaf7856 (diff) | |
| parent | 2587cadd4223f4abc1a94fdfb14cfd8c8d60e28b (diff) | |
| download | rails-4f0eb1ccd9652118b05d42f152adaa4df7dc3388.tar.gz rails-4f0eb1ccd9652118b05d42f152adaa4df7dc3388.tar.bz2 rails-4f0eb1ccd9652118b05d42f152adaa4df7dc3388.zip | |
Merge pull request #31844 from igorkasyanchuk/add_to_hash_and_to_h_for_session_and_cookies
Consistent behavior for session and cookies with to_h and to_hash method
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/cookies.rb | 3 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/request/session.rb | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/cookies.rb b/actionpack/lib/action_dispatch/middleware/cookies.rb index ea4156c972..c45d947904 100644 --- a/actionpack/lib/action_dispatch/middleware/cookies.rb +++ b/actionpack/lib/action_dispatch/middleware/cookies.rb @@ -338,6 +338,9 @@ module ActionDispatch end alias :has_key? :key? + # Returns the cookies as Hash. + alias :to_hash :to_h + def update(other_hash) @cookies.update other_hash.stringify_keys self diff --git a/actionpack/lib/action_dispatch/request/session.rb b/actionpack/lib/action_dispatch/request/session.rb index d86d0b10c2..000847e193 100644 --- a/actionpack/lib/action_dispatch/request/session.rb +++ b/actionpack/lib/action_dispatch/request/session.rb @@ -130,6 +130,7 @@ module ActionDispatch load_for_read! @delegate.dup.delete_if { |_, v| v.nil? } end + alias :to_h :to_hash # Updates the session with given Hash. # |