remove more nils

lib/rack/session/abstract/id.rb

@@ -15,6 +15,7 @@ module Session
 
     class NullSessionId
       def empty?; true; end
+      def nil?; true; end
     end
 
     module Abstract
@@ -49,7 +50,7 @@ def id
           else
             @id = @store.send(:extract_session_id, @req)
           end
-          @id || NullSessionId.new
+          @id || raise
         end
 
         def options
@@ -95,7 +96,7 @@ def clear
 
         def destroy
           clear
-          @id = @store.send(:delete_session, @req, id, options)
+          @id = @store.send(:delete_session, @req, id, options) || raise
         end
 
         def to_hash
@@ -287,15 +288,15 @@ def prepare_session(req)
         def load_session(req)
           sid = current_session_id(req)
           sid, session = find_session(req, sid)
-          [sid, session || {}]
+          [sid || NullSessionId.new, 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
+          sid || NullSessionId.new
         end
 
         # Returns the current session id from the SessionHash.
@@ -351,7 +352,7 @@ def commit_session(req, res)
 
           if options[:drop] || options[:renew]
             session_id = delete_session(req, session.id || generate_sid, options)
-            return unless session_id
+            return if session_id.nil?
           end
 
           return unless commit_session?(req, session, options)

lib/rack/session/cookie.rb

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

lib/rack/session/pool.rb

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