Move to Google Analytics 4

Author: yrodiere

_config/redirects.template

@@ -3,7 +3,7 @@
 <meta charset="UTF-8">
 <meta http-equiv="refresh" content="5; url=%{url}">
 
-%{google_analytics_universal}
+%{google_analytics}
 
 <script>
 window.location.href = "%{url}"

_config/site.yml

@@ -678,5 +678,5 @@ profiles:
     enable_google_analytics: true
     news_feed_root_url: https://in.relation.to/feeds
 
-google_analytics: 
-  account: UA-45270411-1
+google_analytics:
+  id: G-6XDRJZ1Q1R

_ext/google_analytics_4.rb

@@ -0,0 +1,32 @@
+module Awestruct
+  module Extensions
+    module GoogleAnalytics4
+
+      def google_analytics(options={})
+        options = defaults(options)
+
+        html = ''
+        html += %Q(<!-- Google tag (gtag.js) -->\n)
+        html += %Q(<script async src="https://www.googletagmanager.com/gtag/js?id=#{options[:id]}"></script>\n)
+        html += %Q(<script>\n)
+        html += %Q(  window.dataLayer = window.dataLayer || [];\n)
+        html += %Q(  function gtag(){dataLayer.push(arguments);}\n)
+        html += %Q(  gtag('js', new Date());\n)
+        html += %Q(\n)
+        html += %Q(  gtag('config', '#{options[:id]}');\n)
+        html += %Q(</script>\n)
+
+        html
+      end
+
+      private
+
+      def defaults(options)
+        options = site.google_analytics.merge(options) if site.google_analytics.is_a?(Hash)
+        options = Hash[options.map{ |k, v| [k.to_sym, v] }]
+
+        options
+      end
+    end
+  end
+end

_ext/pipeline.rb

@@ -1,6 +1,7 @@
 require 'js_minifier'
 require 'css_minifier'
 require 'html_minifier'
+require 'google_analytics_4'
 require 'relative'
 require 'releases'
 require 'release_file_parser'
@@ -36,7 +37,7 @@
 Awestruct::Extensions::Pipeline.new do
   # register helpers to be used in templates
   helper Awestruct::Extensions::Partial
-  helper Awestruct::Extensions::GoogleAnalytics
+  helper Awestruct::Extensions::GoogleAnalytics4
   helper Awestruct::Extensions::Relative
   helper Awestruct::Extensions::Releases
   helper Awestruct::Extensions::DirectoryListing

_ext/redirect_creator.rb

@@ -1,4 +1,5 @@
 require 'awestruct/handlers/base_handler'
+require 'google_analytics_4'
 
 module Awestruct
   module Extensions
@@ -32,7 +33,7 @@ def execute(site)
 
   module Handlers
     class RedirectCreationHandler < BaseHandler
-      include Awestruct::Extensions::GoogleAnalytics
+      include Awestruct::Extensions::GoogleAnalytics4
 
       Default_Redirect_Template = "redirects.template"
       def initialize(site, requested_url, target_url)
@@ -85,7 +86,7 @@ def load_template
         file = File.open(template_file, "rb")
         content = file.read
         file.close
-        content % {url: @target_url, google_analytics_universal: google_analytics_universal}
+        content % {url: @target_url, google_analytics: google_analytics}
       end
     end
   end

_layouts/base.html.haml

@@ -2,6 +2,8 @@
 %html(lang="en")
   %head
     = partial('head.html.haml', { "real_page" => page } )
+    - if site.enable_google_analytics
+      = google_analytics
 
   %body.pushable
     = partial( 'menu/mobile.html.haml', {"real_page" => page} )
@@ -29,8 +31,6 @@
       %span.back-to-top.computer.only
         %a{:href => "javascript: void(0)"} Back to top
 
-    - if site.enable_google_analytics
-      = google_analytics_universal
     - if page.bottom_javascripts
       - page.bottom_javascripts.each do |javascript|
         %script{:src=>javascript, :type=>'text/javascript'}

_partials/head.html.haml

@@ -11,7 +11,7 @@
 %meta(charset="utf-8")
 %meta(name="viewport" content="width=device-width, initial-scale=1.0")
 %meta(name="author" content="#{real_page.author}")
-%meta(HTTP-EQUIV="Content-Security-Policy" CONTENT="default-src 'none'; font-src 'self' data: https://cdn.jsdelivr.net https://static.jboss.org https://in.relation.to https://staging.in.relation.to https://fonts.gstatic.com https://fonts.googleapis.com; style-src 'unsafe-inline' 'self' https://cdn.jsdelivr.net https://fonts.googleapis.com; script-src 'self' 'unsafe-inline' https://hibernate.atlassian.net https://in.relation.to https://staging.in.relation.to https://www.redhat.com https://cdn.jsdelivr.net https://code.jquery.com www.google-analytics.com; img-src 'self' data:  https://*.githubusercontent.com  www.google-analytics.com https://static.jboss.org https://cdn.jsdelivr.net; base-uri 'none'; form-action 'none'; object-src 'none'; connect-src 'self' https://api.github.com; frame-src https://hibernate.atlassian.net")
+%meta(HTTP-EQUIV="Content-Security-Policy" CONTENT="default-src 'none'; font-src 'self' data: https://cdn.jsdelivr.net https://static.jboss.org https://in.relation.to https://staging.in.relation.to https://fonts.gstatic.com https://fonts.googleapis.com; style-src 'unsafe-inline' 'self' https://cdn.jsdelivr.net https://fonts.googleapis.com; script-src 'self' 'unsafe-inline' https://hibernate.atlassian.net https://in.relation.to https://staging.in.relation.to https://www.redhat.com https://cdn.jsdelivr.net https://code.jquery.com https://www.google-analytics.com https://www.googletagmanager.com; img-src 'self' data:  https://*.githubusercontent.com  www.google-analytics.com https://static.jboss.org https://cdn.jsdelivr.net; base-uri 'none'; form-action 'none'; object-src 'none'; connect-src 'self' https://api.github.com; frame-src https://hibernate.atlassian.net")
 %meta(HTTP-EQUIV="X-XSS-Protection" content="1; mode=block")
 %meta(HTTP-EQUIV="X-Content-Type-Options" content="nosniff")