dxw_govuk_frontend_rails 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8b0ce31fa95a92870c71c1bad7cc7946fc4d7df301c729032a20ff6eb5088e5
-  data.tar.gz: 8a8b382053a24f041f7716e114821a2775c57c15451530780f2cec1092f634ae
+  metadata.gz: cbcd2ddb17bdc8d387895ac9a4ddeb7dcd25239b7c1090ce8b58d47af168c07a
+  data.tar.gz: c2993f4da0ed20359c196a5149d208241acce40338ffffedc229d729d5b97cdb
 SHA512:
-  metadata.gz: d50b314466a962dc265ce444796b56967f51e6535cf409b18f0e4470396cb81222a37e9045cd21dafd16f2dcfaf6eacd68f042aa1c03e24f9ffbb42fb8568cd5
-  data.tar.gz: 619f339b61e8d545969408f465ad269924555d74a3d6bfe74f55928a142482619cba8cc8f70715d1d15c04679cca6c4cd84e43581bf0d34aa0ab45dcdbf40dcc
+  metadata.gz: 5fb847feb82101b5a189176d65ce95cf8bfaed0cfb6db18fa161080b76c9003a1e7ae2471014cacb591522fd0a9e9a6b2c1ae0cc30ff052035370204d0bc9f46
+  data.tar.gz: 4f96f18d8e39a95bb7b2a187d944eb3b33527f3d0f7a18fdde0d2f74399c9f920af932fe7ba9696ba9abea08cb4f1b05d684dbe80a13a8d9ba32ed8f364f8c62

data/.github/workflows/gempush.yml

@@ -0,0 +1,33 @@
+name: Ruby Gem
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  build:
+    name: Build + Publish
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@master
+    - name: Set up Ruby 2.6
+      uses: actions/setup-ruby@v1
+      with:
+        version: 2.6.x
+
+    - name: Compile sass
+      run: |
+        npx node-sass ./vendor/assets/stylesheets/govuk-frontend-rails.scss /tmp/govuk-frontend-rails.css
+
+    - name: Publish to RubyGems
+      run: |
+        mkdir -p $HOME/.gem
+        touch $HOME/.gem/credentials
+        chmod 0600 $HOME/.gem/credentials
+        printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+        gem build *.gemspec
+        gem push *.gem
+      env:
+        GEM_HOST_API_KEY: ${{secrets.RUBYGEMS_AUTH_TOKEN}}

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dxw_govuk_frontend_rails (2.13.0)
+    dxw_govuk_frontend_rails (3.1.0)
 
 GEM
   remote: https://rubygems.org/
@@ -17,4 +17,4 @@ DEPENDENCIES
   rake (~> 10.0)
 
 BUNDLED WITH
-   2.0.1
+   2.0.2

data/README.md

@@ -1,7 +1,17 @@
 # GOVUK Frontend for Rails
 
+Adds the GOVUK Frontend for Rails using the asset pipeline.
+
 https://github.com/alphagov/govuk-frontend
 
+## Breaking Changes in v3.0.0
+
+This release of the GOVUK Frontend has breaking changes! Do not update to this version until you have read and understood:
+
+You will not be required to updated any file paths with govuk as we take care of that for you, all others changes will need to be managed:
+
+https://github.com/alphagov/govuk-frontend/releases/tag/v3.0.0
+
 ## Limitations
 
 This gem does not include the ie8 version of GOVUK Frontend, as the service standard no longer requires it:
@@ -75,4 +85,4 @@ When a new version of the GOVUK Frontend is released:
 - commit the changes
 - tag with the same release number as GOVUK Frontend
 - push the changes
-- CircleCI will build the gem and push to Rubygems
+- Github acitons will build the gem and push to Rubygems

data/lib/dxw_govuk_frontend_rails/version.rb

@@ -1,3 +1,3 @@
 module DxwGovukFrontendRails
-  VERSION = "3.0.0"
+  VERSION = "3.1.0"
 end

data/package-lock.json

@@ -5,9 +5,9 @@
   "requires": true,
   "dependencies": {
     "govuk-frontend": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-3.0.0.tgz",
-      "integrity": "sha512-GCrEeaQZEnsthNtfmOUFlgsieNjHOeoamSWMdD4Gdq0RPxCA9uzfrT2i3jVnlBORekKjOL0C8eFZQBSNnjtz2A=="
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-3.1.0.tgz",
+      "integrity": "sha512-ozyG6ulmawzg3rsf9Efxcgj81mk4yzea3tfl0hgmXWILGC0/uEGj6A+g9pJ2ETgk78rgNlRLXDv0WvlaHd/LnA=="
     }
   }
 }

