From 1e94789d5c8418eaafe62fae6167d906a9230e29 Mon Sep 17 00:00:00 2001 From: Peter Yates Date: Tue, 12 Nov 2019 09:36:28 +0000 Subject: [PATCH 1/6] Increase version number to 1.0.0 --- lib/govuk_design_system_formbuilder/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/govuk_design_system_formbuilder/version.rb b/lib/govuk_design_system_formbuilder/version.rb index f705f6fe..6bfd41b3 100644 --- a/lib/govuk_design_system_formbuilder/version.rb +++ b/lib/govuk_design_system_formbuilder/version.rb @@ -1,3 +1,3 @@ module GOVUKDesignSystemFormBuilder - VERSION = '0.9.8'.freeze + VERSION = '1.0.0'.freeze end From 659fe74a6180b5c8c3a1758dd4bf40f625c38f0a Mon Sep 17 00:00:00 2001 From: Peter Yates Date: Tue, 12 Nov 2019 10:12:04 +0000 Subject: [PATCH 2/6] Remove 0.7.10 mention from the readme There are now too many shortcomings of the older code for it really to be considered 'supported'. If a call for it arises, backporting some of the bigger fixes _may_ be an option but I think it's unlikely. --- README.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/README.md b/README.md index dddfce9c..462472c5 100644 --- a/README.md +++ b/README.md @@ -14,9 +14,6 @@ This gem provides a easy-to-use form builder that generates forms that are fully-compliant with version 3.3.0 of the [GOV.UK Design System](https://design-system.service.gov.uk/), minimising the amount of markup you need to write. -The latest version of this gem that supports GOV.UK Design System version 2 is -[0.7.10](https://github.com/DFE-Digital/govuk_design_system_formbuilder/releases/tag/v0.7.10). - In addition to the basic markup, the more-advanced functionality of the Design System is exposed via the API. Adding [JavaScript-enhanced word count checking](https://govuk-form-builder.netlify.com/form-elements/text-area/) @@ -108,7 +105,7 @@ Now we can get started! = f.govuk_submit 'Away we go!' ``` -## Developing and running the tests 🧑🏼‍🔬 +## Developing and running the tests 👨🏻‍🏭 The form builder is covered by RSpec, to run all the tests first ensure that all of the development and testing prerequisite gems are installed. At the root From 446b194270a3e1f4b9aefa8924412f9d24460112 Mon Sep 17 00:00:00 2001 From: Peter Yates Date: Tue, 12 Nov 2019 10:17:37 +0000 Subject: [PATCH 3/6] Remove mention of version 2 support from the guide --- guide/content/introduction/supported-versions.slim | 7 ------- 1 file changed, 7 deletions(-) diff --git a/guide/content/introduction/supported-versions.slim b/guide/content/introduction/supported-versions.slim index 9b728b3c..a7ccc805 100644 --- a/guide/content/introduction/supported-versions.slim +++ b/guide/content/introduction/supported-versions.slim @@ -18,13 +18,6 @@ dl.govuk-summary-list span.govuk-tag | Version 3.3.0 - ul.govuk-list - li - span.govuk-hint - ' If you are using version 2 of the GOV.UK design system, the last compatible - version of this form builder was - #{link_to('0.7.10', version_supporting_design_system_v2).html_safe}. - div.govuk-summary-list__row dt.govuk-summary-list__key | Ruby From 7f8f99a6b4d7b926bae8acac9639d9bb9f269b4a Mon Sep 17 00:00:00 2001 From: Peter Yates Date: Tue, 12 Nov 2019 11:21:29 +0000 Subject: [PATCH 4/6] Replace the two version badges with one We'll be aiming to support the latest version of the design system so simplify by only referencing it once --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 462472c5..79cc6d34 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,7 @@ [![Test Coverage](https://api.codeclimate.com/v1/badges/fde73b5dc9476197281b/test_coverage)](https://codeclimate.com/github/DFE-Digital/govuk_design_system_formbuilder/test_coverage) [![Dependabot Status](https://api.dependabot.com/badges/status?host=github&repo=DFE-Digital/govuk_design_system_formbuilder)](https://dependabot.com) [![GitHub license](https://img.shields.io/github/license/DFE-Digital/govuk_design_system_formbuilder)](https://github.com/DFE-Digital/govuk_design_system_formbuilder/blob/master/LICENSE) -[![GOV.UK Design System Version 2](https://img.shields.io/github/v/release/dfe-digital/govuk_design_system_formbuilder?label=govuk+design+system+v2)](https://github.com/DFE-Digital/govuk_design_system_formbuilder/releases/tag/v0.7.10) -[![GOV.UK Design System Version 3](https://img.shields.io/github/v/release/dfe-digital/govuk_design_system_formbuilder?include_prereleases&label=govuk+design+system+v3)](https://github.com/DFE-Digital/govuk_design_system_formbuilder) +[![GOV.UK Design System Version](https://img.shields.io/badge/GOV.UK%20Design%20System-3.3.0-brightgreen)](https://design-system.service.gov.uk) This gem provides a easy-to-use form builder that generates forms that are fully-compliant with version 3.3.0 of the [GOV.UK Design System](https://design-system.service.gov.uk/), From 7a154c7cbf7c2576f1d3412a42eb8a5d852b8a37 Mon Sep 17 00:00:00 2001 From: Peter Yates Date: Wed, 13 Nov 2019 09:11:38 +0000 Subject: [PATCH 5/6] Switch gift for package, it fits in better --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 79cc6d34..d01f9772 100644 --- a/README.md +++ b/README.md @@ -120,7 +120,7 @@ Now, if everything was successful, run RSpec: bundle exec rspec -fd ``` -## Contributing 🎁 +## Contributing 📦 Bug reports and feature requests are most welcome, please raise an issue or submit a pull request. From a6e8947afa663f17ee3043182f4a6c52c9ceb35e Mon Sep 17 00:00:00 2001 From: Peter Yates Date: Tue, 19 Nov 2019 12:00:03 +0000 Subject: [PATCH 6/6] Upgrade to design system version 3.4.0 --- README.md | 4 ++-- guide/content/introduction/supported-versions.slim | 2 +- guide/package-lock.json | 6 +++--- guide/package.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index d01f9772..6ddafd27 100644 --- a/README.md +++ b/README.md @@ -7,10 +7,10 @@ [![Test Coverage](https://api.codeclimate.com/v1/badges/fde73b5dc9476197281b/test_coverage)](https://codeclimate.com/github/DFE-Digital/govuk_design_system_formbuilder/test_coverage) [![Dependabot Status](https://api.dependabot.com/badges/status?host=github&repo=DFE-Digital/govuk_design_system_formbuilder)](https://dependabot.com) [![GitHub license](https://img.shields.io/github/license/DFE-Digital/govuk_design_system_formbuilder)](https://github.com/DFE-Digital/govuk_design_system_formbuilder/blob/master/LICENSE) -[![GOV.UK Design System Version](https://img.shields.io/badge/GOV.UK%20Design%20System-3.3.0-brightgreen)](https://design-system.service.gov.uk) +[![GOV.UK Design System Version](https://img.shields.io/badge/GOV.UK%20Design%20System-3.4.0-brightgreen)](https://design-system.service.gov.uk) This gem provides a easy-to-use form builder that generates forms that are -fully-compliant with version 3.3.0 of the [GOV.UK Design System](https://design-system.service.gov.uk/), +fully-compliant with version 3.4.0 of the [GOV.UK Design System](https://design-system.service.gov.uk/), minimising the amount of markup you need to write. In addition to the basic markup, the more-advanced functionality of the Design diff --git a/guide/content/introduction/supported-versions.slim b/guide/content/introduction/supported-versions.slim index a7ccc805..455b8c61 100644 --- a/guide/content/introduction/supported-versions.slim +++ b/guide/content/introduction/supported-versions.slim @@ -16,7 +16,7 @@ dl.govuk-summary-list ul.govuk-list li span.govuk-tag - | Version 3.3.0 + | Version 3.4.0 div.govuk-summary-list__row dt.govuk-summary-list__key diff --git a/guide/package-lock.json b/guide/package-lock.json index 9770cc94..6c05b11e 100644 --- a/guide/package-lock.json +++ b/guide/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "govuk-frontend": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-3.3.0.tgz", - "integrity": "sha512-ncOGTAV6mzz1CPBlr/UGETiG3IO6P3b0CvSI0wxBz7Uo0A/6jttLoxkvuYXju2oNA2yqRh2NjD1zJUOP3Q32CQ==" + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-3.4.0.tgz", + "integrity": "sha512-rmYPtcCtWgz92QBejYwOnfSxbPGYfvSruLwB4CBk/yJtySHRY0whG1e2/iFRRSj0pMx1Bu+zh/IqCTo+84hbFw==" } } } diff --git a/guide/package.json b/guide/package.json index 87066fd7..37836abe 100644 --- a/guide/package.json +++ b/guide/package.json @@ -12,6 +12,6 @@ "author": "", "license": "ISC", "dependencies": { - "govuk-frontend": "^3.3.0" + "govuk-frontend": "^3.4.0" } }