card-mod-google_analytics 0.14 → 0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd13be155a628aa61524100c889a95542256fa4c13b72ee7623298c3693bfe34
-  data.tar.gz: 05a230861251ff5e93e7e7a6aacf95d448389adf2930bdf4065c31b0480545cc
+  metadata.gz: c957d1bd240ffbdb77a69deb65a4c19837bdf554fdf7aa2e9365405b4881558b
+  data.tar.gz: bbd312be50e17bed094781042b2bd56a3f8e552a430c8cbae0ca52b7b853fa9f
 SHA512:
-  metadata.gz: 544be6cec435b56222f39540381450d035fdae24bc60597bd4aea265866b4066ca7fbfac4030908e8afbf5738f4ea7dec91b5092e088a75413bbcae053574273
-  data.tar.gz: 508ad066b267eab23d43710586fc4447c1af24baeb0ebe096ac4f8068451c8315de4602fc587cbcc68dbffa9a3e02a05ebbe72d0cbc1fd207b34a33f4c585035
+  metadata.gz: 0e2dd623747ace80b0149f8fc5ec399d843e16011ce35d17a50f2cfe8d5c9f66c44c4da1f976b0af606d3e62237004f016b6869ad2cbb1c2651d26bbf11afb0c
+  data.tar.gz: e7a718192871a2cd1f5c1cbd092c789c594d7d5a0ffe05da9c04702d5f229ceaa1096114ce5ebd7babe82899962e220d2818453ff20bd64915c9e81cce37b4f1

data/set/all/google_analytics.rb

@@ -8,20 +8,19 @@ def track_page!
   tracker.pageview tracker_options
 end
 
-# TODO: optimize so it doesn't keep doing lookup if there is no key.
-def google_analytics_key
-  @google_analytics_key ||=
-    Card::Rule.global_setting(:google_analytics_key) ||
-    Card.config.google_analytics_key
+def google_analytics_keys
+  @google_analytics_keys ||= Array.wrap(
+    Card::Rule.global_setting(:google_analytics_key) || Card.config.google_analytics_key
+  )
 end
 
 def tracker
   tracker_key && ::Staccato.tracker(tracker_key) # , nil, ssl: true
 end
 
-# can override to have separate keys for web and API
+# can have separate keys for web and API
 def tracker_key
-  Card.config.google_analytics_tracker_key || google_analytics_key
+  Card.config.google_analytics_tracker_key || google_analytics_keys.first
 end
 
 def tracker_options
@@ -41,14 +40,28 @@ def track_page_from_server?
 end
 
 format :html do
-  delegate :google_analytics_key, to: :card
+  delegate :google_analytics_keys, to: :card
+
+  def body_tag klasses=""
+    super { "#{render(:google_analytics_noscript)}\n\n#{yield}" }
+  end
 
   def views_in_head
-    super << :google_analytics_snippet
+    super.unshift :google_analytics_snippets
+  end
+
+  view :google_analytics_snippets, unknown: true, perms: :none do
+    haml :google_analytics_snippets if google_analytics_keys.present?
+  end
+
+  view :google_analytics_noscript, unknown: true, perms: :none do
+    haml :google_analytics_noscript if google_tag_manager_keys.present?
   end
 
-  view :google_analytics_snippet, unknown: true, perms: :none do
-    haml :google_analytics_snippet if google_analytics_key
+  def google_tag_manager_keys
+    @google_tag_manager_keys ||= google_analytics_keys.find_all do |key|
+      key.match?(/^GTM-/)
+    end
   end
 
   def google_analytics_snippet_vars

data/set/all/google_analytics_noscript.haml

@@ -0,0 +1,8 @@
+/ Google Tag Manager (noscript)
+- google_tag_manager_keys.each do |ga_key|
+  %noscript
+    %iframe{ src: "https://www.googletagmanager.com/ns.html?id=#{ga_key}",
+             height: "0",
+             width: "0",
+             style: "display:none;visibility:hidden" }
+/ End Google Tag Manager (noscript)

data/set/all/google_analytics_snippets.haml

@@ -0,0 +1,36 @@
+/ Google Analytics
+- google_analytics_keys.each do |ga_key|
+  - case ga_key
+  - when /^UA-/
+    / Universal Analytics Tag (analytics.js)
+    %script
+      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+      })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+      ga('create', '#{ga_key}', 'auto');
+      - google_analytics_snippet_vars.each do |key, value|
+        - value = "'#{value}'" if value.is_a? String
+        ga('set', '#{key}', #{value})
+      ga('send', 'pageview');
+
+  - when /^G-/
+    / Global site tag (gtag.js)
+    %script{ async: true, src: "https://www.googletagmanager.com/gtag/js?id=#{ga_key}" }
+    %script
+      window.dataLayer = window.dataLayer || [];
+      function gtag(){dataLayer.push(arguments);}
+      gtag('js', new Date());
+      = "gtag('config', '#{ga_key}');"
+
+  - when /^GTM-/
+    / Google Tag Manager (gtm.js)
+    %script
+      (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+      new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+      j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+      'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+      })(window,document,'script','dataLayer','#{ga_key}');
+
+/ End Google Analytics

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-google_analytics
 version: !ruby/object:Gem::Version
-  version: '0.14'
+  version: '0.15'
 platform: ruby
 authors:
 - Philipp Kühl
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-26 00:00:00.000000000 Z
+date: 2021-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -49,7 +49,8 @@ files:
 - README.md
 - lib/card/mod/google_analytics.rb
 - set/all/google_analytics.rb
-- set/all/google_analytics_snippet.haml
+- set/all/google_analytics_noscript.haml
+- set/all/google_analytics_snippets.haml
 homepage: http://decko.org
 licenses:
 - GPL-3.0
@@ -70,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.28
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Google Analytics support for decko

data/set/all/google_analytics_snippet.haml

@@ -1,13 +0,0 @@
-/ Google Analytics
-%script
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-  
-  ga('create', '#{google_analytics_key}', 'auto');
-  - google_analytics_snippet_vars.each do |key, value|
-    - value = "'#{value}'" if value.is_a? String
-    ga('set', '#{key}', #{value})
-  ga('send', 'pageview');
-/ End Google Analytics