auto-session-timeout 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77ae45c61583c38e509d9db9197d0b20043fc183
-  data.tar.gz: 0173b194b2ae4b8b1c4dabdb957cf78256cf83da
+  metadata.gz: 3561cc313c2dc97c96fb2a2a5931c01c8a442706
+  data.tar.gz: d5c805a2efeb3af57dad7d2b23aa4aa55b1df902
 SHA512:
-  metadata.gz: 9d70255cc2a19147c9e48cde559c828a396c8936001bb4054703ec42fa837c2e7932d437964bffdcd5edaa1c8934f55694c8ba373a5bdacb4a466870037117b4
-  data.tar.gz: cb1b5c13b32213881d94bd7cc329afa6cde3bc13ad0dbd4b25699cd81d52e8fb406dc14172d48131abf4f20510a7545960b56643a56fde6b29d2666f96fd1105
+  metadata.gz: 3dff428123f23f12a7cd5f9cba6a25a8d8576db3519ab01c1a70586e6ec84cf52377910207339adcc4a0360106bdd69b35dcb8bad73f68b452d005223ac0452f
+  data.tar.gz: 022ed3b160ee413a4e703bd097acdec9b865994c2d42cf57276b1087591e220f2859b69edae1c293815741ea6daa01b4bc69a4c11fdf920dba5e9ad76cbb8ba0

data/lib/auto/session/timeout/version.rb

@@ -1,7 +1,7 @@
 module Auto
   module Session
     module Timeout
-      VERSION = "0.9.4"
+      VERSION = "0.9.5"
     end
   end
 end

data/lib/auto_session_timeout.rb

@@ -6,6 +6,7 @@ module AutoSessionTimeout
   
   module ClassMethods
     def auto_session_timeout(seconds=nil)
+      protect_from_forgery except: [:active, :timeout]
       prepend_before_action do |c|
         if c.session[:auto_session_expires_at] && c.session[:auto_session_expires_at] < Time.now
           c.send :reset_session

data/lib/auto_session_timeout_helper.rb

@@ -2,33 +2,26 @@ module AutoSessionTimeoutHelper
   def auto_session_timeout_js(options={})
     frequency = options[:frequency] || 60
     verbosity = options[:verbosity] || 2
+    attributes = options[:attributes] || {}
     code = <<JS
-if (typeof(Ajax) != 'undefined') {
-  new Ajax.PeriodicalUpdater('', '/active', {frequency:#{frequency}, method:'get', onSuccess: function(e) {
-    if (e.responseText == 'false') window.location.href = '/timeout';
-  }});
-}else if(typeof(jQuery) != 'undefined'){
-  function PeriodicalQuery() {
-    $.ajax({
-      url: '/active',
-      success: function(data) {
-        if(data == 'false'){
-          window.location.href = '/timeout';
-        }
-      }
-    });
-    setTimeout(PeriodicalQuery, (#{frequency} * 1000));
-  }
-  setTimeout(PeriodicalQuery, (#{frequency} * 1000));
-} else {
-  $.PeriodicalUpdater('/active', {minTimeout:#{frequency * 1000}, multiplier:0, method:'get', verbose:#{verbosity}}, function(remoteData, success) {
-    if (success == 'success' && remoteData == 'false')
+function PeriodicalQuery() {
+  var request = new XMLHttpRequest();
+  request.onload = function (event) {
+    var status = event.target.status;
+    var response = event.target.response;
+    if (status === 200 && (response === false || response === 'false')) {
       window.location.href = '/timeout';
-  });
+    }
+  };
+  request.open('GET', '/active', true);
+  request.responseType = 'json';
+  request.send();
+  setTimeout(PeriodicalQuery, (#{frequency} * 1000));
 }
+setTimeout(PeriodicalQuery, (#{frequency} * 1000));
 JS
-    javascript_tag(code)
+    javascript_tag(code, attributes)
   end
 end
 
-ActionView::Base.send :include, AutoSessionTimeoutHelper
+ActionView::Base.send :include, AutoSessionTimeoutHelper

data/test/auto_session_timeout_helper_test.rb

@@ -8,40 +8,36 @@ describe AutoSessionTimeoutHelper do
     it "returns correct JS" do
       assert_equal "<script type=\"text/javascript\">
 //<![CDATA[
-if (typeof(Ajax) != 'undefined') {
-  new Ajax.PeriodicalUpdater('', '/active', {frequency:60, method:'get', onSuccess: function(e) {
-    if (e.responseText == 'false') window.location.href = '/timeout';
-  }});
-}else if(typeof(jQuery) != 'undefined'){
-  function PeriodicalQuery() {
-    $.ajax({
-      url: '/active',
-      success: function(data) {
-        if(data == 'false'){
-          window.location.href = '/timeout';
-        }
-      }
-    });
-    setTimeout(PeriodicalQuery, (60 * 1000));
-  }
-  setTimeout(PeriodicalQuery, (60 * 1000));
-} else {
-  $.PeriodicalUpdater('/active', {minTimeout:60000, multiplier:0, method:'get', verbose:2}, function(remoteData, success) {
-    if (success == 'success' && remoteData == 'false')
+function PeriodicalQuery() {
+  var request = new XMLHttpRequest();
+  request.onload = function (event) {
+    var status = event.target.status;
+    var response = event.target.response;
+    if (status === 200 && (response === false || response === 'false')) {
       window.location.href = '/timeout';
-  });
+    }
+  };
+  request.open('GET', '/active', true);
+  request.responseType = 'json';
+  request.send();
+  setTimeout(PeriodicalQuery, (60 * 1000));
 }
+setTimeout(PeriodicalQuery, (60 * 1000));
 
 //]]>
 </script>", subject.auto_session_timeout_js
     end
 
     it "uses custom frequency when given" do
-      assert_match /frequency:120/, subject.auto_session_timeout_js(frequency: 120)
+      assert_match /120/, subject.auto_session_timeout_js(frequency: 120)
     end
 
     it "uses 60 when custom frequency is nil" do
-      assert_match /frequency:60/, subject.auto_session_timeout_js(frequency: nil)
+      assert_match /60/, subject.auto_session_timeout_js(frequency: nil)
+    end
+
+    it "accepts attributes" do
+      assert_match /data-turbolinks-eval="false"/, subject.auto_session_timeout_js(attributes: { 'data-turbolinks-eval': 'false' })
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: auto-session-timeout
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Matthew Bass
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-16 00:00:00.000000000 Z
+date: 2017-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler