govuk_frontend_toolkit 5.0.3 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b917ab71655b06bb77abd0f9c39835f42df1628
-  data.tar.gz: bb030666547fa2658829c584bd21807be8e6d1a6
+  metadata.gz: 22fafcc6055ff4474250ffa6304e94a4fbf03cab
+  data.tar.gz: 176d0192da328ee83432ccbf0f13abc190e697f9
 SHA512:
-  metadata.gz: 9bd8da98024fddf904d5d380164bd0f39ddb8243dafa88931d3091bdd4666efc3298d37a4e41a6f4f4bee16166d80135200800fc8f388516eae93c17bf1cad83
-  data.tar.gz: e72f7c54f5bea749ceecc89bb89ff4da72d1d166b49741781352f8d2fd8c5850774a33baa40fdf37747d7cd3125814c03e62f0ea63e65b94d10db4889f118023
+  metadata.gz: bb15be95deff5e46b16035a0ec6fa09dc68930cd579c61b75fa8b922ad5e6ead4cab08decdb742d032b73fbc6faef3ca636baec439cccada1e77671cc573275a
+  data.tar.gz: 976d6e1c3fa4d311e3dd7bf17c3cf483315a120d98c15f83205e98fc29afe5e634d725193415e55547a040bef13bfaa59062d70f441f0ecf634e525a1e0b6df1

data/.ruby-version

@@ -1 +1 @@
-2.2
+2.3.1

data/.travis.yml

@@ -0,0 +1,23 @@
+language: ruby
+sudo: false
+branches:
+  only:
+    - master
+before_install:
+  - openssl aes-256-cbc -K $encrypted_839034082a06_key -iv $encrypted_839034082a06_iv -in .travis/govuk_frontend_toolkit_gem_push.enc -out ~/.ssh/id_rsa -d
+  - chmod 600 ~/.ssh/id_rsa
+  - git config --global user.name "Travis CI"
+  - git config --global user.email "travis@travis-ci.org"
+  - git remote add origin_ssh git@github.com:alphagov/govuk_frontend_toolkit_gem.git
+install:
+  - echo "No dependencies to install"
+script:
+  - ./publish.sh
+deploy:
+  provider: rubygems
+  api_key:
+    secure: G1jZasAAUiHjZji6jbASaD1C41qXjpFNz58NEvw0EjgtM49qW062Qwjo6TcG83gYLUAq19WDDS3xrqqsDj4T/s84cpQcjqrZebgbZq2HqM4KepiRFOIzqJYTq2Lrl7ZdMqFKp+EUfo2WSRZQv94K+RyQqTAnLEyZB5zpfV/H+ok=
+  gem: govuk_frontend_toolkit
+  on:
+    branch: master
+    repo: alphagov/govuk_frontend_toolkit_gem

data/.travis/govuk_frontend_toolkit_gem_push.pub

@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDnLVT7VFnEOSh/6MPQrWn8YHsjts6J+EZndbcbliwCjVhjCRbATTlS+wtR+6do279dVQRWXxaS4dNgIuwhvgBTD9YpMTSn0WsHWaEWIFJ6brx+lhXy9CPkuCAg8hwpMyQWSxmv9yAS+vw27REL68yq2hwWt+morpghGRhokJYz/ietyZssgHTOTE6i2WiArDjz4xarWrRE1Aht/sFMQeoMRLdIDj1FdmWHTQo9yZy1ZmhgpM2MMwSoNyKn+vTqJjJmRy8yA5sBdlaViKx1G9RSFNId/SLVQLb8zCFzyySs6V/fL1YpxNDZfAtmhxMbxdPkKIMkplf+7VS4Oz68Qdpu6lusehWFOVArthb4e876FKoxVAKmH429ybRXEsZDMFPtA4LEwFcpKNUUgHLkQRKQaGEmTcC5z8UlFIqOU8NDpjWfATUKnnoxYo1nz5Nr8nWpgVW/0o7rYzPgplQQMiWmukG+RNELcaoeZSExWpRye/BP0UKQ7IA9qzD1C55/ehCxcAfSzdiSJ0BwxbZ9YRJUgYHjNCj/6WKvZo/PzSTtdxKwvVh8dGUMNUDwYHEfrAxJBOeWi7Te+CFh6xg/yS8P8JP3zRpQrz9qJ0ZwwjImnR500KSvBzww1gLMTjqBpY3SbKtSIcSrtwCQUMIkctfbj4WjyAf7BpD2g6PJ5LRrhQ== govuk_frontend_toolkit_gem_push

