ixtlan-session-timeout 0.1.1 → 0.2.0

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2008 Kristian Meier
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/ixtlan/sessions/railtie.rb

@@ -9,11 +9,12 @@ module Ixtlan
         app.config.class.class_eval do
           attr_accessor :idle_session_timeout
         end
-        app.config.idle_session_timeout = 5 #minutes
+        app.config.idle_session_timeout = 15 #minutes
       end
       
       config.after_initialize do |app|
         ::ActionController::Base.send(:include, Ixtlan::Sessions::Timeout)
+        ::ActionController::Base.send(:before_filter, :check_session)
       end
     end
   end

data/lib/ixtlan/sessions/timeout.rb

@@ -23,21 +23,24 @@ module Ixtlan
         session_timeout
         return false
       end
-      
+
+      unless respond_to? :logged_in?
+        def logged_in?
+          respond_to?(:current_user) && send(:current_user)
+        end
+      end
+
       protected
       
       def check_session_expiry
-puts "- - - -"
-p session[:expires_at].asctime if session[:expires_at]
-p DateTime.now.asctime
-p ( session[:expires_at] && session[:expires_at] < DateTime.now)
+        return true unless logged_in?
         if session[:expires_at] && session[:expires_at] < DateTime.now
           # Session has expired.
           session_log("session timeout")
           expire_session
         else
           # Assign a new expiry time
-          session[:expires_at] = session_idle_timeout.minutes.from_now
+          session[:expires_at] = idle_session_timeout.minutes.from_now
           return true
         end
       end
@@ -45,6 +48,7 @@ p ( session[:expires_at] && session[:expires_at] < DateTime.now)
       # IP binding is not very useful in the wild since some ISP use 
       # a different IP for each request, i.e. the session uses many IPs
       def check_session_ip_binding
+        return true unless logged_in?
         if !session[:session_ip].nil? && session[:session_ip] != request.headers['REMOTE_ADDR']
           # client IP has changed
           session_log("IP changed from #{session[:session_ip]} to #{request.headers['REMOTE_ADDR']}")
@@ -57,10 +61,12 @@ p ( session[:expires_at] && session[:expires_at] < DateTime.now)
       end
       
       def check_session
+        return true unless logged_in?
         check_session_browser_signature && check_session_expiry
       end
       
       def check_session_browser_signature
+        return true unless logged_in?
         if !session[:session_browser_signature].nil? and session[:session_browser_signature] != retrieve_browser_signature
           # browser signature has changed
           session_log("browser signature changed from #{session[:session_browser_signature]} to #{retrieve_browser_signature}")
@@ -90,8 +96,8 @@ p ( session[:expires_at] && session[:expires_at] < DateTime.now)
         end
       end
       
-      def session_idle_timeout
-        Rails.configuration.session_idle_timeout
+      def idle_session_timeout
+        Rails.configuration.idle_session_timeout
       end
     end
   end

data/spec/timeout_spec.rb

@@ -4,6 +4,8 @@ require 'date'
 
 class Controller
   
+  attr_accessor :current_user
+
   def logger
     @logger ||= Logger.new(STDOUT)
   end
@@ -52,7 +54,7 @@ class Rails
     self
   end
 
-  def self.session_idle_timeout(val = nil)
+  def self.idle_session_timeout(val = nil)
     @val = MyDate.new(val) if val
     @val
   end
@@ -84,6 +86,7 @@ describe Ixtlan::Sessions::Timeout do
 
   before :each do
     @controller.session.clear
+    @controller.current_user = Object.new
   end
 
   it "should keep session when staying on same remote IP" do
@@ -107,7 +110,7 @@ describe Ixtlan::Sessions::Timeout do
   end
 
   it "should keep session if idle timeout is in the future" do
-    Rails.configuration.session_idle_timeout(1)
+    Rails.configuration.idle_session_timeout(1)
     @controller.session.size.should == 0
     @controller.send(:check_session_expiry).should be_true
     @controller.session.size.should == 1
@@ -116,7 +119,7 @@ describe Ixtlan::Sessions::Timeout do
   end
 
   it "should kill session if idle timeout is in the past" do
-    Rails.configuration.session_idle_timeout(-1)
+    Rails.configuration.idle_session_timeout(-1)
     @controller.session.size.should == 0
     # first the session has not expiration_date so it will be set
     @controller.send(:check_session_expiry).should be_true
@@ -126,9 +129,20 @@ describe Ixtlan::Sessions::Timeout do
     @controller.session.size.should == 0
   end
 
-  it "should use the controller session_idle_timeout if overwritten" do
+  it "should leave session along if there is no current_user" do
+    @controller.current_user = nil
+    @controller.session.size.should == 0
+    @controller.send(:check_session_expiry).should be_true
+    @controller.session.size.should == 0
+    @controller.send(:check_session_browser_signature).should be_true
+    @controller.session.size.should == 0
+    @controller.send(:check_session_ip_binding).should be_true
+    @controller.session.size.should == 0
+  end
+
+  it "should use the controller idle_session_timeout if overwritten" do
     @controller.class.class_eval do
-      def  session_idle_timeout
+      def idle_session_timeout
         MyDate.new(1)
       end
     end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
     - 0
-    - 1
-    - 1
-  version: 0.1.1
+    - 2
+    - 0
+  version: 0.2.0
 platform: ruby
 authors: 
   - mkristian
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-22 00:00:00 +05:30
+date: 2011-04-03 00:00:00 +05:30
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -55,6 +55,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+  - MIT-LICENSE
   - lib/ixtlan-session-timeout.rb
   - lib/ixtlan/sessions/timeout.rb
   - lib/ixtlan/sessions/railtie.rb
@@ -64,9 +65,8 @@ homepage: http://github.com/mkristian/ixtlan-session-timeout
 licenses: 
   - MIT-LICENSE
 post_install_message: 
-rdoc_options: 
-  - --main
-  - README.textile
+rdoc_options: []
+
 require_paths: 
   - lib
 required_ruby_version: !ruby/object:Gem::Requirement