govuk_design_system_formbuilder 2.7.5 → 2.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb37ec8e436af4e21bbc44dfbc7dbbead355c07f3f41f802f03de5550b7c419c
-  data.tar.gz: 8aba7fb23067d7ee5fc422488525b8d0d013bf7f76b67ecb31647619e4901f8f
+  metadata.gz: 16dd3a6e9641b3d0aa7e91ee6318bcd0f993d10c00105e1c977f54120eb966d9
+  data.tar.gz: 5aa914a964cac5770d3e1c002aa9e38a20b4bf21c612a9c78c5edfa503c8e98f
 SHA512:
-  metadata.gz: cfcabda01e6b764bbc17ea8185180b48095c2eae04cf308387c7fa430b374fa0c40bffb50e7bacf2d7c0abadca362e4fb07ae27699e7645bd732d9a9487a792a
-  data.tar.gz: 37ee3a7a8d6dbf5eaf441d81102e507e17043e79b4b774b3ebdad9e1d6d8607e509651c5b9586d029d1be1732805e950f1824e46f47cb88d5106f5a011bf2ff4
+  metadata.gz: 870971ada7f130cd54a13cff52f852d07e1581dd8ebf04f802ae93ca2103325fa2e283e9812170c282da4c5b1a056490799828f0f8d374a7b8d92a053bc6114e
+  data.tar.gz: 7e931f7fe3966909bdd2c4ff16ee3fe7d06e0c52925c03d36fb300a99d7105a842ee6f5aeac165b3824495efd7b3d189ac925378c4a10b7e57c37f8d4230eeb2

data/README.md

@@ -7,8 +7,8 @@
 [![Test Coverage](https://api.codeclimate.com/v1/badges/110136fb22341d3ba646/test_coverage)](https://codeclimate.com/github/DFE-Digital/govuk-formbuilder/test_coverage)
 [![GitHub license](https://img.shields.io/github/license/DFE-Digital/govuk_design_system_formbuilder)](https://github.com/DFE-Digital/govuk-formbuilder/blob/master/LICENSE)
 [![GOV.UK Design System Version](https://img.shields.io/badge/GOV.UK%20Design%20System-3.14.0-brightgreen)](https://design-system.service.gov.uk)
-[![Rails](https://img.shields.io/badge/Ruby-2.6.8%20%E2%95%B1%202.7.4%20%E2%95%B1%203.0.2-E16D6D)](https://www.ruby-lang.org/en/downloads/)
-[![Ruby](https://img.shields.io/badge/Rails-6.0.4%20%E2%95%B1%206.1.3.2-E16D6D)](https://weblog.rubyonrails.org/releases/)
+[![Rails](https://img.shields.io/badge/Rails-6.0.4.1%20%E2%95%B1%206.1.4.1-E16D6D)](https://weblog.rubyonrails.org/releases/)
+[![Ruby](https://img.shields.io/badge/Ruby-2.6.8%20%E2%95%B1%202.7.4%20%E2%95%B1%203.0.2-E16D6D)](https://www.ruby-lang.org/en/downloads/)
 
 This library provides an easy-to-use form builder for the [GOV.UK Design System](https://design-system.service.gov.uk/).
 
@@ -56,7 +56,7 @@ To get up and running quickly and easily try kickstarting your project with a
 pre-configured template:
 
 * [DfE Boilerplate](https://github.com/DFE-Digital/govuk-rails-boilerplate)
-* [MoJ Rails Template](https://github.com/ministryofjustice/moj_rails_template)
+* [DEFRA Ruby Template](https://github.com/DEFRA/defra-ruby-template)
 
 ## Setup 🔧
 

data/lib/govuk_design_system_formbuilder/elements/error_summary.rb

@@ -80,8 +80,8 @@ module GOVUKDesignSystemFormBuilder
         config.default_error_summary_error_order_method
       end
 
-      def list_item(attribute, message)
-        tag.li(link_to(message, same_page_link(field_id(attribute)), data: { turbolinks: false }))
+      def list_item(attribute, message, url = nil)
+        tag.li(link_to(message, url || same_page_link(field_id(attribute)), **link_options))
       end
 
       def same_page_link(target)
@@ -129,6 +129,12 @@ module GOVUKDesignSystemFormBuilder
           }
         }
       end
+
+      def link_options(turbo_prefix: config.default_error_summary_turbo_prefix)
+        return {} unless turbo_prefix
+
+        { data: { turbo_prefix => false } }
+      end
     end
   end
 end

data/lib/govuk_design_system_formbuilder/presenters/error_summary.rb

@@ -19,9 +19,13 @@ module Presenters
     # passed into {GOVUKDesignSystemFormBuilder::Elements::ErrorSummary#list_item}.
     #
     # @return [Array<Array(Symbol, String)>] array of attribute and message arrays
+    # @return [Array<Array(Symbol, String, String)>] array of attribute, message and URL arrays.
     #
     # @example Output format given the input above:
     #   [[:attribute_one, "first error"], [:attribute_two, "third error"]]
+    #
+    # @example Output with hard-coded URLs
+    #   [[:attribute_one, "first error", "https://example.com/attribute-one"], [:attribute_two, "third error", "https://example.com/attribute-two"]]
     def formatted_error_messages
       @error_messages.map { |attribute, messages| [attribute, messages.first] }
     end

data/lib/govuk_design_system_formbuilder/version.rb

@@ -1,3 +1,3 @@
 module GOVUKDesignSystemFormBuilder
-  VERSION = '2.7.5'.freeze
+  VERSION = '2.7.6'.freeze
 end

data/lib/govuk_design_system_formbuilder.rb

@@ -54,6 +54,12 @@ module GOVUKDesignSystemFormBuilder
   #   will check for on the bound object to see whether or not to try ordering the
   #   error messages
   #
+  # * +:default_error_summary_turbo_prefix+ is used to disable turbo/turbolinks from
+  #   handling clicks on links in the error summary. When it's a string (eg,
+  #   turbo), that will result in links with the attribute 'data-turbo=false'.
+  #   When nil, no data attribute will be added. Defaults to 'turbolinks' for
+  #   compatibilitiy's sake; this will change to 'turbo' when Rails 7 is released
+  #
   # * +:localisation_schema_fallback+ sets the prefix elements for the array
   #   used to build the localisation string. The final two elements are always
   #   are the object name and attribute name. The _special_ value +__context__+,
@@ -78,6 +84,7 @@ module GOVUKDesignSystemFormBuilder
     default_error_summary_title: 'There is a problem',
     default_error_summary_presenter: Presenters::ErrorSummaryPresenter,
     default_error_summary_error_order_method: nil,
+    default_error_summary_turbo_prefix: 'turbolinks',
     default_collection_check_boxes_include_hidden: true,
     default_collection_radio_buttons_include_hidden: true,
     default_submit_validate: false,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_design_system_formbuilder
 version: !ruby/object:Gem::Version
-  version: 2.7.5
+  version: 2.7.6
 platform: ruby
 authors:
 - Peter Yates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-05 00:00:00.000000000 Z
+date: 2021-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
@@ -350,12 +350,12 @@ homepage: https://govuk-form-builder.netlify.app
 licenses:
 - MIT
 metadata:
-  bug_tracker_uri: https://github.com/DFE-Digital/govuk_design_system_formbuilder/issues
-  changelog_uri: https://github.com/DFE-Digital/govuk_design_system_formbuilder/releases
+  bug_tracker_uri: https://github.com/DFE-Digital/govuk-formbuilder/issues
+  changelog_uri: https://github.com/DFE-Digital/govuk-formbuilder/releases
   documentation_uri: https://www.rubydoc.info/gems/govuk_design_system_formbuilder/GOVUKDesignSystemFormBuilder/Builder
   homepage_uri: https://govuk-form-builder.netlify.app
-  source_code_uri: https://github.com/DFE-Digital/govuk_design_system_formbuilder
-  github_repo: https://github.com/DFE-Digital/govuk_design_system_formbuilder
+  source_code_uri: https://github.com/DFE-Digital/govuk-formbuilder
+  github_repo: https://github.com/DFE-Digital/govuk-formbuilder
 post_install_message: 
 rdoc_options: []
 require_paths: