smart_cookie_store 0.0.1 → 0.0.2

data/README.md

@@ -20,10 +20,23 @@ session is not empty.
 Usage
 =====
 
+Install as a gem:
+-----------------
+
+    gem install smart_cookie_store
+
+And add it to your `config/environment.rb`:
+
+    config.gem "smart_cookie_store"
+
 Install as a plugin:
+--------------------
 
     script/plugin install git://github.com/msales/smart_cookie_store.git
-    
+
+Configuration
+-------------
+
 The configure your app to use the new `SmartCookieStore`:
 
     ActionController::Base.session_store = :smart_cookie_store

data/Rakefile

@@ -11,7 +11,7 @@ PKG_FILES = FileList[
 
 spec = Gem::Specification.new do |s|
   s.name = "smart_cookie_store"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
   s.author = "Urban Hafner"
   s.email = "urban@bettong.net"
   s.homepage = "http://github.com/msales/smart_cookie_store"

data/lib/smart_cookie_store.rb

@@ -1,8 +1,8 @@
 class SmartCookieStore < ActionController::Session::CookieStore
   
-  SH = ActionController::Session::AbstractStore::SessionHash
   def call(env)
-    env[ENV_SESSION_KEY] = SH.new(self, env)
+    sh = ActionController::Session::AbstractStore::SessionHash
+    env[ENV_SESSION_KEY] = sh.new(self, env)
     env[ENV_SESSION_OPTIONS_KEY] = @default_options.dup
 
     status, headers, body = @app.call(env)
@@ -10,26 +10,30 @@ class SmartCookieStore < ActionController::Session::CookieStore
     session_data = env[ENV_SESSION_KEY]
     options = env[ENV_SESSION_OPTIONS_KEY]
 
-    if !session_data.is_a?(SH) || session_data.send(:loaded?) || options[:expire_after]
-      session_data.send(:load!) if session_data.is_a?(SH) && !session_data.send(:loaded?)
+    if !session_data.is_a?(sh) || session_data.send(:loaded?) || options[:expire_after]
+      session_data.send(:load!) if session_data.is_a?(sh) && !session_data.send(:loaded?)
       
-      unless session_data.keys.reject {|k| k == :session_id }.empty?
+      cookie = Hash.new
+
+      session_keys = session_data.keys.reject {|k| k == :session_id }
+      if session_keys.empty? || session_keys.all? {|k| session_data[k].blank?}
+        cookie[:value]   = ''
+        cookie[:expires] = Time.at(0)
+      else
         marshaled_session_data = marshal(session_data.to_hash)
 
         raise CookieOverflow if marshaled_session_data.size > MAX
 
-        cookie = Hash.new
         cookie[:value] = marshaled_session_data
         unless options[:expire_after].nil?
           cookie[:expires] = Time.now + options[:expire_after]
         end
-
-        cookie = build_cookie(@key, cookie.merge(options))
-        unless headers[HTTP_SET_COOKIE].blank?
-          headers[HTTP_SET_COOKIE] << "\n#{cookie}"
-        else
-          headers[HTTP_SET_COOKIE] = cookie
-        end
+      end
+      cookie = build_cookie(@key, cookie.merge(options))
+      unless headers[HTTP_SET_COOKIE].blank?
+        headers[HTTP_SET_COOKIE] << "\n#{cookie}"
+      else
+        headers[HTTP_SET_COOKIE] = cookie
       end
     end
 

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: smart_cookie_store
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Urban Hafner
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-29 00:00:00 +01:00
+date: 2010-04-28 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -39,18 +44,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Enhanced Rails CookieStore