govuk_design_system_formbuilder 2.8.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84999693662af580363425f17c82d516d675c30d000ccd7e46a3d4607b63b32e
-  data.tar.gz: fe9b2a8f8cd05ec1eb56d915223a387ba4d86390dbee1e771f9c32263afd054a
+  metadata.gz: 9bec1bab9191040f7f1c63377dd36f9a662de2f46f29cbaf79722a51fffbb044
+  data.tar.gz: f99522c38fc58a1ec28b5041c6e934415a44e16a8bdc3e9891a009d8822efdca
 SHA512:
-  metadata.gz: f48bdf7f824047df1dccc6b53412cb454f3f30af9805ba5b6fafa91d89454e03ef929d534919b0695ca0db0804d84de18a01779074382d96e7c457c2e4a727cf
-  data.tar.gz: c5d24743fa044cf0b71b3b3609239c0787ed0551a6993f74f238385217782f4167439470070c4dd0f4d24b1bdcb1446cb6c996d3aef51f001c016dde55945800
+  metadata.gz: f007e7563e95ff2d4e45ffb393248b7cc268575940787545f9cd6de5ea70fd1a46326c71ffbfd0b213e8c385723f2b024d6c0de9d4f1c519df665a391096fe21
+  data.tar.gz: 44a373662b919477b9434151f3d1268781878d4bf428381870561b177219ee2b3d7c950fdd1ffb2f86d329e522912b442dc7833606332b791aaef4b030c02de6

data/README.md

@@ -5,10 +5,10 @@
 [![Gem Version](https://badge.fury.io/rb/govuk_design_system_formbuilder.svg)](https://badge.fury.io/rb/govuk_design_system_formbuilder)
 [![Gem](https://img.shields.io/gem/dt/govuk_design_system_formbuilder?logo=rubygems)](https://rubygems.org/gems/govuk_design_system_formbuilder)
 [![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)
+[![GitHub license](https://img.shields.io/github/license/DFE-Digital/govuk_design_system_formbuilder)](https://github.com/DFE-Digital/govuk-formbuilder/blob/main/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/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/)
+[![Rails](https://img.shields.io/badge/Rails-6.1.4.4%20%E2%95%B1%207.0.1-E16D6D)](https://weblog.rubyonrails.org/releases/)
+[![Ruby](https://img.shields.io/badge/Ruby-2.7.5%20%20%E2%95%B1%203.0.3%20%20%E2%95%B1%203.1.0-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/).
 

data/lib/govuk_design_system_formbuilder/elements/error_message.rb

@@ -8,7 +8,7 @@ module GOVUKDesignSystemFormBuilder
       def html
         return unless has_errors?
 
-        tag.span(class: %(#{brand}-error-message), id: error_id) do
+        tag.p(class: %(#{brand}-error-message), id: error_id) do
           safe_join([hidden_prefix, message])
         end
       end

data/lib/govuk_design_system_formbuilder/elements/hint.rb

@@ -27,7 +27,7 @@ module GOVUKDesignSystemFormBuilder
       def html
         return unless active?
 
-        content_tag(hint_tag, **hint_options, **@html_attributes) { hint_body }
+        tag.div(**hint_options, **@html_attributes) { hint_body }
       end
 
       def hint_id
@@ -42,10 +42,6 @@ module GOVUKDesignSystemFormBuilder
         { class: classes, id: hint_id }
       end
 
-      def hint_tag
-        @raw.presence ? 'div' : 'span'
-      end
-
       def hint_body
         @raw || @text
       end

data/lib/govuk_design_system_formbuilder/traits/html_classes.rb

@@ -6,31 +6,8 @@ module GOVUKDesignSystemFormBuilder
       # Rails' class_names, but recreated here as that returns a string
       # where we want an array.
       def build_classes(*args, **kwargs)
-        # FIXME: we need to handle the arguments differently for Ruby 2.6.x because
-        #        Ruby 2.7.0 brought the separation of positional and keyword
-        #        arguments.
-        #
-        #        This can be removed once support for 2.6.x is dropped.
-        #
-        #        https://www.ruby-lang.org/en/news/2019/12/12/separation-of-positional-and-keyword-arguments-in-ruby-3-0/
-        return ruby_2_6_build_classes_fallback(*args) if RUBY_VERSION < "2.7.0"
-
         (args + kwargs.map { |k, v| k if v }).compact
       end
-
-    private
-
-      def ruby_2_6_build_classes_fallback(*args)
-        [].tap do |classes|
-          args.each do |arg|
-            if arg.is_a?(Hash)
-              arg.each { |k, v| classes.append(k) if v }
-            else
-              classes.append(arg)
-            end
-          end
-        end
-      end
     end
   end
 end

data/lib/govuk_design_system_formbuilder/version.rb

@@ -1,3 +1,3 @@
 module GOVUKDesignSystemFormBuilder
-  VERSION = '2.8.0'.freeze
+  VERSION = '3.0.1'.freeze
 end

data/lib/govuk_design_system_formbuilder.rb

@@ -57,8 +57,8 @@ module GOVUKDesignSystemFormBuilder
   # * +: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
+  #   When nil, no data attribute will be added. Defaults to turbo since Rails 7,
+  #   change to 'turbolinks' for Rails 6.1
   #
   # * +:localisation_schema_fallback+ sets the prefix elements for the array
   #   used to build the localisation string. The final two elements are always
@@ -88,7 +88,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_error_summary_turbo_prefix: 'turbo',
     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.8.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Peter Yates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-01 00:00:00.000000000 Z
+date: 2022-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
@@ -30,56 +30,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-govuk
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -142,6 +128,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-govuk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -162,14 +162,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: nanoc
   requirement: !ruby/object:Gem::Requirement
@@ -213,33 +213,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.7.0
 - !ruby/object:Gem::Dependency
-  name: sassc
+  name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: sassc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
@@ -255,33 +255,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.1.0
 - !ruby/object:Gem::Dependency
-  name: webrick
+  name: slim_lint
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
-  name: slim_lint
+  name: webrick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 1.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 1.7.0
 description: A Rails form builder that generates form inputs adhering to the GOV.UK
   Design System
 email: