govuk_frontend_toolkit 7.5.0 → 7.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eff63e0599f9da09739df587ffd34308b7eb485e94d1cceb8a86c1d44f67ccbc
-  data.tar.gz: 9abe419f1eea6dc31ed054d7028cf2057a4d4a7e2e3969116c3510e1b39205ea
+  metadata.gz: cbe6bab014869e595052bea30524e75e5329d09d12eddd9a12a29d9a95411e4e
+  data.tar.gz: a36b6306acb146c6f79dc4c31d3c4d5f2809c3c950093bfa02ba8be7b7ec906f
 SHA512:
-  metadata.gz: d813921775ca00d88421a4b46102acae335295bf45f7655fc7b9ced2c1ebc212eb25c83e1932aa90453834392fff2fd791d50f200fef96c1b9a3f0d4f1edb859
-  data.tar.gz: 12516e2bfe55aa4d1eceafa8ea9a346020174570edbd83235fc3f2c5d4433095d79acdd4159724b8fa8b4c3bf94218fe00d29d8485fa124232e253a61937c534
+  metadata.gz: 16f89a7cb267ed86548c0f258d0316c604d367e230c939254705bac9c2339eebef0b004090436e69bfb5b465743812ce16e58035afa33500cbe3b9b41439f974
+  data.tar.gz: 11ceae4ca9a876eeae8d5b255f7a29c6f860454aebd3eca619fec287167b7ac50c13f064d7937473f43caa4bb43b3cf8117b2c7fa46535f13ed0f4b6da899a31

data/app/assets/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 7.6.0
+
+- Strip emails from urls for all GA requests to catch cases when GA generates a new event (e.g. page timings): ([PR 466](https://github.com/alphagov/govuk_frontend_toolkit/pull/466)).
+
 # 7.5.0
 
 - Implement optional stripping of dates for arguments passed to GA: ([PR #459](https://github.com/alphagov/govuk_frontend_toolkit/pull/459))

data/app/assets/README.md

@@ -1,3 +1,10 @@
+The GOV.UK Design System launched on 22 June 2018
+===============
+
+The Government Digital Service (GDS) is retiring GOV.UK Frontend Toolkit following the launch of the GOV.UK Design System. GOV.UK Frontend Toolkit will remain available to you if you are currently using it but will no longer be maintained. GDS will only roll out major bug fixes and security patches.
+
+For new projects, you can get all of the information about GOV.UK styles, components and patterns in the [GOV.UK Design System](https://www.gov.uk/design-system).
+
 # GOV.UK frontend toolkit
 
 A collection of Sass and JavaScript files for using as part of your

data/app/assets/VERSION.txt

@@ -1 +1 @@
-7.5.0
+7.6.0

data/app/assets/docs/analytics.md

@@ -227,8 +227,8 @@ email address was removed, `[date]` if a date was removed, or `[postcode]`
 if a postcode was removed.
 
 We have to parse all arguments which means that if you don't pass a path to
-`trackPageView` to track the current page we have to extract the current page
-and parse it, turning all `trackPageView` calls into ones with a path argument.
+`trackPageview` to track the current page we have to extract the current page
+and parse it, turning all `trackPageview` calls into ones with a path argument.
 We use `window.location.href.split('#')[0]` as the default path when one is
 not provided.  The original behaviour would have been to ignore the anchor
 part of the URL anyway so this doesn't change the behaviour other than to make

data/app/assets/javascripts/govuk/analytics/google-analytics-universal-tracker.js

@@ -20,6 +20,10 @@
       sendToGa('set', 'displayFeaturesTask', null)
     }
 
+    function stripLocationPII () {
+      sendToGa('set', 'location', stripEmailAddressesFromString(window.location.href))
+    }
+
     // Support legacy cookieDomain param
     if (typeof fieldsObject === 'string') {
       fieldsObject = { cookieDomain: fieldsObject }
@@ -28,6 +32,7 @@
     configureProfile()
     anonymizeIp()
     disableAdTracking()
+    stripLocationPII()
   }
 
   GoogleAnalyticsUniversalTracker.load = function () {
@@ -160,6 +165,11 @@
     }
   }
 
+  function stripEmailAddressesFromString (string) {
+    var stripped = string.replace(/[^\s=/?&]+(?:@|%40)[^\s=/?&]+/g, '[email]')
+    return stripped
+  }
+
   GOVUK.GoogleAnalyticsUniversalTracker = GoogleAnalyticsUniversalTracker
 
   global.GOVUK = GOVUK

data/app/assets/spec/unit/analytics/google-analytics-universal-tracker.spec.js

@@ -177,4 +177,11 @@ describe('GOVUK.GoogleAnalyticsUniversalTracker', function () {
       expect(window.ga.calls.mostRecent().args).toEqual(['set', 'dimension1', '10'])
     })
   })
+
+  describe('when tracking all events', function () {
+    window.history.replaceState(null, null, '?address=an.email@digital.cabinet-office.gov.uk')
+    it('removes any email address from the location', function () {
+      expect(window.ga.calls.mostRecent().args[2]).toContain('address=[email]')
+    })
+  })
 })

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_frontend_toolkit
 version: !ruby/object:Gem::Version
-  version: 7.5.0
+  version: 7.6.0
 platform: ruby
 authors:
 - Government Digital Service
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-30 00:00:00.000000000 Z
+date: 2018-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -305,7 +305,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Tools for building frontend applications