govuk_design_system_formbuilder 0.7.10 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73b7bd429e21b82e45676784581f4fe11b9416f64ef2b91352e8eebdfab59137
-  data.tar.gz: 7cdabd663e9355585c53102a15269af7771bac0cbcd4c0c3a6c679d231505a66
+  metadata.gz: d14133ba63175446f9f236dca08807940ff40721098934978d73b0bd8e318d24
+  data.tar.gz: 501a3e8518adaf0f2f21b8e76a4de66f4e17b6ad51d5dc50349893d7cf1f7251
 SHA512:
-  metadata.gz: 8d770e843277f1d75dc2c1dbe3948f6213188e11329290a545812a272ee9a2fc7223101410ca94251af83c8d4548916d9d9c3cac9de837525fdfaa9414401e3b
-  data.tar.gz: bc8fe7c54322289504f46bfdbdb00615b938c9dda38ce6b89e822042943e1f4fe3bf503f856339499f7a6da243b0465b647ad33c089d23085dc2d9c17c35075f
+  metadata.gz: 3d4b888def8299a530840d9866298105a63b4355b9fff0da68dc12769230ac6f76d661eff3d27a2532ba133c122e2dbfac27764482e54802f4726f249e372815
+  data.tar.gz: bc4a68efd9fe2ba7a92e0d0954b22abd7074b5c6109e5577038bbddbeca6d3b2f216bd9de2269ecdfe749482d960d652c6a554fcaaabdd639cd0e7fbcc29242e

data/README.md

