diff options
author | Azul <azul@riseup.net> | 2016-03-24 14:14:18 +0100 |
---|---|---|
committer | Azul <azul@riseup.net> | 2016-05-02 08:28:44 -0300 |
commit | 4bfbeedd9cf5f0f2a4b364764afd9c6acdc7399f (patch) | |
tree | 73179bde2951099510f6f99138192378cd4d543a /vendor/gems/couchrest_session_store/lib/couchrest/session | |
parent | 5d18e8c396181ee8fab3f8579bc19abaee106d52 (diff) |
upgrade: separate CouchRest::Session from Document
CouchRest::Session now offers the high leven API while
CouchRest::Session::Document only extends the CouchRest::Document
to have the properties (rotation, naming, etc...) that we want.
A Session has a Session::Document instead of inheriting from it.
Diffstat (limited to 'vendor/gems/couchrest_session_store/lib/couchrest/session')
-rw-r--r-- | vendor/gems/couchrest_session_store/lib/couchrest/session/document.rb | 89 | ||||
-rw-r--r-- | vendor/gems/couchrest_session_store/lib/couchrest/session/store.rb | 12 |
2 files changed, 8 insertions, 93 deletions
diff --git a/vendor/gems/couchrest_session_store/lib/couchrest/session/document.rb b/vendor/gems/couchrest_session_store/lib/couchrest/session/document.rb index b1e73cc..dc938cf 100644 --- a/vendor/gems/couchrest_session_store/lib/couchrest/session/document.rb +++ b/vendor/gems/couchrest_session_store/lib/couchrest/session/document.rb @@ -1,34 +1,15 @@ -require 'couchrest/session/utility' require 'time' class CouchRest::Session::Document < CouchRest::Document include CouchRest::Model::Configuration include CouchRest::Model::Connection - include CouchRest::Session::Utility include CouchRest::Model::Rotation rotate_database 'sessions', :every => 1.month, :expiration_field => :expires - def self.fetch(sid) - self.allocate.tap do |session_doc| - session_doc.fetch(sid) - end - end - - def self.build(sid, session, options = {}) - self.new(CouchRest::Document.new({"_id" => sid})).tap do |session_doc| - session_doc.update session, options - end - end - - def self.build_or_update(sid, session, options = {}) - options[:marshal_data] = true if options[:marshal_data].nil? - doc = self.fetch(sid) - doc.update(session, options) - return doc - rescue CouchRest::NotFound - self.build(sid, session, options) + def self.fetch(id) + database.get(id) end def self.find_by_expires(options = {}) @@ -50,70 +31,4 @@ class CouchRest::Session::Document < CouchRest::Document db end - def initialize(doc) - @doc = doc - end - - def fetch(sid = nil) - @doc = database.get(sid || doc['_id']) - end - - def to_session - if doc["marshalled"] - session = unmarshal(doc["data"]) - else - session = doc["data"] - end - return session - end - - def delete - database.delete_doc(doc) - end - - def update(session, options) - # clean up old data but leave id and revision intact - doc.reject! do |k,v| - k[0] != '_' - end - doc.merge! data_for_doc(session, options) - end - - def save - database.save_doc(doc) - rescue CouchRest::Conflict - fetch - retry - rescue CouchRest::NotFound => exc - if exc.http_body =~ /no_db_file/ - exc = CouchRest::StorageMissing.new(exc.response, database) - end - raise exc - end - - def expired? - expires && expires < Time.now - end - - protected - - def data_for_doc(session, options) - { "data" => options[:marshal_data] ? marshal(session) : session, - "marshalled" => options[:marshal_data], - "expires" => expiry_from_options(options) } - end - - def expiry_from_options(options) - expire_after = options[:expire_after] - expire_after && (Time.now + expire_after).utc - end - - def expires - doc["expires"] && Time.iso8601(doc["expires"]) - end - - def doc - @doc - end - end diff --git a/vendor/gems/couchrest_session_store/lib/couchrest/session/store.rb b/vendor/gems/couchrest_session_store/lib/couchrest/session/store.rb index f209f54..516d5dd 100644 --- a/vendor/gems/couchrest_session_store/lib/couchrest/session/store.rb +++ b/vendor/gems/couchrest_session_store/lib/couchrest/session/store.rb @@ -54,8 +54,8 @@ class CouchRest::Session::Store < ActionDispatch::Session::AbstractStore def set_session(env, sid, session, options) raise CouchRest::NotFound if /^_design\/(.*)/ =~ sid - doc = build_or_update_doc(sid, session, options) - doc.save + couchrest_session = build_or_update_doc(sid, session, options) + couchrest_session.save return sid # if we can't store the session we just return false. rescue CouchRest::Unauthorized, @@ -75,12 +75,12 @@ class CouchRest::Session::Store < ActionDispatch::Session::AbstractStore def fetch_session(sid) return nil unless sid - doc = secure_get(sid) - doc.to_session unless doc.expired? + couchrest_session = secure_get(sid) + couchrest_session.to_session unless couchrest_session.expired? end def build_or_update_doc(sid, session, options) - CouchRest::Session::Document.build_or_update(sid, session, options) + CouchRest::Session.build_or_update(sid, session, options) end # prevent access to design docs @@ -88,7 +88,7 @@ class CouchRest::Session::Store < ActionDispatch::Session::AbstractStore # but better be save than sorry. def secure_get(sid) raise CouchRest::NotFound if /^_design\/(.*)/ =~ sid - CouchRest::Session::Document.fetch(sid) + CouchRest::Session.fetch(sid) end end |