govuk_admin_template 1.5.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f26fb03239eb4f100ba9371be1981747cf3766da
-  data.tar.gz: 640a3fbb6b45fa1d9ef1bc0dc136b86493e76e8b
+  metadata.gz: 1be05142b9ea4a7b5df0e994e877937293135fdf
+  data.tar.gz: ad1fcdff74b55e486565929230502b92898e7f89
 SHA512:
-  metadata.gz: 73c41a5c172b1e8c27b7a472435af7e63be624c3b931d22ec713f7529940aa648eabe30c13affa94fc828c4af762de7b9fe82af095b5a99af153acb15d9a44f3
-  data.tar.gz: 89983d83d8038eb489a4d05926eb074f0507eb9fdb2a475a251a3d36b0568f49b093e715ca367d972767d236ea89092e2440d2e74e0e1f5980c40490f38d4ef1
+  metadata.gz: 1edc24beaaa1ef1fdf833072659ecff6333f57a7d8f85e45457005041a0459d468505058756601be8d71219387a2957285aab34e339b6b67a8420d9222a722c0
+  data.tar.gz: 94d8caafc79f568d1eaea021f559ea87165144af352d6d4654f39e23bd998352d1aee561b37f1dbf36f9a73bb76c9eba58e443e305ae7d7c35d3821dd994997c

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 2.0.0
+
+* Manage Google Analytics tracking
+* Update event and pageview tracking API, deprecate classic GA event tracking
+
 # 1.5.1
 
 * Rename SASS files to exclude `.css` and fix deprecation warnings

data/README.md

@@ -10,6 +10,7 @@ This gem provides (via a Rails engine):
 * Admin design patterns available from `/style-guide` (when routes are mounted)
 * [CSS helpers and SASS variables](CSS.md) for the admin theme
 * GOV.UK user friendly date formats
+* Google Analytics tracking code (Universal Analytics), using the "GOV.UK apps" profile
 
 [Apps using this gem](https://github.com/search?q=govuk_admin_template+user%3Aalphagov+filename%3AGemfile) include:
 * [Transition](https://github.com/alphagov/transition)

data/app/assets/javascripts/govuk-admin-template/govuk-admin.js

@@ -70,26 +70,34 @@
     window.location.href = path;
   }
 
+  // Google Analytics pageview tracking
+  GOVUKAdmin.trackPageview = function(path, title) {
+    var pageviewObject = { page: path };
+
+    if (typeof title === "string") {
+      pageviewObject.title = title;
+    }
+
+    if (typeof root.ga === "function") {
+      // https://developers.google.com/analytics/devguides/collection/analyticsjs/pages
+      root.ga('send', 'pageview', pageviewObject);
+    }
+  }
+
   // Google Analytics event tracking
   // Label and value are optional
-  GOVUKAdmin.track = function(action, label, value) {
+  GOVUKAdmin.trackEvent = function(action, label, value) {
 
+    // https://developers.google.com/analytics/devguides/collection/analyticsjs/events
     // Default category to the page an event occurs on
-    var category = root.location.pathname,
-
-        // https://developers.google.com/analytics/devguides/collection/gajs/eventTrackerGuide
-        eventGa = ["_trackEvent", category, action],
-
-        // https://developers.google.com/analytics/devguides/collection/analyticsjs/events
-        eventAnalytics = {
+    var eventAnalytics = {
           hitType: 'event',
-          eventCategory: category,
+          eventCategory: root.location.pathname,
           eventAction: action
         };
 
     // Label is optional
     if (typeof label === "string") {
-      eventGa.push(label);
       eventAnalytics.eventLabel = label;
     }
 
@@ -99,18 +107,13 @@
     if (value) {
       value = parseInt(value, 10);
       if (typeof value === "number" && !isNaN(value)) {
-        eventGa.push(value);
         eventAnalytics.eventValue = value;
       }
     }
 
-    // _gaq is the Google Analytics tracking object we
-    // push events to when using the old tracking code
-    root._gaq = root._gaq || [];
-
     // Useful for debugging:
-    // console.log(eventGa, eventAnalytics);
-    root._gaq.push(eventGa);
+    // console.log(eventAnalytics);
+
     if (typeof root.ga === "function") {
       root.ga('send', eventAnalytics);
     }

data/app/assets/javascripts/govuk-admin-template/modules/auto_track_event.js

@@ -8,7 +8,7 @@
           label = element.data('track-label'),
           value = element.data('track-value');
 
-      GOVUKAdmin.track(action, label, value);
+      GOVUKAdmin.trackEvent(action, label, value);
     }
   };
 

data/app/views/layouts/govuk_admin_template.html.erb

@@ -91,5 +91,16 @@
       </footer>
     </section>
     <%= yield :body_end %>
+    <% if Rails.env.production? %>
+      <script class="analytics">
+        (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','//www.google-analytics.com/analytics.js','ga');
+
+        ga('create', 'UA-26179049-6', 'alphagov.co.uk');
+        ga('send', 'pageview');
+      </script>
+    <% end %>
   </body>
 </html>

data/lib/govuk_admin_template/version.rb

@@ -1,3 +1,3 @@
 module GovukAdminTemplate
-  VERSION = "1.5.1"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_admin_template
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 2.0.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-06 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails