dalli 1.1.1 → 1.1.2

data/History.md

@@ -1,6 +1,12 @@
 Dalli Changelog
 =====================
 
+1.1.2
+=======
+
+- Fix incompatibility with latest Rack session API when destroying
+  sessions, thanks @twinge!
+
 1.1.1
 =======
 

data/lib/action_dispatch/middleware/session/dalli_store.rb

@@ -28,43 +28,46 @@ module ActionDispatch
       end
 
       private
-      
-        def get_session(env, sid)
-          sid ||= generate_sid
-          begin
-            session = @pool.get(sid) || {}
-          rescue Dalli::DalliError
-            Rails.logger.warn("Session::DalliStore#get: #{$!.message}")
-            session = {}
-          end
-          [sid, session]
-        end
 
-        def set_session(env, sid, session_data, options = nil)
-          options ||= env[ENV_SESSION_OPTIONS_KEY]
-          expiry  = options[:expire_after]
-          @pool.set(sid, session_data, expiry)
-          sid
+      def get_session(env, sid)
+        sid ||= generate_sid
+        begin
+          session = @pool.get(sid) || {}
         rescue Dalli::DalliError
-          Rails.logger.warn("Session::DalliStore#set: #{$!.message}")
-          false
+          Rails.logger.warn("Session::DalliStore#get: #{$!.message}")
+          session = {}
         end
+        [sid, session]
+      end
+
+      def set_session(env, sid, session_data, options = nil)
+        options ||= env[ENV_SESSION_OPTIONS_KEY]
+        expiry  = options[:expire_after]
+        @pool.set(sid, session_data, expiry)
+        sid
+      rescue Dalli::DalliError
+        Rails.logger.warn("Session::DalliStore#set: #{$!.message}")
+        false
+      end
 
-        def destroy_session(env, session_id, options)
+      def destroy_session(env, session_id, options)
+        begin
           @pool.delete(session_id)
         rescue Dalli::DalliError
           Rails.logger.warn("Session::DalliStore#destroy_session: #{$!.message}")
-          false
         end
+        return nil if options[:drop]
+        generate_sid
+      end
 
-        def destroy(env)
-          if sid = current_session_id(env)
-            @pool.delete(sid)
-          end
-        rescue Dalli::DalliError
-          Rails.logger.warn("Session::DalliStore#destroy: #{$!.message}")
-          false
+      def destroy(env)
+        if sid = current_session_id(env)
+          @pool.delete(sid)
         end
+      rescue Dalli::DalliError
+        Rails.logger.warn("Session::DalliStore#destroy: #{$!.message}")
+        false
+      end
 
     end
   end

data/lib/dalli/version.rb

@@ -1,3 +1,3 @@
 module Dalli
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

metadata

@@ -2,7 +2,7 @@
 name: dalli
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors: 
 - Mike Perham
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-31 00:00:00 -07:00
+date: 2011-09-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency