devise-activity 0.1.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d2df215d3525ec9108eb6ea3ced82541277bc90bab084aa4a2963b64f4ecb8e
-  data.tar.gz: a17d8a0a190f94bd6927141ec5a12522ac501874a36658c5f21164248b586749
+  metadata.gz: 268948e8ed3286dbe1ad11b6f7ecba42ca45bb792ee0248ba988e4a13f8da9fe
+  data.tar.gz: 9ac2c4a71c423406cffdc841e4eab2b50811cf5d4c9c1f1268c6d488f1eae3a6
 SHA512:
-  metadata.gz: 99f7eb0ff9f06df3348b87eebf24b5eecce1afadcd9461c272205ccaa7c792e784342ad97174b317d148fd5146b7c06e75ed8dafd0217596b6814030e684f0f7
-  data.tar.gz: fbb2ee8d65a870b82fe5ee4ec75cf295d8c7255ec121a439f477bceacc020332344da759ff57616b161c03573f4205b1630e42a7dae3c9af5d4c397753d6a79c
+  metadata.gz: a05740d5551f484026ec4b8e7dff37f3d14c0c5a09a0a3a6b15699b8010ad3ebec4d4fd89131682ca963d2580ca9400d55dcb4b34015a768672ac732d32eadc1
+  data.tar.gz: 992b73404a4cd3a51d736ed35ac001455c13f8d0a24e567e2549b89f93a88c04d0db0f67ac5d6789139eb70df2abb05129c7b7e2d2e990de3b691964d48147b6

data/README.rdoc

@@ -41,15 +41,21 @@ And now you are ready to track changes
 
 It will automatically keep of sign in's, sign out's and page views history in sessions and navigations table i.e.
 
-    Session.all
+    DeviseActivity::Session.all
 
 will return last account was created by which user. Similarily
 
-    Session.last.navigations
+    DeviseActivity::Session.last.navigations
 
-    Session.where(user_id: 12).all
+    DeviseActivity::Session.where(user_id: 12).all
 
-    Session.where(user_id: 12).last.navigations
+    DeviseActivity::Session.where(user_id: 12).last.navigations
+
+    DeviseActivity::Navigation.count
+
+    DeviseActivity::Navigation.last.action
+
+    DeviseActivity::Navigation.last.controller
 
 will tells us which user updated account with id 8
 

data/lib/devise_activity/configuration.rb

@@ -2,19 +2,36 @@ module DeviseActivity
   class Configuration
     attr_accessor :sessions_table_name,
                   :navigations_table_name,
-                  :devise_model_name,
-                  :sign_in_controller_name,
-                  :sign_in_action_name,
-                  :sign_out_controller_name,
-                  :sign_out_action_name
+                  :devise_model_name
 
     def initialize
       @sessions_table_name = 'sessions'
       @navigations_table_name = 'navigations'
-      @sign_in_controller_name = 'sessions'
-      @sign_in_action_name = 'create'
-      @sign_out_controller_name = 'sessions'
-      @sign_out_action_name = 'destroy'
+      @devise_model_name = 'user'
+      add_warden_hooks
+    end
+
+    def add_warden_hooks
+      Devise.setup do |c|
+
+        Warden::Manager.after_authentication do |record, auth, opts|
+          if record and record.class == DeviseActivity.configuration.devise_model_name.classify.constantize
+            begin
+              Session.close_all_previous_sessions(record)
+              Session.start_new_session(record)
+            rescue
+              puts "Something went wrong"
+            end
+          end
+        end
+
+        Warden::Manager.before_logout do |record, _warden, _options|
+          if record and record.class == DeviseActivity.configuration.devise_model_name.classify.constantize
+            Session.close_all_previous_sessions(record) rescue nil
+          end
+        end
+
+      end
     end
   end
 end

data/lib/devise_activity/session.rb

@@ -2,9 +2,26 @@ module DeviseActivity
   class Session < ApplicationRecord
     self.table_name = DeviseActivity.configuration.sessions_table_name
 
-    scope :current, ->(current_user){ where(user_id: current_user.id)}
+    #scope :current, ->(current_user){ where(user_id: current_user.id)}
 
     has_many :navigations, class_name: 'DeviseActivity::Navigation'
 
+
+    class << self
+      def current user
+        where(user_id: user.id, signed_out_at: nil).last
+      end
+
+      def start_new_session record
+        Session.create signed_in_at: Time.now,
+                       user_id: record.id
+
+      end
+
+      def close_all_previous_sessions record
+        Session.where(user_id: record.id, signed_out_at: nil).update_all(signed_out_at: Time.now)
+      end
+    end
+
   end
 end

data/lib/devise_activity/stats.rb

@@ -0,0 +1,43 @@
+module DeviseActivity
+  class Stats
+    class << self
+
+      def most_visits_by
+        DeviseActivity::Navigation.joins(:session).group("sessions.user_id").count.max_by{|k, v| v }.first
+      end
+
+      def least_visits_by
+        DeviseActivity::Navigation.joins(:session).group("sessions.user_id").count.min_by{|k, v| v }.first
+      end
+
+      def most_popular_action
+
+      end
+
+      def least_popular_action
+
+      end
+
+      def most_popular_controller
+
+      end
+
+      def least_popular_controller
+
+      end
+
+      def most_visited_page
+
+      end
+
+      def most_sign_ins_by
+
+      end
+
+      def sign_ins_count user
+
+      end
+
+    end
+  end
+end

data/lib/devise_activity/version.rb

@@ -1,3 +1,3 @@
 module DeviseActivity
-  VERSION = "0.1.7"
+  VERSION = "0.2.0"
 end

data/lib/devise_activity.rb

@@ -9,41 +9,18 @@ module DeviseActivity
 
     before_action :track_navigation_activity, if: Proc.new{ da_current_user.present? }
 
-    prepend_before_action :track_sign_out_activity, if: Proc.new{ controller_name == DeviseActivity.configuration.sign_out_controller_name and action_name == DeviseActivity.configuration.sign_out_action_name and da_current_user.present? }
-    after_action :track_sign_in_activity, if: Proc.new{ controller_name == DeviseActivity.configuration.sign_in_controller_name and action_name == DeviseActivity.configuration.sign_in_action_name and da_current_user.present? }
-
     protected
 
-    def track_sign_out_activity
-      current_session = Session.current(current_user).last
-      current_session.signed_out_at = Time.now
-      current_session.save
-    end
-
-    def track_sign_in_activity
-      current_session = Session.current(da_current_user).new
-      current_session.signed_in_at = Time.now
-      current_session.user_id = da_current_user.id
-      current_session.ip_address = request.remote_ip
-      current_session.save
-    end
-
     def track_navigation_activity
       current_session = find_or_create_current_session
-      navigation = Navigation.create session_id:current_session.id,
-                                     page_url: request.original_url,
-                                     controller_name: controller_name,
-                                     action_name: action_name
+      Navigation.create session_id: current_session.id,
+                        page_url: request.original_url,
+                        controller_name: controller_name,
+                        action_name: action_name
     end
 
     def find_or_create_current_session
-      session = Session.current(da_current_user).last
-      unless session.present? and session.signed_out_at.nil?
-        session = Session.create ip_address: request.remote_ip,
-                                 user_id: da_current_user.id,
-                                 signed_in_at: Time.now
-      end
-      session
+      Session.current(da_current_user).present? ? Session.current(da_current_user) : Session.start_new_session(da_current_user)
     end
 
     def da_current_user

data/lib/generators/devise_activity/templates/devise_activity_initializer.rb

@@ -5,10 +5,4 @@ DeviseActivity.configure do |config|
   config.sessions_table_name = 'sessions'
   config.navigations_table_name = 'navigations'
   config.devise_model_name = 'user'
-
-  config.sign_in_controller_name = 'sessions'
-  config.sign_in_action_name = 'create'
-  config.sign_out_controller_name = 'sessions'
-  config.sign_out_action_name = 'destroy'
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise-activity
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
 platform: ruby
 authors:
 - M Shahzad Tariq
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-25 00:00:00.000000000 Z
+date: 2019-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -41,6 +41,7 @@ files:
 - lib/devise_activity/extenders/session.rb
 - lib/devise_activity/navigation.rb
 - lib/devise_activity/session.rb
+- lib/devise_activity/stats.rb
 - lib/devise_activity/version.rb
 - lib/generators/devise_activity/install_generator.rb
 - lib/generators/devise_activity/migration_generator.rb
@@ -82,7 +83,7 @@ files:
 - test/dummy/public/favicon.ico
 - test/test_helper.rb
 - test/trackstamps_test.rb
-homepage: http://github.com/mshahzadtariq/devise_activity
+homepage: http://github.com/mshahzadtariq/devise-activity
 licenses:
 - MIT
 metadata: {}