1 files changed, 16 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/request/session.rb b/actionpack/lib/action_dispatch/request/session.rb
index a05a23d953..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)
@@ -63,6 +66,10 @@ module ActionDispatch
         @exists   = nil # we haven't checked yet
       end
 
+      def id
+        options[:id]
+      end
+
       def options
         Options.find @env
       end
@@ -123,6 +130,15 @@ module ActionDispatch
         @delegate.delete key.to_s
       end
 
+      def fetch(key, default=Unspecified, &block)
+        load_for_read!
+        if default == Unspecified
+          @delegate.fetch(key.to_s, &block)
+        else
+          @delegate.fetch(key.to_s, default, &block)
+        end
+      end
+
       def inspect
         if loaded?
           super