remove more nils

lib/rack/session/abstract/id.rb

@@ -16,6 +16,7 @@ module Session
 
     class NullSessionId
       def empty?; true; end
+      def nil?; true; end
     end
 
     module Abstract
@@ -51,7 +52,7 @@ def id
           else
             @id = @store.send(:extract_session_id, @env)
           end
-          @id || NullSessionId.new
+          @id || raise
         end
 
         def options
@@ -89,7 +90,7 @@ def clear
 
         def destroy
           clear
-          @id = @store.send(:destroy_session, @env, id, options)
+          @id = @store.send(:destroy_session, @env, id, options) || raise
         end
 
         def to_hash
@@ -271,7 +272,7 @@ def prepare_session(env)
         def load_session(env)
           sid = current_session_id(env)
           sid, session = get_session(env, sid)
-          [sid, session || {}]
+          [sid || NullSessionId.new, session || {}]
         end
 
         # Extract session id from request object.
@@ -280,7 +281,7 @@ def extract_session_id(env)
           request = Rack::Request.new(env)
           sid = request.cookies[@key]
           sid ||= request.params[@key] unless @cookie_only
-          sid
+          sid || NullSessionId.new
         end
 
         # Returns the current session id from the SessionHash.
@@ -337,7 +338,7 @@ def commit_session(env, status, headers, body)
 
           if options[:drop] || options[:renew]
             session_id = destroy_session(env, session.id || generate_sid, options)
-            return [status, headers, body] unless session_id
+            return if session_id.nil?
           end
 
           return [status, headers, body] unless commit_session?(env, session, options)

lib/rack/session/cookie.rb

@@ -169,7 +169,11 @@ def set_session(env, session_id, session, options)
 
       def destroy_session(env, 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

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