Merge pull request #294 from josevalim/empty_session_fix

Ensure the session is loaded before checking for empty.
rack · Dec 27, 2011 · 6d9cd64 · 6d9cd64
2 parents 131263d + cae96d9
commit 6d9cd64
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/lib/rack/session/abstract/id.rb b/lib/rack/session/abstract/id.rb
@@ -111,6 +111,11 @@ def loaded?
           @loaded
         end
 
+        def empty?
+          load_for_read!
+          super
+        end
+
       private
 
         def load_for_read!

diff --git a/test/spec_session_cookie.rb b/test/spec_session_cookie.rb
@@ -106,11 +106,16 @@ def decode(str); @calls << :decode; str; end
     res = Rack::MockRequest.new(Rack::Session::Cookie.new(incrementor)).get("/")
     res = Rack::MockRequest.new(Rack::Session::Cookie.new(only_session_id)).
       get("/", "HTTP_COOKIE" => res["Set-Cookie"])
+
+    res.body.should.not.equal ""
     old_session_id = res.body
+
     res = Rack::MockRequest.new(Rack::Session::Cookie.new(renewer)).
       get("/", "HTTP_COOKIE" => res["Set-Cookie"])
     res = Rack::MockRequest.new(Rack::Session::Cookie.new(only_session_id)).
       get("/", "HTTP_COOKIE" => res["Set-Cookie"])
+
+    res.body.should.not.equal ""
     res.body.should.not.equal old_session_id
   end