data/package.json

@@ -21,6 +21,6 @@
   },
   "homepage": "https://github.com/mec/dxw_govuk_frontend_rails#readme",
   "dependencies": {
-    "govuk-frontend": "3.0.0"
+    "govuk-frontend": "3.1.0"
   }
 }

data/vendor/assets/javascripts/govuk_frontend_rails.js

@@ -1361,58 +1361,28 @@ Button.prototype.init = function () {
 var KEY_ENTER = 13;
 var KEY_SPACE$1 = 32;
 
-// Create a flag to know if the browser supports navtive details
-var NATIVE_DETAILS = typeof document.createElement('details').open === 'boolean';
-
 function Details ($module) {
   this.$module = $module;
 }
 
-/**
-* Handle cross-modal click events
-* @param {object} node element
-* @param {function} callback function
-*/
-Details.prototype.handleInputs = function (node, callback) {
-  node.addEventListener('keypress', function (event) {
-    var target = event.target;
-    // When the key gets pressed - check if it is enter or space
-    if (event.keyCode === KEY_ENTER || event.keyCode === KEY_SPACE$1) {
-      if (target.nodeName.toLowerCase() === 'summary') {
-        // Prevent space from scrolling the page
-        // and enter from submitting a form
-        event.preventDefault();
-        // Click to let the click event do all the necessary action
-        if (target.click) {
-          target.click();
-        } else {
-          // except Safari 5.1 and under don't support .click() here
-          callback(event);
-        }
-      }
-    }
-  });
+Details.prototype.init = function () {
+  if (!this.$module) {
+    return
+  }
 
-  // Prevent keyup to prevent clicking twice in Firefox when using space key
-  node.addEventListener('keyup', function (event) {
-    var target = event.target;
-    if (event.keyCode === KEY_SPACE$1) {
-      if (target.nodeName.toLowerCase() === 'summary') {
-        event.preventDefault();
-      }
-    }
-  });
+  // If there is native details support, we want to avoid running code to polyfill native behaviour.
+  var hasNativeDetails = typeof this.$module.open === 'boolean';
 
-  node.addEventListener('click', callback);
+  if (hasNativeDetails) {
+    return
+  }
+
+  this.polyfillDetails();
 };
 
-Details.prototype.init = function () {
+Details.prototype.polyfillDetails = function () {
   var $module = this.$module;
 
-  if (!$module) {
-    return
-  }
-
   // Save shortcuts to the inner summary and content elements
   var $summary = this.$summary = $module.getElementsByTagName('summary').item(0);
   var $content = this.$content = $module.getElementsByTagName('div').item(0);
@@ -1442,9 +1412,7 @@ Details.prototype.init = function () {
   //
   // We have to use the camelcase `tabIndex` property as there is a bug in IE6/IE7 when we set the correct attribute lowercase:
   // See http://web.archive.org/web/20170120194036/http://www.saliences.com/browserBugs/tabIndex.html for more information.
-  if (!NATIVE_DETAILS) {
-    $summary.tabIndex = 0;
-  }
+  $summary.tabIndex = 0;
 
   // Detect initial open state
   var openAttr = $module.getAttribute('open') !== null;
@@ -1454,20 +1422,18 @@ Details.prototype.init = function () {
   } else {
     $summary.setAttribute('aria-expanded', 'false');
     $content.setAttribute('aria-hidden', 'true');
-    if (!NATIVE_DETAILS) {
-      $content.style.display = 'none';
-    }
+    $content.style.display = 'none';
   }
 
   // Bind an event to handle summary elements
-  this.handleInputs($summary, this.setAttributes.bind(this));
+  this.polyfillHandleInputs($summary, this.polyfillSetAttributes.bind(this));
 };
 
 /**
 * Define a statechange function that updates aria-expanded and style.display
 * @param {object} summary element
 */
-Details.prototype.setAttributes = function () {
+Details.prototype.polyfillSetAttributes = function () {
   var $module = this.$module;
   var $summary = this.$summary;
   var $content = this.$content;
@@ -1478,27 +1444,54 @@ Details.prototype.setAttributes = function () {
   $summary.setAttribute('aria-expanded', (expanded ? 'false' : 'true'));
   $content.setAttribute('aria-hidden', (hidden ? 'false' : 'true'));
 
-  if (!NATIVE_DETAILS) {
-    $content.style.display = (expanded ? 'none' : '');
+  $content.style.display = (expanded ? 'none' : '');
 
-    var hasOpenAttr = $module.getAttribute('open') !== null;
-    if (!hasOpenAttr) {
-      $module.setAttribute('open', 'open');
-    } else {
-      $module.removeAttribute('open');
-    }
+  var hasOpenAttr = $module.getAttribute('open') !== null;
+  if (!hasOpenAttr) {
+    $module.setAttribute('open', 'open');
+  } else {
+    $module.removeAttribute('open');
   }
+
   return true
 };
 
 /**
-* Remove the click event from the node element
+* Handle cross-modal click events
 * @param {object} node element
+* @param {function} callback function
 */
-Details.prototype.destroy = function (node) {
-  node.removeEventListener('keypress');
-  node.removeEventListener('keyup');
-  node.removeEventListener('click');
+Details.prototype.polyfillHandleInputs = function (node, callback) {
+  node.addEventListener('keypress', function (event) {
+    var target = event.target;
+    // When the key gets pressed - check if it is enter or space
+    if (event.keyCode === KEY_ENTER || event.keyCode === KEY_SPACE$1) {
+      if (target.nodeName.toLowerCase() === 'summary') {
+        // Prevent space from scrolling the page
+        // and enter from submitting a form
+        event.preventDefault();
+        // Click to let the click event do all the necessary action
+        if (target.click) {
+          target.click();
+        } else {
+          // except Safari 5.1 and under don't support .click() here
+          callback(event);
+        }
+      }
+    }
+  });
+
+  // Prevent keyup to prevent clicking twice in Firefox when using space key
+  node.addEventListener('keyup', function (event) {
+    var target = event.target;
+    if (event.keyCode === KEY_SPACE$1) {
+      if (target.nodeName.toLowerCase() === 'summary') {
+        event.preventDefault();
+      }
+    }
+  });
+
+  node.addEventListener('click', callback);
 };
 
 function CharacterCount ($module) {

data/vendor/assets/stylesheets/components/footer/_footer.scss

@@ -224,9 +224,11 @@
     }
   }
 
-  // Sections two-third:one-third on desktop
+  // If there are only two sections, set the layout to be two-third:one-third on desktop
   @include mq ($from: desktop) {
-    .govuk-footer__section:first-child {
+    // We match the first section with `:first-child`.
+    // To ensure the section is one of two, we can count backwards using `:nth-last-child(2)`.
+    .govuk-footer__section:first-child:nth-last-child(2) {
       -webkit-box-flex: 2;
       -webkit-flex-grow: 2;
           -ms-flex-positive: 2;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dxw_govuk_frontend_rails
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - mec
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-30 00:00:00.000000000 Z
+date: 2019-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -45,8 +45,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
-- ".circleci/setup-rubygems.sh"
+- ".github/workflows/gempush.yml"
 - ".gitignore"
 - CODE_OF_CONDUCT.md
 - Gemfile

data/.circleci/config.yml

@@ -1,33 +0,0 @@
-version: 2
-jobs:
-  deploy:
-    docker:
-      - image: circleci/ruby:2.6.1-node-browsers
-
-    working_directory: ~/repo
-
-    steps:
-      - checkout
-      - run:
-          name: Compile sass
-          command: |
-            npx node-sass ./vendor/assets/stylesheets/govuk-frontend-rails.scss /tmp/govuk-frontend-rails.css
-      - run:
-          name: Setup Rubygems
-          command: bash .circleci/setup-rubygems.sh
-
-      - run:
-          name: Publish to Rubygems
-          command: |
-            gem build dxw_govuk_frontend_rails.gemspec
-            gem push "dxw_govuk_frontend_rails-$(git describe --tags).gem"
-workflows:
-  version: 2
-  test-deploy:
-    jobs:
-      - deploy:
-          filters:
-            tags:
-              only: /.*/
-            branches:
-              ignore: /.*/

data/.circleci/setup-rubygems.sh

@@ -1,3 +0,0 @@
-mkdir ~/.gem
-echo -e "---\r\n:rubygems_api_key: $RUBYGEMS_API_KEY" > ~/.gem/credentials
-chmod 0600 /home/circleci/.gem/credentials