cookies_eu 1.6.3 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b1a62e4b5f016e41950bc022ab90ab47d94b7cc5
-  data.tar.gz: 20aeb7aea9379773a46272fc0da27214a44f5b27
+SHA256:
+  metadata.gz: 4a07e6be69c7cddbe47c86c923ce4ce86281f30d8dbd61f01d07eee4fca506a8
+  data.tar.gz: faf656330fdafea1be7c873b078598d0734bc35d2710c228c57eb93cbc330528
 SHA512:
-  metadata.gz: 15ca4fbb7eb41e3a9c2ffbaa759a7fce759ff3f5ec82c5c026a88b060300c4f98891c8d62bd6c3deb6e5058b6b3eb8b0f525c2fe84f889cf1e8709f5991b938e
-  data.tar.gz: 965ba8540ed4efa7f2f2b5717050a5789a6affdf332a49ace55587df20f8bc193b7fc02a8239e8525a537b56b5bd991caf330f7e31aa2cfe3b69e07e74536660
+  metadata.gz: a187d6d00ae909c5b54bff5a10e81e1db30538ebfc514816930a31a480041345ad4dd5b43630d891bde78444f9d9f23c7537dd210cc80e406a3dec58bbdf8ad8
+  data.tar.gz: d62f0a297dece5372d266bdb542b476c0c8d28d98ed11bfa4800c4016056b27eb7f69f65fc0037c4fadd7ef5bdf340cba55309696f9f5004740d1aa7b23f8bc6

data/README.md

@@ -50,7 +50,7 @@ Or manually add in application.js:
 And in application.css:
 
     *= require cookies_eu
-    
+
 Or, if you have application.scss:
 
     @import "cookies_eu";
@@ -79,17 +79,20 @@ You can add a target parameter to the link to open in a new tab
 
 If you wish to customize the style of the div the classes are:
 
-```javascript
-.cookies-eu           // main div
-.cookies-eu-content-holder // content holder
-.cookies-eu-button-holder // button holder
-.cookies-eu-ok        // button
-.cookies-eu-link      // link
+```css
+.cookies-eu                 /* main div */
+.cookies-eu-content-holder  /* content holder */
+.cookies-eu-button-holder   /* button holder */
+.cookies-eu-ok              /* button */
+.cookies-eu-link            /* link */
 ```
 
-## Turbolinks NOT supported
+## Turbolinks 5+
+
+Is supported out of the box, just require it before cookies_eu
 
-Please use [jquery.turbolinks gem](https://github.com/kossnocorp/jquery.turbolinks)
+    //= require turbolinks
+    //= require cookies_eu
 
 ## Sample of cookie info (in [haml form](/app/views/cookies_eu/cookies_info.html.haml))
 

data/app/assets/javascripts/cookies_eu.js

@@ -1,12 +1,16 @@
 //= require js.cookie
 'use strict';
 
+var windowIsTurbolinked = 'Turbolinks' in window;
+
 var cookiesEu = {
   init: function() {
     var cookiesEuOKButton = document.querySelector('.js-cookies-eu-ok');
 
     if (cookiesEuOKButton) {
       this.addListener(cookiesEuOKButton);
+      // clear turbolinks cache so cookie banner does not reappear
+      windowIsTurbolinked && window.Turbolinks.clearCache();
     }
   },
 
@@ -28,23 +32,31 @@ var cookiesEu = {
 };
 
 (function() {
+  function eventName(fallback) {
+    return windowIsTurbolinked ? 'turbolinks:load' : fallback
+  }
+
   var isCalled = false;
 
   function isReady() {
-    if (isCalled) return;
+    // return early when cookiesEu.init has been called AND Turbolinks is NOT included
+    // when Turbolinks is included cookiesEu.init has to be called on every page load
+    if (isCalled && !windowIsTurbolinked) {
+      return
+    }
     isCalled = true;
 
     cookiesEu.init();
   }
 
   if (document.addEventListener) {
-    document.addEventListener('DOMContentLoaded', isReady, false);
+    return document.addEventListener(eventName('DOMContentLoaded'), isReady, false);
   }
 
   // Old browsers IE < 9
   if (window.addEventListener) {
-    window.addEventListener('load', isReady, false);
+    window.addEventListener(eventName('load'), isReady, false);
   } else if (window.attachEvent) {
-    window.attachEvent('onload', isReady);
+    window.attachEvent(eventName('onload'), isReady);
   }
 })();

data/cookies_eu.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "js_cookie_rails"
+  spec.add_dependency "js_cookie_rails", "~> 2.2.0"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 end

data/lib/cookies_eu/version.rb

@@ -1,3 +1,3 @@
 module CookiesEu
-  VERSION = "1.6.3"
+  VERSION = "1.7.0"
 end

data/lib/generators/cookies_eu/install/install_generator.rb

@@ -6,7 +6,18 @@ module CookiesEu
       end
 
       def add_stylesheets
-        inject_into_file 'app/assets/stylesheets/application.css', "*= require cookies_eu\n", before: /\*\//, verbose: true
+        file = 'app/assets/stylesheets/application'
+        css_file = "#{file}.css"
+        scss_file = "#{file}.scss"
+        css_scss_file = "#{file}.css.scss"
+
+        if File.exists?(css_file)
+          inject_into_file css_file, "*= require cookies_eu\n", before: /\*\//, verbose: true
+        elsif File.exists?(scss_file)
+          append_file scss_file, "@import 'cookies_eu';\n"
+        else
+          append_file css_scss_file, "@import 'cookies_eu';\n"
+        end
       end
     end
   end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: cookies_eu
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.7.0
 platform: ruby
 authors:
 - Stjepan Hadjic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-08 00:00:00.000000000 Z
+date: 2018-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: js_cookie_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Displays a cookie consent. If you dont disable cokkies in settings, we assume