authie 1.0.3 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 552e0b30c5866a15eec565be0df2a97701d3ecdb
-  data.tar.gz: c3e542cf860658dbf144cc411fd3c787a1e252c7
+  metadata.gz: 39ab496b724091644d8e1818cd7df218a0bfc4c6
+  data.tar.gz: 8a2b3c21f0f32168a1d22618d492e88e81fc2845
 SHA512:
-  metadata.gz: 9db009386f2f59d6daf7ebe69f6d285c9523e1346dad4429c3156cb5068072020d41d9bfff4a4f56787a247acf21c80d165906dbe7c6f08f8e815915d29b862a
-  data.tar.gz: 7d08d6723c5623714e55e6845a01013f1b9cc67170fd7411f6a2de6c7a2fcf36ef2c9ed2d805ce373c9b1792bf7f7cf146f8f52ccd8d20e368216693ccd9255d
+  metadata.gz: 4089297f7f66a03d4826c189c3e57a04b77c70ed83afd60b9d5c426f3eaa261c1a48e3a70eca7548c1a712055721f1d08ac7f51329cadc661b094d47a6d1cc51
+  data.tar.gz: edc387d32a375722abd482d988da48f77f49bc363ecee408cbd5fba26300168ca7d914ef14cb024a32f7184c29210cac39ec4b24548cb62b84e022cb6d9c2c28

data/db/migrate/20141012174250_create_authie_sessions.rb

@@ -11,7 +11,7 @@ class CreateAuthieSessions < ActiveRecord::Migration
       t.datetime :last_activity_at
       t.string :last_activity_ip, :last_activity_path
       t.string :user_agent
-      t.timestamps
+      t.timestamps :null => true
     end
   end
 end

data/db/migrate/20141013115205_add_indexes_to_authie_sessions.rb

@@ -5,4 +5,4 @@ class AddIndexesToAuthieSessions < ActiveRecord::Migration
     add_index :authie_sessions, :browser_id
     add_index :authie_sessions, :user_id
   end
-end
+end

data/db/migrate/20150109144120_add_parent_id_to_authie_sessions.rb

@@ -2,4 +2,4 @@ class AddParentIdToAuthieSessions < ActiveRecord::Migration
   def change
     add_column :authie_sessions, :parent_id, :integer
   end
-end
+end

data/lib/authie.rb

@@ -1,4 +1,7 @@
 require 'authie/version'
-require 'authie/engine'
 require 'authie/config'
 require 'authie/error'
+
+if defined?(Rails)
+  require 'authie/engine'
+end

data/lib/authie/config.rb

@@ -1,18 +1,18 @@
 module Authie
   class Config
-    
+
     def session_inactivity_timeout
       @session_inactivity_timeout || 12.hours
     end
     attr_writer :session_inactivity_timeout
-    
+
     def persistent_session_length
       @persistent_session_length || 2.months
     end
     attr_writer :persistent_session_length
-        
+
   end
-  
+
   def self.config
     @config ||= Config.new
   end

data/lib/authie/controller_delegate.rb

@@ -0,0 +1,61 @@
+module Authie
+  class ControllerDelegate
+
+    def initialize(controller)
+      @controller = controller
+    end
+
+    # Set a random browser ID for this browser.
+    def set_browser_id
+      until cookies[:browser_id]
+        proposed_browser_id = SecureRandom.uuid
+        unless Session.where(:browser_id => proposed_browser_id).exists?
+          cookies[:browser_id] = {:value => proposed_browser_id, :expires => 20.years.from_now}
+        end
+      end
+    end
+
+    # Touch the auth session on each request if logged in
+    def touch_auth_session
+      if logged_in?
+        auth_session.touch!
+      end
+    end
+
+    # Return the currently logged in user object
+    def current_user
+      auth_session.user
+    end
+
+    # Set the currently logged in user
+    def current_user=(user)
+      if user
+        unless logged_in?
+          @auth_session = Session.start(@controller, :user => user)
+        end
+        @current_user = user
+      else
+        auth_session.destroy if logged_in?
+        @current_user = nil
+      end
+    end
+
+    # Is anyone currently logged in?
+    def logged_in?
+      auth_session.is_a?(Session)
+    end
+
+    # Return the currently logged in user session
+    def auth_session
+      @auth_session ||= Session.get_session(@controller)
+    end
+
+    private
+
+    # Return cookies for the controller
+    def cookies
+      @controller.send(:cookies)
+    end
+
+  end
+end