@@ -5,9 +5,12 @@
 [![Test Coverage](https://api.codeclimate.com/v1/badges/fde73b5dc9476197281b/test_coverage)](https://codeclimate.com/github/DFE-Digital/govuk_design_system_formbuilder/test_coverage)
 
 This gem provides a easy-to-use form builder that generates forms that are
-fully-compliant with the [GOV.UK Design System](https://design-system.service.gov.uk/),
+fully-compliant with version 3 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://www.rubydoc.info/gems/govuk_design_system_formbuilder/GOVUKDesignSystemFormBuilder/Builder#govuk_text_area-instance_method)
@@ -103,7 +106,7 @@ bundle
 Now, if everything was successful, run RSpec:
 
 ```sh
-rspec -fd
+bundle exec rspec -fd
 ```
 
 ## Contributing

data/lib/govuk_design_system_formbuilder/base.rb

@@ -15,7 +15,7 @@ module GOVUKDesignSystemFormBuilder
     end
 
     def label_element
-      @label_element ||= Elements::Label.new(@builder, @object_name, @attribute_name, @label)
+      @label_element ||= Elements::Label.new(@builder, @object_name, @attribute_name, **@label)
     end
 
     # returns the id value used for the input

data/lib/govuk_design_system_formbuilder/containers/check_boxes.rb

@@ -7,7 +7,7 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def html
-        @builder.content_tag('div', class: check_boxes_classes, data: { module: 'checkboxes' }) do
+        @builder.content_tag('div', class: check_boxes_classes, data: { module: 'govuk-checkboxes' }) do
           yield
         end
       end

data/lib/govuk_design_system_formbuilder/containers/check_boxes_fieldset.rb

@@ -13,13 +13,15 @@ module GOVUKDesignSystemFormBuilder
       def html
         Containers::FormGroup.new(@builder, @object_name, @attribute_name).html do
           Containers::Fieldset.new(@builder, legend: @legend, described_by: [error_element.error_id, hint_element.hint_id]).html do
-            @builder.safe_join([
-              hint_element.html,
-              error_element.html,
-              Containers::CheckBoxes.new(@builder, small: @small).html do
-                @block_content
-              end
-            ])
+            @builder.safe_join(
+              [
+                hint_element.html,
+                error_element.html,
+                Containers::CheckBoxes.new(@builder, small: @small).html do
+                  @block_content
+                end
+              ]
+            )
           end
         end
       end

data/lib/govuk_design_system_formbuilder/containers/fieldset.rb

@@ -12,10 +12,7 @@ module GOVUKDesignSystemFormBuilder
 
       def html
         @builder.content_tag('fieldset', class: fieldset_classes, aria: { describedby: @described_by }) do
-          @builder.safe_join([
-            build_legend,
-            yield
-          ])
+          @builder.safe_join([build_legend, yield])
         end
       end
 

data/lib/govuk_design_system_formbuilder/containers/form_group.rb

@@ -14,13 +14,9 @@ module GOVUKDesignSystemFormBuilder
     private
 
       def form_group_classes
-        %w(govuk-form-group).push(form_group_error_classes).compact
-      end
-
-      def form_group_error_classes
-        return nil unless has_errors?
-
-        'govuk-form-group--error'
+        %w(govuk-form-group).tap do |classes|
+          classes.push('govuk-form-group--error') if has_errors?
+        end
       end
     end
   end

data/lib/govuk_design_system_formbuilder/containers/radio_buttons_fieldset.rb

@@ -14,13 +14,15 @@ module GOVUKDesignSystemFormBuilder
       def html
         Containers::FormGroup.new(@builder, @object_name, @attribute_name).html do
           Containers::Fieldset.new(@builder, legend: @legend, described_by: [error_element.error_id, hint_element.hint_id]).html do
-            @builder.safe_join([
-              hint_element.html,
-              error_element.html,
-              Containers::Radios.new(@builder, inline: @inline, small: @small).html do
-                @block_content
-              end
-            ])
+            @builder.safe_join(
+              [
+                hint_element.html,
+                error_element.html,
+                Containers::Radios.new(@builder, inline: @inline, small: @small).html do
+                  @block_content
+                end
+              ]
+            )
           end
         end
       end

data/lib/govuk_design_system_formbuilder/containers/radios.rb

@@ -8,7 +8,7 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def html
-        @builder.content_tag('div', class: radios_classes, data: { module: 'radios' }) do
+        @builder.content_tag('div', class: radios_classes, data: { module: 'govuk-radios' }) do
           yield
         end
       end

data/lib/govuk_design_system_formbuilder/elements/check_boxes/fieldset_check_box.rb

@@ -19,7 +19,14 @@ module GOVUKDesignSystemFormBuilder
 
         def html
           @builder.content_tag('div', class: 'govuk-checkboxes__item') do
-            @builder.safe_join([input, label, hint, @conditional_content])
+            @builder.safe_join(
+              [
+                input,
+                label_element.html,
+                hint_element.html,
+                @conditional_content
+              ]
+            )
           end
         end
 
@@ -40,26 +47,12 @@ module GOVUKDesignSystemFormBuilder
           )
         end
 
-        def label
-          Elements::Label.new(
-            @builder,
-            @object_name,
-            @attribute_name,
-            value: @value,
-            checkbox: true,
-            **@label,
-          ).html
+        def label_element
+          @label_element ||= Elements::Label.new(@builder, @object_name, @attribute_name, checkbox: true, value: @value, **@label)
         end
 
-        def hint
-          Elements::Hint.new(
-            @builder,
-            @object_name,
-            @attribute_name,
-            @hint_text,
-            @value,
-            checkbox: true
-          ).html
+        def hint_element
+          @hint_element ||= Elements::Hint.new(@builder, @object_name, @attribute_name, @hint_text, checkbox: true)
         end
 
         def conditional_classes

data/lib/govuk_design_system_formbuilder/elements/error_message.rb

@@ -19,7 +19,7 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def message
-        @builder.object.errors.messages.dig(@attribute_name)
+        @builder.object.errors.messages[@attribute_name]&.first
       end
     end
   end

data/lib/govuk_design_system_formbuilder/elements/error_summary.rb

@@ -18,7 +18,7 @@ module GOVUKDesignSystemFormBuilder
                 @builder.content_tag('ul', class: ['govuk-list', summary_class('list')]) do
                   @builder.safe_join(
                     @builder.object.errors.messages.map do |attribute, messages|
-                      error_list_item(attribute, messages)
+                      error_list_item(attribute, messages.first)
                     end
                   )
                 end
@@ -30,10 +30,10 @@ module GOVUKDesignSystemFormBuilder
 
     private
 
-      def error_list_item(attribute, messages)
+      def error_list_item(attribute, message)
         @builder.content_tag('li') do
           @builder.link_to(
-            messages.join(', '),
+            message,
             same_page_link(field_id(attribute)),
             data: {
               turbolinks: false

data/lib/govuk_design_system_formbuilder/elements/select.rb

@@ -16,20 +16,22 @@ module GOVUKDesignSystemFormBuilder
 
       def html
         Containers::FormGroup.new(@builder, @object_name, @attribute_name).html do
-          @builder.safe_join([
-            label_element.html,
-            hint_element.html,
-            error_element.html,
-            @block_content,
-            @builder.collection_select(
-              @attribute_name,
-              @collection,
-              @value_method,
-              @text_method,
-              @options,
-              build_html_options(hint_element, error_element)
-            )
-          ])
+          @builder.safe_join(
+            [
+              label_element.html,
+              hint_element.html,
+              error_element.html,
+              @block_content,
+              @builder.collection_select(
+                @attribute_name,
+                @collection,
+                @value_method,
+                @text_method,
+                @options,
+                build_html_options(hint_element, error_element)
+              )
+            ]
+          )
         end
       end
 

data/lib/govuk_design_system_formbuilder/elements/submit.rb

@@ -15,15 +15,20 @@ module GOVUKDesignSystemFormBuilder
 
       def html
         @builder.content_tag('div', class: %w(govuk-form-group)) do
-          @builder.safe_join([
-            @builder.submit(@text, class: %w(govuk-button).push(
-              warning_class,
-              secondary_class,
-              padding_class(@block_content.present?)
-            ),
-            **extra_args),
-            @block_content
-          ])
+          @builder.safe_join(
+            [
+              @builder.submit(
+                @text,
+                class: %w(govuk-button).push(
+                  warning_class,
+                  secondary_class,
+                  padding_class(@block_content.present?)
+                ),
+                **extra_args
+              ),
+              @block_content
+            ]
+          )
         end
       end
 
@@ -45,6 +50,7 @@ module GOVUKDesignSystemFormBuilder
         {
           formnovalidate: !@validate,
           data: {
+            module: 'govuk-button',
             'prevent-double-click' => @prevent_double_click
           }.select { |_k, v| v.present? }
         }

data/lib/govuk_design_system_formbuilder/elements/text_area.rb

@@ -37,7 +37,7 @@ module GOVUKDesignSystemFormBuilder
       def govuk_textarea_classes
         %w(govuk-textarea).tap do |classes|
           classes.push('govuk-textarea--error') if has_errors?
-          classes.push('js-character-count') if limit?
+          classes.push('govuk-js-character-count') if limit?
         end
       end
 

data/lib/govuk_design_system_formbuilder/version.rb

@@ -1,3 +1,3 @@
 module GOVUKDesignSystemFormBuilder
-  VERSION = '0.7.10'.freeze
+  VERSION = '0.9.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_design_system_formbuilder
 version: !ruby/object:Gem::Version
-  version: 0.7.10
+  version: 0.9.0
 platform: ruby
 authors:
 - Peter Yates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-30 00:00:00.000000000 Z
+date: 2019-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -192,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: GOV.UK-compliant Rails form builder