remove NullSession

Author: tenderlove

lib/rack/session/abstract/id.rb

@@ -11,11 +11,6 @@ module Rack
 
   module Session
 
-    class NullSessionId
-      def empty?; true; end
-      def nil?; true; end
-    end
-
     class SessionId
       attr_reader :public_id
 
@@ -313,15 +308,15 @@ def prepare_session(req)
         def load_session(req)
           sid = current_session_id(req)
           sid, session = find_session(req, sid)
-          [sid || NullSessionId.new, session || {}]
+          [sid, session || {}]
         end
 
         # Extract session id from request object.
 
         def extract_session_id(request)
           sid = request.cookies[@key]
           sid ||= request.params[@key] unless @cookie_only
-          (sid && SessionId.new(sid)) || NullSessionId.new
+          sid && SessionId.new(sid)
         end
 
         # Returns the current session id from the SessionHash.

lib/rack/session/cookie.rb

@@ -129,7 +129,7 @@ def find_session(req, sid)
       end
 
       def extract_session_id(request)
-        unpacked_cookie_data(request)["session_id"] || NullSessionId.new
+        unpacked_cookie_data(request)["session_id"]
       end
 
       def unpacked_cookie_data(request)
@@ -180,11 +180,7 @@ def write_session(req, session_id, session, options)
 
       def delete_session(req, session_id, options)
         # Nothing to do here, data is in the client
-        if options[:drop]
-          NullSessionId.new
-        else
-          generate_sid
-        end
+        generate_sid unless options[:drop]
       end
 
       def digest_match?(data, digest)

lib/rack/session/pool.rb

@@ -61,11 +61,7 @@ def write_session(req, session_id, new_session, options)
       def delete_session(req, session_id, options)
         with_lock(req) do
           @pool.delete(session_id.private_id)
-          if options[:drop]
-            NullSessionId.new
-          else
-            generate_sid
-          end
+          generate_sid unless options[:drop]
         end
       end