data/lib/authie/controller_extension.rb

@@ -1,57 +1,42 @@
+require 'authie/controller_delegate'
+
 module Authie
   module ControllerExtension
-    
+
     def self.included(base)
       base.helper_method :logged_in?, :current_user, :auth_session
       base.before_filter :set_browser_id, :touch_auth_session
     end
-    
+
     private
-    
-    # Set a random browser ID for this browser. 
+
+    def auth_session_delegate
+      @auth_session_delegate ||= Authie::ControllerDelegate.new(self)
+    end
+
     def set_browser_id
-      until cookies[:browser_id]
-        proposed_browser_id = SecureRandom.uuid
-        unless Session.where(:browser_id => proposed_browser_id).exists?
-          cookies[:browser_id] = {:value => proposed_browser_id, :expires => 20.years.from_now}
-        end
-      end
-    end
-    
-    # Touch the auth session on each request if logged in
+      auth_session_delegate.set_browser_id
+    end
+
     def touch_auth_session
-      if logged_in?
-        auth_session.touch!
-      end
+      auth_session_delegate.touch_auth_session
     end
-    
-    # Return the currently logged in user object
+
     def current_user
-      auth_session.user
+      auth_session_delegate.current_user
     end
-    
-    # Set the currently logged in user
+
     def current_user=(user)
-      if user
-        unless logged_in?
-          @auth_session = Session.start(self, :user => user)
-        end
-        @current_user = user
-      else
-        auth_session.destroy if logged_in?
-        @current_user = nil
-      end
-    end
-    
-    # Is anyone currently logged in?
+      auth_session_delegate.current_user = user
+    end
+
     def logged_in?
-      auth_session.is_a?(Session)
+      auth_session_delegate.logged_in?
     end
-    
-    # Return the currently logged in user session
+
     def auth_session
-      @auth_session ||= Session.get_session(self)
+      auth_session_delegate.auth_session
     end
-    
+
   end
 end

data/lib/authie/engine.rb

@@ -1,21 +1,21 @@
 module Authie
   class Engine < ::Rails::Engine
-    
+
     initializer 'authie.initialize' do |app|
       config.paths["db/migrate"].expanded.each do |expanded_path|
         app.config.paths["db/migrate"] << expanded_path
       end
-      
+
       ActiveSupport.on_load :active_record do
         require 'authie/session'
       end
-      
+
       ActiveSupport.on_load :action_controller do
         require 'authie/controller_extension'
         include Authie::ControllerExtension
       end
-      
+
     end
-    
+
   end
 end

data/lib/authie/rack_controller.rb

@@ -1,9 +1,9 @@
 # If you're dealing with your authentication in a middleware and you only have
 # access to your rack environment, this will wrap around rack and make it look
 # close enough to an ActionController to work with Authie
-# 
+#
 # Usage:
-# 
+#
 # controller = Authie::RackController.new(@env)
 # controller.current_user = user
 
@@ -22,7 +22,7 @@ module Authie
       @request.cookie_jar
     end
 
-    # Set a random browser ID for this browser. 
+    # Set a random browser ID for this browser.
     def set_browser_id
       until cookies[:browser_id]
         proposed_browser_id = SecureRandom.uuid

data/lib/authie/session.rb

@@ -36,6 +36,7 @@ module Authie
     # This method should be called each time a user performs an
     # action while authenticated with this session.
     def touch!
+      self.check_security!
       self.last_activity_at = Time.now
       self.last_activity_ip = controller.request.ip
       self.last_activity_path = controller.request.path
@@ -157,4 +158,4 @@ module Authie
     end
 
   end
-end
+end

data/lib/authie/version.rb

@@ -1,3 +1,3 @@
 module Authie
-  VERSION = '1.0.3'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: authie
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.1
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-02-27 00:00:00.000000000 Z
 dependencies: []
 description: A Rails library for storing user sessions in a backend database
 email:
@@ -22,6 +22,7 @@ files:
 - db/migrate/20150109144120_add_parent_id_to_authie_sessions.rb
 - lib/authie.rb
 - lib/authie/config.rb
+- lib/authie/controller_delegate.rb
 - lib/authie/controller_extension.rb
 - lib/authie/engine.rb
 - lib/authie/error.rb