couchrest_session_store 0.0.4 → 0.0.6

data/lib/couchrest_session_store.rb

@@ -45,22 +45,17 @@ class CouchRestSessionStore < ActionDispatch::Session::AbstractStore
     if sid
       doc = database.get(sid)
       session = self.class.unmarshal(doc["data"])
+      [sid, session]
     else
-      sid = generate_sid
-      session = {}
-      doc = CouchRest::Document.new "_id" => sid,
-        "data" => self.class.marshal(session)
-      database.save_doc(doc)
+      [generate_sid, {}]
     end
-    return [sid, session]
   rescue RestClient::ResourceNotFound
-    # session does not exist anymore - create a new one
-    get_session(env, nil)
+    # session data does not exist anymore
+    return [sid, {}]
   end
 
   def set_session(env, sid, session, options)
-    doc = database.get(sid)
-    doc["data"] = self.class.marshal(session)
+    doc = build_or_update_doc(sid, self.class.marshal(session))
     database.save_doc(doc)
     return sid
   end
@@ -68,12 +63,19 @@ class CouchRestSessionStore < ActionDispatch::Session::AbstractStore
   def destroy_session(env, sid, options)
     doc = database.get(sid)
     database.delete_doc(doc)
-    return nil
+    options[:drop] ? nil : generate_sid
   rescue RestClient::ResourceNotFound
     # already destroyed - we're done.
   end
 
 
+  def build_or_update_doc(sid, data)
+    doc = database.get(sid)
+    doc["data"] = data
+    return doc
+  rescue RestClient::ResourceNotFound
+    return CouchRest::Document.new "_id" => sid, "data" => data
+  end
 
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: couchrest_session_store
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-05 00:00:00.000000000 Z
+date: 2013-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest