devise-automaticlogout 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60c16b638b9295ea0c311d1017b1f87a92b77637
-  data.tar.gz: 3b6bbc12b9e7f595f1af9241bc71c335f37e2e9c
+  metadata.gz: 52ed5da827aea06f7e10d00f5cbf2a07b19e1a76
+  data.tar.gz: ee85c8798fc12f20d89a33d421cc7321ddb58dd1
 SHA512:
-  metadata.gz: 3731202a8922acc897e944296e9fa90ab21fdf927f29b7618bdbc939fe7a2822bdc66394e57a0f852ceb1d8a296ce3a164a874ae73d1f43e12b8865a7767f890
-  data.tar.gz: 0e0ef041a0dbe58c85015c9a318640db805f52c69a6713ea89c78524bd6066f707241027286d761ff86b0629a565219c74390590340d9c29b2a4e8ab8df9d795
+  metadata.gz: fd92b4c4e1e6ff1fa0b5eae7d194e7b88d9c90ffc34a0a1f309ecdf93c4cdb57df272ccbcf6ec3bec30cda7fd63d806b46f5165d72e67ddd7e96e6c9efb4bf9b
+  data.tar.gz: 0054de9eb567ae6567b4635e7847302a5c51bf8ecec1037d84f581e4a7bc82c39708206e0782a31c01b0e05fe4d8a55fe2299008ab4322c42e71540ea8ba630b

data/app/views/automatic_logout/_timer.html.erb

@@ -1,4 +1,5 @@
-<div class="regressive-timer"
+<span class="regressive-timer"
+  data-visible="<%= visible %>"
   data-seconds="<%= session[:seconds] %>"
   data-message="<%= session[:message] %>">
-</div>
+</span>

data/lib/assets/javascripts/automatic_logout.js

@@ -4,22 +4,28 @@
  */
 var AutomaticLogout = AutomaticLogout || {};
 
-$(document).ready(function(){
-  // Change to $() for document.querySelector(".regressive-timer")
-  var $regressiveTimer = $('.regressive-timer');
-
-  ($regressiveTimer.length > 0 &&
-  $regressiveTimer.data('expires-at') !== '')
-    ? AutomaticLogout.regressiveTimer()
-    : AutomaticLogout.ajaxSessionTimeout();
-});
+AutomaticLogout.load = function(){
+  var $regressiveTimer = document.querySelectorAll('.regressive-timer')[0];
+  
+  if((!!$regressiveTimer) && ($regressiveTimer.dataset.seconds != '')){
+    AutomaticLogout.regressiveTimer();
+  }
+}
 
 /**
  * Send request for destroy session current_user
  * @return {[type]} [description]
  */
-AutomaticLogout.destroySession = function(){
-  return window.location.href = '/devise/automatic_logout/destroy';
+AutomaticLogout.destroySession = function(message){
+  var xhr = new XMLHttpRequest();
+  xhr.open('GET','/devise/automatic_logout/destroy', true);
+  xhr.onload = function(){
+    if(xhr.status == 200){  
+      if(message) alert(message)
+      return window.location.href = '/';
+    }
+  }
+  xhr.send();
 }
 
 /**
@@ -27,15 +33,37 @@ AutomaticLogout.destroySession = function(){
  * @param  {[type]} date_session [description]
  * @return {[type]}              [description]
  */
-AutomaticLogout.regressiveTimer = function(){;
+AutomaticLogout.regressiveTimer = function(){
+
+  /**
+   * Define o que vai ser impresso no DOM.
+   * @param {DOM Object} container 
+   * @param {Boolean} visible 
+   * @param {String} textContent 
+   */
+  var visibleTimer = function(container, visible, textContent){
+    if (!visible) visible = 'false';
+    if (!textContent) textContent = '00:00:00';
+
+    if (visible == 'true'){
+      return container.textContent = textContent;
+    }
+  }
+  
   /**
    * Variables used
    * @param  {[type]} '.regressive-timer' [description]
    * @return {[type]}                     [description]
    */
-  var data_message = $('.regressive-timer').data('message'),
-      data_seconds = $('.regressive-timer').data('seconds'),
+  var $regressiveTimer = document.querySelector('.regressive-timer'),
+      data_message = String($regressiveTimer.dataset.message),
+      data_seconds = Number($regressiveTimer.dataset.seconds),
       current_time = new Date().getTime();
+    
+  visibleTimer(
+    $regressiveTimer, 
+    $regressiveTimer.dataset.visible
+  );
 
   var time_expired = new Date();
   time_expired.setSeconds(time_expired.getSeconds() + data_seconds);
@@ -45,23 +73,21 @@ AutomaticLogout.regressiveTimer = function(){;
       
       if (data_seconds == 0) { 
         clearInterval(timerDecrement); 
-
         // limpa a sessão após o ok
-        if (confirm(data_message)) {
-          AutomaticLogout.destroySession();
-        };
+        AutomaticLogout.destroySession(data_message);
       }else{
         //tempo descrecente
         time_expired.setSeconds(time_expired.getSeconds() - 1);
         
-        var 
-          // converte pra segundos
-          seconds_integer = (time_expired.getTime() - current_time) / 1000,
-          //faz o parse 
-          date_format = AutomaticLogout.parseDate(seconds_integer);
-
-        // atualiza o DOM
-        $('.regressive-timer').text(date_format.hours + ':' + date_format.minutes + ':' + date_format.seconds);
+        var seconds_integer = (time_expired.getTime() - current_time) / 1000,
+            date_format = AutomaticLogout.parseDate(seconds_integer),
+            output_date_format = date_format.hours + ':' + date_format.minutes + ':' + date_format.seconds;
+
+        visibleTimer(
+          $regressiveTimer, 
+          $regressiveTimer.dataset.visible, 
+          output_date_format
+        );
       }
       
       data_seconds -= 1;
@@ -115,37 +141,4 @@ AutomaticLogout.parseDate = function(seconds_float){
     minutes: minutes,
     seconds: seconds
   }
-}
-
-/**
- * Method for request ajax, check value e logout
- * @return {[type]} [description]
- */
-AutomaticLogout.ajaxSessionTimeout = function(){
-  setTimeout(function () {
-   //TODO: Change to ES6/7 fetch() feature 
-    $.ajax({
-      url: '/devise/automatic_logout/status',
-      success: function(data) {
-        if (data.seconds !== "null" && data.live === true){
-          
-          var data_message = data.message, data_seconds = data.seconds;
-
-          if (data_seconds != 0 && data_seconds != ''){
-            var timerDecrement = setInterval(function(){    
-              if (data_seconds == 0) { 
-                clearInterval(timerDecrement); 
-                // limpa a sessão após o ok do alertify
-                if (confirm(data_message)) {
-                  AutomaticLogout.destroySession();
-                }
-              }
-              
-              data_seconds -= 1;
-            }, 1000)
-          }
-        }
-      }
-    });
-  }, 1000); //1s
-};
+}

data/lib/assets/javascripts/automatic_logout/classic.js

@@ -0,0 +1,4 @@
+// sem turbolinks
+document.addEventListener('DOMContentLoaded', function () {
+  AutomaticLogout.load();
+})

data/lib/assets/javascripts/automatic_logout/jquery.js

@@ -0,0 +1,4 @@
+// jquery ready
+$(document).on('page:change turbolinks:load',function(){
+  AutomaticLogout.load();
+})

data/lib/assets/javascripts/automatic_logout/turbolinks-classic.js

@@ -0,0 +1,5 @@
+// rails 4
+// turbolinks-classic
+document.addEventListener('page:change', function(){
+  AutomaticLogout.load();
+})

data/lib/assets/javascripts/automatic_logout/turbolinks.js

@@ -0,0 +1,5 @@
+// rails 5 >
+// turbolinks 5
+document.addEventListener('turbolinks:load', function(){
+  AutomaticLogout.load();
+})

data/lib/devise/automaticlogout/controllers.rb

@@ -13,23 +13,23 @@ module Devise
             # I18n.t devise.automaticlogout.message
             c.session[:message] = I18n.t 'devise.automaticlogout.message' || 'Session expired!'
           end
-        end
 
-        ::ApplicationController.send :define_method, :automatic_logout_status do
-          Rails.logger.info 'Sessão atualizada'
-          render json: {
-            live: !current_user.nil?,
-            message: session[:message],
-            seconds: session[:seconds]
-          }, status: :ok
-        end
+          ::ApplicationController.send :define_method, :automatic_logout_status do
+            Rails.logger.info 'Sessão atualizada'
+            render json: {
+              live: !current_user.nil?,
+              message: session[:message],
+              seconds: session[:seconds]
+            }, status: :ok
+          end
 
-        ::ApplicationController.send :define_method, :automatic_logout_destroy do
-          Rails.logger.info 'Sessão destruída'
-          session[:seconds] = ''
-          session[:live] = !current_user.nil?
-          reset_session
-          redirect_to '/', notice: session[:message]
+          ::ApplicationController.send :define_method, :automatic_logout_destroy do
+            Rails.logger.info 'Sessão destruída'
+            session[:seconds] = ''
+            session[:live] = !current_user.nil?
+            reset_session
+            redirect_to '/', notice: session[:message]
+          end
         end
       end
     end

data/lib/devise/automaticlogout/helpers.rb

@@ -1,8 +1,8 @@
 module Devise
   module AutomaticLogout
     module Helpers
-      def regressive_timer
-        render 'automatic_logout/timer'
+      def regressive_timer(visible: false)
+        render 'automatic_logout/timer', visible: visible
       end
     end
   end

data/lib/devise/automaticlogout/version.rb

@@ -1,5 +1,5 @@
 module Devise
   module Automaticlogout
-    VERSION = '0.1.0'.freeze
+    VERSION = '0.2.1'.freeze
   end
 end

metadata

@@ -1,83 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: devise-automaticlogout
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Thadeu Esteves Jr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-24 00:00:00.000000000 Z
+date: 2017-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: jquery-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 description: Provides automatic session timeout in a Rails Devise application.
@@ -93,6 +79,10 @@ files:
 - app/views/automatic_logout/_timer.html.erb
 - config/routes.rb
 - lib/assets/javascripts/automatic_logout.js
+- lib/assets/javascripts/automatic_logout/classic.js
+- lib/assets/javascripts/automatic_logout/jquery.js
+- lib/assets/javascripts/automatic_logout/turbolinks-classic.js
+- lib/assets/javascripts/automatic_logout/turbolinks.js
 - lib/devise/automaticlogout.rb
 - lib/devise/automaticlogout/controllers.rb
 - lib/devise/automaticlogout/engine.rb