couchrest_session_store 0.2.2 → 0.2.4

data/couchrest_session_store.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
   gem.files = `git ls-files`.split("\n")
   gem.name = "couchrest_session_store"
   gem.require_paths = ["lib"]
-  gem.version = '0.2.2'
+  gem.version = '0.2.4'
 
   gem.add_dependency "couchrest"
   gem.add_dependency "couchrest_model"

data/lib/couchrest/session/document.rb

@@ -1,16 +1,16 @@
 require 'couchrest/session/utility'
 require 'time'
 
-class CouchRest::Session::Document
+class CouchRest::Session::Document < CouchRest::Document
+  include CouchRest::Model::Configuration
+  include CouchRest::Model::Connection
   include CouchRest::Session::Utility
 
-  def initialize(doc)
-    @doc = doc
-  end
+  use_database "sessions"
 
-  def self.load(sid)
+  def self.fetch(sid)
     self.allocate.tap do |session_doc|
-      session_doc.load(sid)
+      session_doc.fetch(sid)
     end
   end
 
@@ -22,15 +22,26 @@ class CouchRest::Session::Document
 
   def self.build_or_update(sid, session, options = {})
     options[:marshal_data] = true if options[:marshal_data].nil?
-    doc = self.load(sid)
+    doc = self.fetch(sid)
     doc.update(session, options)
     return doc
   rescue RestClient::ResourceNotFound
     self.build(sid, session, options)
   end
 
-  def load(sid)
-    @doc = database.get(sid)
+  def self.find_by_expires(options = {})
+    options[:reduce] ||= false
+    design = database.get '_design/Session'
+    response = design.view :by_expires, options
+    response['rows']
+  end
+
+  def initialize(doc)
+    @doc = doc
+  end
+
+  def fetch(sid = nil)
+    @doc = database.get(sid || doc['_id'])
   end
 
   def to_session
@@ -56,6 +67,9 @@ class CouchRest::Session::Document
 
   def save
     database.save_doc(doc)
+  rescue RestClient::Conflict
+    fetch
+    retry
   end
 
   def expired?

data/lib/couchrest/session/store.rb

@@ -1,47 +1,36 @@
 class CouchRest::Session::Store < ActionDispatch::Session::AbstractStore
 
-  include CouchRest::Model::Configuration
-  include CouchRest::Model::Connection
-
-  def initialize(app, options = {})
-    super
-    self.class.set_options(options)
+  # delegate configure to document
+  def self.configure(*args, &block)
+    CouchRest::Session::Document.configure *args, &block
   end
 
   def self.set_options(options)
     @options = options
+    if @options[:database]
+      CouchRest::Session::Document.use_database @options[:database]
+    end
   end
 
-  # just fetch from the config
-  def self.database
-    @database ||= initialize_database
-  end
-
-  def self.initialize_database
-    use_database @options[:database] || "sessions"
+  def initialize(app, options = {})
+    super
+    self.class.set_options(options)
   end
 
   def cleanup(rows)
     rows.each do |row|
-      doc = CouchRest::Session::Document.load(row['id'])
+      doc = CouchRest::Session::Document.fetch(row['id'])
       doc.delete
     end
   end
 
   def expired
-    find_by_expires startkey: 1,
+    CouchRest::Session::Document.find_by_expires startkey: 1,
       endkey: Time.now.utc.iso8601
   end
 
   def never_expiring
-    find_by_expires endkey: 1
-  end
-
-  def find_by_expires(options = {})
-    options[:reduce] ||= false
-    design = self.class.database.get '_design/Session'
-    response = design.view :by_expires, options
-    response['rows']
+    CouchRest::Session::Document.find_by_expires endkey: 1
   end
 
   private
@@ -55,6 +44,12 @@ class CouchRest::Session::Store < ActionDispatch::Session::AbstractStore
   rescue RestClient::ResourceNotFound
     # session data does not exist anymore
     return [sid, {}]
+  rescue RestClient::Unauthorized,
+    Errno::EHOSTUNREACH,
+    Errno::ECONNREFUSED => e
+    # can't connect to couch. We add some status to the session
+    # so the app can react. (Display error for example)
+    return [sid, {"_status" => {"couch" => "unreachable"}}]
   end
 
   def set_session(env, sid, session, options)
@@ -62,7 +57,10 @@ class CouchRest::Session::Store < ActionDispatch::Session::AbstractStore
     doc = build_or_update_doc(sid, session, options)
     doc.save
     return sid
-  rescue CouchRest::Model::Errors::ConnectionFailed
+  # if we can't store the session we just return false.
+  rescue RestClient::Unauthorized,
+    Errno::EHOSTUNREACH,
+    Errno::ECONNREFUSED => e
     return false
   end
 
@@ -90,7 +88,7 @@ class CouchRest::Session::Store < ActionDispatch::Session::AbstractStore
   # but better be save than sorry.
   def secure_get(sid)
     raise RestClient::ResourceNotFound if /^_design\/(.*)/ =~ sid
-    CouchRest::Session::Document.load(sid)
+    CouchRest::Session::Document.fetch(sid)
   end
 
 end

data/lib/couchrest/session/utility.rb

@@ -9,8 +9,4 @@ module CouchRest::Session::Utility
     Marshal.load(::Base64.decode64(data)) if data
   end
 
-  def database
-    CouchRest::Session::Store.database
-  end
-
 end

data/test/couch_tester.rb

@@ -3,14 +3,16 @@
 # on the SessionStore
 #
 
-class CouchTester
+class CouchTester < CouchRest::Document
   include CouchRest::Model::Configuration
   include CouchRest::Model::Connection
 
-  attr_reader :database
+  use_database 'sessions'
 
   def initialize(options = {})
-    @database = self.class.use_database options[:database] || "sessions"
+    if options[:database]
+      self.class.use_database options[:database]
+    end
   end
 
   def get(sid)

data/test/session_document_test.rb

@@ -0,0 +1,27 @@
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+
+class SessionDocumentTest < MiniTest::Test
+
+  def test_storing_session
+    sid = '1234'
+    session = {'a' => 'b'}
+    options = {}
+    doc = CouchRest::Session::Document.build_or_update(sid, session, options)
+    doc.save
+    doc.fetch(sid)
+    assert_equal session, doc.to_session
+  end
+
+  def test_storing_session_with_conflict
+    sid = '1234'
+    session = {'a' => 'b'}
+    options = {}
+    doc = CouchRest::Session::Document.build_or_update(sid, session, options)
+    doc2 = CouchRest::Session::Document.build_or_update(sid, session, options)
+    doc.save
+    doc2.save
+    doc2.fetch(sid)
+    assert_equal session, doc2.to_session
+  end
+
+end

data/test/session_store_test.rb

@@ -64,7 +64,7 @@ class SessionStoreTest < MiniTest::Test
 
   def test_stored_and_not_expired_yet
     sid, session = expiring_session
-    doc = CouchRest::Session::Document.load(sid)
+    doc = CouchRest::Session::Document.fetch(sid)
     expires = doc.send :expires
     assert expires
     assert !doc.expired?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: couchrest_session_store
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-09 00:00:00.000000000 Z
+date: 2013-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest
@@ -110,6 +110,7 @@ files:
 - lib/couchrest/session/utility.rb
 - lib/couchrest_session_store.rb
 - test/couch_tester.rb
+- test/session_document_test.rb
 - test/session_store_test.rb
 - test/setup_couch.sh
 - test/test_clock.rb