Merge pull request #13279 from misfo/session-fetch-that-behaves-like-hash-fetch

Make ActionDispatch::Request::Session#fetch behave like Hash#fetch

1 files changed, 8 insertions, 8 deletions

diff --git a/actionpack/lib/action_dispatch/request/session.rb b/actionpack/lib/action_dispatch/request/session.rb
index 6d911a75f1..973627f106 100644
--- a/actionpack/lib/action_dispatch/request/session.rb
+++ b/actionpack/lib/action_dispatch/request/session.rb
@@ -7,6 +7,9 @@ module ActionDispatch
       ENV_SESSION_KEY         = Rack::Session::Abstract::ENV_SESSION_KEY # :nodoc:
       ENV_SESSION_OPTIONS_KEY = Rack::Session::Abstract::ENV_SESSION_OPTIONS_KEY # :nodoc:
 
+      # Singleton object used to determine if an optional param wasn't specified
+      Unspecified = Object.new
+
       def self.create(store, env, default_options)
         session_was = find env
         session     = Request::Session.new(store, env)
@@ -127,15 +130,12 @@ module ActionDispatch
         @delegate.delete key.to_s
       end
 
-      def fetch(key, default=nil)
-        if self.key?(key)
-          self[key]
-        elsif default
-          self[key] = default
-        elsif block_given?
-          self[key] = yield(key)
+      def fetch(key, default=Unspecified, &block)
+        load_for_read!
+        if default == Unspecified
+          @delegate.fetch(key.to_s, &block)
         else
-          raise KeyError
+          @delegate.fetch(key.to_s, default, &block)
         end
       end