couchrest_session_store 0.1.0 → 0.1.2

data/README.md

@@ -1,3 +1,7 @@
 # CouchRest Session Store #
 
-A simple session store based on CouchRest Model - nothing more.
+A simple session store based on CouchRest Model.
+
+## Options ##
+
+* marhal_data: (_defaults true_) - if set to false session data will be stored directly in the couch document. Otherwise it's marshalled and base64 encoded to enable restoring ruby data structures.

data/lib/couchrest_session_store.rb

@@ -1,5 +1,7 @@
 require 'couchrest'
 require 'couchrest_model'
+# ensure compatibility with couchrest_model
+gem 'actionpack', '~> 3.0'
 require 'action_dispatch'
 
 # CouchDB session storage for Rails.
@@ -52,7 +54,12 @@ class CouchRestSessionStore < ActionDispatch::Session::AbstractStore
   def get_session(env, sid)
     if sid
       doc = secure_get(sid)
-      session = self.class.unmarshal(doc["data"])
+      if doc["not_marshalled"]
+        session = doc.to_hash
+        session.delete("not_marshalled")
+      else
+        session = self.class.unmarshal(doc["data"])
+      end
       [sid, session]
     else
       [generate_sid, {}]
@@ -63,7 +70,7 @@ class CouchRestSessionStore < ActionDispatch::Session::AbstractStore
   end
 
   def set_session(env, sid, session, options)
-    doc = build_or_update_doc(sid, self.class.marshal(session))
+    doc = build_or_update_doc(sid, session, options[:marshal_data])
     database.save_doc(doc)
     return sid
   end
@@ -71,17 +78,28 @@ class CouchRestSessionStore < ActionDispatch::Session::AbstractStore
   def destroy_session(env, sid, options)
     doc = secure_get(sid)
     database.delete_doc(doc)
-    options[:drop] ? nil : generate_sid
+    generate_sid unless options[:drop]
   rescue RestClient::ResourceNotFound
     # already destroyed - we're done.
+    generate_sid unless options[:drop]
   end
 
-  def build_or_update_doc(sid, data)
+  def build_or_update_doc(sid, session, marshal_data)
+    marshal_data = true if marshal_data.nil?
     doc = secure_get(sid)
-    doc["data"] = data
+    doc.clear.merge! data_for_doc(session, marshal_data)
     return doc
   rescue RestClient::ResourceNotFound
-    return CouchRest::Document.new "_id" => sid, "data" => data
+    data = data_for_doc(session, marshal_data).merge({"_id" => sid})
+    return CouchRest::Document.new(data)
+  end
+
+  def data_for_doc(session, marshal_data)
+    if marshal_data
+      { "data" => self.class.marshal(session) }
+    else
+      session.merge({"not_marshalled" => true})
+    end
   end
 
   # prevent access to design docs

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: couchrest_session_store
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-25 00:00:00.000000000 Z
+date: 2013-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A Rails Session Store based on CouchRest Model