data/Rakefile

@@ -3,12 +3,6 @@ $:.unshift lib unless $:.include?(lib)
 
 require "rake"
 
-require "gem_publisher"
-task :publish_gem do |t|
-  gem = GemPublisher.publish_if_updated("govuk_frontend_toolkit.gemspec")
-  puts "Published #{gem}" if gem
-end
-
 task :test do |t|
   true
 end

data/app/assets/.ruby-version

@@ -1 +1 @@
-2.2
+2.3.1

data/app/assets/.travis.yml

@@ -1,6 +1,25 @@
+sudo: false
 language: node_js
 node_js:
   - "0.10"
+env:
+  global:
+    secure: "15QWA6igmMx1I2YlDrdkxsOi2YJIWNrXmgEtfEoCWR7eJQW2bkUDdzTXYFzxaEPIVMEgO+0pxfGwMWn/9MBhnXCLu9x0f0KqJ/0YfCGXHW21g8J+31zypdiCiw/Ir/dxazP9wpvWFhuqjo9X35zP3Md7TC8u+20uW2Q5KUVyqZM="
 before_install:
+  - openssl aes-256-cbc -K $encrypted_909ac1036a94_key -iv $encrypted_909ac1036a94_iv -in .travis/govuk_frontend_toolkit_push.enc -out ~/.ssh/id_rsa -d
+  - chmod 600 ~/.ssh/id_rsa
+  - git config --global user.name "Travis CI"
+  - git config --global user.email "travis@travis-ci.org"
+  - git remote add origin_ssh git@github.com:alphagov/govuk_frontend_toolkit.git
   - bundle install
-sudo: false
+script:
+  - npm test
+deploy:
+  - provider: script
+    script: './push.sh'
+    on:
+      branch: master
+  - provider: script
+    script: './trigger.sh'
+    on:
+      branch: master

data/app/assets/.travis/README.md

@@ -0,0 +1,23 @@
+# Travis encrypted files
+
+This directory contains a public/private keypair generated just for this repository.
+
+The public key is a deploy key which has been added to the GitHub repo for push access.
+
+The private key is encrypted using `travis encrypt-file` and then committed to this repo.
+
+The decrypt commands are in `.travis.yml`.
+
+## Trigger script
+
+In `/trigger.sh` we use `$TRAVIS_TOKEN` to trigger downstream jobs - this
+is the only way we can find that Travis can trigger another job.
+
+In this case, the downstream jobs publish the frontend toolkit to npm
+and RubyGems.
+
+The `env.global.secure` in `/.travis.yml` contains a Travis token that
+belongs to [@alexmuller](https://github.com/alexmuller) - as far as we
+can tell there's no way to generate one of these that isn't related to
+a specific user. This token could be replaced with a generic bot account
+if we created one.

data/app/assets/.travis/govuk_frontend_toolkit_push.pub

@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC4O7e+NxLRfS348oGhyCeKrosyqN8Hd6MUD1JMePx0zU21h3fPWWI1Y6/ZW9FeDZ9XhSLD46iZsIU3GckEp1pZJONxOVnpv/I6DKUcfBe54RGTYg7S9Kooso55zKOVjknfnNmAQC9IpPwpBoXR2niXWN8wvxL7UPgrWrdwpnHgg+Kdr8RZ6Bk52jLm2O+AE4Q7nqu6k7qd0t78e5/aGa4+eWWcWqYy1vxv8NRoulg5/SAjhBV0Qq5Sbq/PHTgU0MgYAjnT60TToEkP4t/XSq02BUURznEHbNTI1drQZTpsB2eUK8Uf8+Leo5f2gmcwfO1Eif5B0rSR2tCebo5sETuqoZQ3EoAL100/y4f+IFyGEwnm4oVq4q8YNpmd5+aZvqYC87m1Hkro+ifQjFaMtB0XHCrV5S2RZwuP2Xc1I7NaV0ene1F2kSEhsUlZPwP/NYaXov4KLVdybgcg7LkA9zTEcEujR9rfIrzmXY6IGP0cAq+f+GhmdpoimUnBqIdtv8ZGTZ+FZP9ufNEdpKUhXGQ3Mmf9IdFPnwJ1r/MtfbZKRyGVrUufKPH2LLfR2HQZy9jZ6Y50TrSDePaO4G4bn6XzbvPW8VcozGxFB323/VY8+8c5sKnFCONKIzTfCCd+KcD8wNhBP8NQ1w7ci6Mm5BYZcO8BVVK7SrjPvY5UsobFdw== govuk_frontend_toolkit_push

data/app/assets/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 5.1.0
+
+- Allow custom options when tracking events ([PR #365](https://github.com/alphagov/govuk_frontend_toolkit/pull/365))
+
 # 5.0.3
 
 - Change HMRC and DEFRA text colours for improved contrast ([PR #368](https://github.com/alphagov/govuk_frontend_toolkit/pull/368))

data/app/assets/VERSION.txt

@@ -1 +1 @@
-5.0.3
+5.1.0

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

@@ -72,11 +72,7 @@
     // Label is optional
     if (typeof options.label === 'string') {
       evt.eventLabel = options.label
-    }
-
-    // Page is optional
-    if (typeof options.page === 'string') {
-      evt.page = options.page
+      delete options.label
     }
 
     // Value is optional, but when used must be an
@@ -85,21 +81,19 @@
     if (options.value || options.value === 0) {
       value = parseInt(options.value, 10)
       if (typeof value === 'number' && !isNaN(value)) {
-        evt.eventValue = value
+        options.eventValue = value
       }
+      delete options.value
     }
 
     // Prevents an event from affecting bounce rate
     // https://developers.google.com/analytics/devguides/collection/analyticsjs/events#implementation
     if (options.nonInteraction) {
-      evt.nonInteraction = 1
+      options.nonInteraction = 1
     }
 
-    // Set the transport method for the event
-    // Typically used for enabling `navigator.sendBeacon` when the page might be unloading
-    // https://developers.google.com/analytics/devguides/collection/analyticsjs/field-reference#transport
-    if (options.transport) {
-      evt.transport = options.transport
+    if (typeof options === 'object') {
+      $.extend(evt, options)
     }
 
     sendToGa('send', evt)

data/app/assets/{jenkins.sh → push.sh}

@@ -1,10 +1,6 @@
 #!/bin/bash
 set -e
 
-bundle install --path "${HOME}/bundles/${JOB_NAME}"
-npm install
-npm test
-
 # Create a new tag if the version file has been updated and a tag for that
 # version doesn't already exist
 
@@ -19,9 +15,9 @@ if [ "$MASTER_SHA" == "$HEAD_SHA" ]; then
   if ! git rev-parse $VERSION_TAG >/dev/null 2>&1; then
     echo "Creating new tag: $VERSION_TAG"
     git tag $VERSION_TAG
-    git push origin $VERSION_TAG
+    git push origin_ssh $VERSION_TAG
 
     # Alias branch for the most recently released tag, for easier diffing
-    git push -f origin master:latest-release
+    git push -f origin_ssh master:latest-release
   fi
 fi

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

@@ -100,6 +100,13 @@ describe('GOVUK.GoogleAnalyticsUniversalTracker', function () {
       )
     })
 
+    it('tracks custom dimensions', function() {
+      universal.trackEvent('category', 'action', {dimension29: 'Home'})
+      expect(window.ga.calls.mostRecent().args).toEqual(
+        ['send', {hitType: 'event', eventCategory: 'category', eventAction: 'action', dimension29: 'Home'}]
+      )
+    })
+
     it('the label is optional', function () {
       universal.trackEvent('category', 'action')
       expect(window.ga.calls.mostRecent().args).toEqual(

data/app/assets/trigger.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+PAYLOAD='{
+"request": {
+  "branch": "master"
+}}'
+
+curl -s -X POST \
+  -H "Content-Type: application/json" \
+  -H "Accept: application/json" \
+  -H "Travis-API-Version: 3" \
+  -H "Authorization: token $TRAVIS_TOKEN" \
+  -d "$PAYLOAD" \
+  https://api.travis-ci.org/repo/alphagov%2Fgovuk_frontend_toolkit_gem/requests
+
+curl -s -X POST \
+  -H "Content-Type: application/json" \
+  -H "Accept: application/json" \
+  -H "Travis-API-Version: 3" \
+  -H "Authorization: token $TRAVIS_TOKEN" \
+  -d "$PAYLOAD" \
+  https://api.travis-ci.org/repo/alphagov%2Fgovuk_frontend_toolkit_npm/requests

data/govuk_frontend_toolkit.gemspec

@@ -13,7 +13,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency "rails", ">= 3.1.0"
   s.add_dependency "sass", ">= 3.2.0"
-  s.add_development_dependency "gem_publisher", "1.3.1"
   s.add_development_dependency "rake", "0.9.2.2"
 
   s.require_paths = ["lib", "app"]

data/{jenkins.sh → publish.sh}

@@ -18,17 +18,13 @@ git submodule foreach git pull origin master
 # The version of the toolkit defined in the submodules master branch
 NEW_SUBMODULE_VERSION=`cat app/assets/VERSION.txt`
 
-# Install gem dependencies, run tests, publish gem
-rm -f Gemfile.lock
-bundle install --path "${HOME}/bundles/${JOB_NAME}"
+# Install gem dependencies and run tests
+bundle install
 bundle exec rake
 
 # If the submodule has a new version string
 if [ "$PINNED_SUBMODULE_VERSION" != "$NEW_SUBMODULE_VERSION" ]; then
   # Commit the updated submodule and push it to origin
   git commit -am "Bump to version $NEW_SUBMODULE_VERSION"
-  git push origin master
+  git push origin_ssh master
 fi
-
-# Publish the new gem
-bundle exec rake publish_gem

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_frontend_toolkit
 version: !ruby/object:Gem::Version
-  version: 5.0.3
+  version: 5.1.0
 platform: ruby
 authors:
 - Government Digital Service
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
-- !ruby/object:Gem::Dependency
-  name: gem_publisher
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.3.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -76,6 +62,9 @@ files:
 - ".gitignore"
 - ".gitmodules"
 - ".ruby-version"
+- ".travis.yml"
+- ".travis/govuk_frontend_toolkit_gem_push.enc"
+- ".travis/govuk_frontend_toolkit_gem_push.pub"
 - CONTRIBUTING.md
 - Gemfile
 - LICENCE
@@ -84,6 +73,9 @@ files:
 - app/assets/.gitignore
 - app/assets/.ruby-version
 - app/assets/.travis.yml
+- app/assets/.travis/README.md
+- app/assets/.travis/govuk_frontend_toolkit_push.enc
+- app/assets/.travis/govuk_frontend_toolkit_push.pub
 - app/assets/CHANGELOG.md
 - app/assets/CONTRIBUTING.md
 - app/assets/Gemfile
@@ -244,8 +236,8 @@ files:
 - app/assets/javascripts/stageprompt.js
 - app/assets/javascripts/vendor/jquery/jquery.player.min.js
 - app/assets/javascripts/vendor/polyfills/bind.js
-- app/assets/jenkins.sh
 - app/assets/package.json
+- app/assets/push.sh
 - app/assets/spec/manifest.js
 - app/assets/spec/support/LocalTestRunner.html
 - app/assets/spec/support/console-runner.js
@@ -283,11 +275,12 @@ files:
 - app/assets/stylesheets/design-patterns/_breadcrumbs.scss
 - app/assets/stylesheets/design-patterns/_buttons.scss
 - app/assets/stylesheets/design-patterns/_media-player.scss
+- app/assets/trigger.sh
 - govuk_frontend_toolkit.gemspec
-- jenkins.sh
 - lib/govuk_frontend_toolkit.rb
 - lib/govuk_frontend_toolkit/engine.rb
 - lib/govuk_frontend_toolkit/version.rb
+- publish.sh
 homepage: https://github.com/alphagov/govuk_frontend_toolkit
 licenses:
 - MIT
@@ -309,7 +302,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Tools for building frontend applications