egalite 1.3.3 → 1.4.0

data/lib/egalite/session.rb

@@ -10,6 +10,7 @@ class Session
     @cookies = cookies
     @cookie_name = opts[:cookie_name] || 'egalite_session'
     @expire_after = opts[:expire_after] || (86400 * 30)
+    @individual_expire = opts[:individual_expire]
     @secure = opts[:secure] || false
     @path = opts[:path] || '/'
     @hash = {}
@@ -42,8 +43,17 @@ class SessionSequel < Session
       primary_key :id, :integer, :auto_increment => true
       column :mac, :varchar
       column :updated_at, :timestamp
+      column :expire_sec, :integer    # 任意項目: 個別に有効期限設定可能
     }
   end
+  def expire(t = nil)
+    t ||= Time.now
+    if @individual_expire and @hash and @hash[:expire_sec]
+      t + @hash[:expire_sec]
+    else
+      t + @expire_after
+    end
+  end
 
   def initialize(env, cookies, opts = {}) 
     @db = env.db
@@ -54,7 +64,7 @@ class SessionSequel < Session
   def cookie
     {
       :value => @sstr,
-      :expires => Time.now + @expire_after,
+      :expires => expire,
       :path => @path,
       :secure => @secure
     }
@@ -75,7 +85,7 @@ class SessionSequel < Session
     
     # timeout check
     updated = rec[:updated_at]
-    return false if Time.now > (updated + @expire_after)
+    return false if Time.now > expire(updated)
     
     @sstr = _sstr
     @hash = rec

data/lib/egalite/version.rb

@@ -1,3 +1,3 @@
 module Egalite
-  VERSION = "1.3.3"
+  VERSION = "1.4.0"
 end

data/test/test_session.rb

@@ -2,7 +2,7 @@ $LOAD_PATH << File.join(File.dirname(__FILE__), '..')
 
 require 'rubygems'
 require 'test/unit'
-require 'egalite'
+require 'lib/egalite/session'
 require 'sequel'
 
 require 'rack/test'
@@ -11,7 +11,9 @@ require 'setup'
 
 class SessionController < Egalite::Controller
   def login(id)
-    session.create(:user_id => id)
+    exp = nil
+    exp = params[:expire].to_i if params[:expire].to_i > 0
+    session.create(:user_id => id, :expire_sec => exp)
     redirect :action => :page
   end
   def page
@@ -40,7 +42,8 @@ class T_Session < Test::Unit::TestCase
     end
     Egalite::Handler.new(
       :db => db,
-      :session_handler => Egalite::SessionSequel
+      :session_handler => Egalite::SessionSequel,
+      :session_opts => {:individual_expire => true}
     )
   end
   def test_session
@@ -52,6 +55,9 @@ class T_Session < Test::Unit::TestCase
     assert last_response.redirect?
     assert last_response.headers['location'] == "/session/page"
     assert last_response.headers['set-cookie'] =~ /^egalite_session=[0-9]+_[0-9a-z]+;\s+/
+    last_response.headers['set-cookie'] =~ /expires=(.+?)(;|\Z|$)/
+    t = Time.parse($1)
+    assert t > (Time.now + 600)
     get "/session/page"
     assert last_response.ok?
     assert last_response.body =~ /9876/
@@ -80,4 +86,13 @@ class T_Session < Test::Unit::TestCase
     assert_raise(NotImplementedError) { session.save }
     assert_raise(NotImplementedError) { session.delete }
   end
+  def test_session_exp
+    get "/session/login/9876?expire=1"
+    last_response.headers['set-cookie'] =~ /expires=(.+?)(;|\Z|$)/
+    t = Time.parse($1)
+    assert last_response.redirect?
+    assert last_response.headers['location'] == "/session/page"
+    assert last_response.headers['set-cookie'] =~ /^egalite_session=[0-9]+_[0-9a-z]+;\s+/
+    assert t < (Time.now + 60)
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: egalite
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 7
   prerelease: 
   segments: 
   - 1
-  - 3
-  - 3
-  version: 1.3.3
+  - 4
+  - 0
+  version: 1.4.0
 platform: ruby
 authors: 
 - Shunichi Arai
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-07-02 00:00:00 Z
+date: 2014-09-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler