govuk_design_system_formbuilder 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe50b7c27f62909f066385d6c9e1315ee2cea569c07fa7e9fd33b9cadb006ddb
-  data.tar.gz: f2a3eca142cbf8aea85d0895b80034ef49ab417c06d816d9fff650f0fa6445a3
+  metadata.gz: 0fc37b1f1f89baf5185ef1bc708f03ebe2a9d6a331ae880dacc2b797b670ce6a
+  data.tar.gz: a4195d6fd6b127f972c84277fd56d3ebc0b1eaed3a342257fa68db7c24ee6a14
 SHA512:
-  metadata.gz: 26bd141d0e1953ac44a9a16cb5f957b677edb29faa9aac60b9b17bbca541411b6e3f7a4b337990084f43c6dcf9a7c5594a02d8839851d2a278b6d136d12a68e3
-  data.tar.gz: f2df55515c72aa7978cd0886952013f36a10a3c671c0f8c1372517beec7ded401307191b7a1610dae9e57dab9b2cf3bd79c802eeb060c11b80abe750a10cec61
+  metadata.gz: 86bbb01e953d5711ce6767a2cbc4dc97c01ee21ab852a8afe919b4552388f30ed1a00724dc6883208cb609581a9c8c384ea44940289de0ed8931ec6bf7762819
+  data.tar.gz: 3608d0f9feddd47aa1879dfcbb068f0fad726d6f7604738e693a293a7d1dacd81466a81b07c48d69a7bc4701ce82237233c2e4de3e092a37f616bbf7041de5b4

data/lib/govuk_design_system_formbuilder/base.rb

@@ -32,7 +32,7 @@ module GOVUKDesignSystemFormBuilder
 
     def has_errors?
       @builder.object.errors.any? &&
-        @builder.object.errors.messages.keys.include?(@attribute_name)
+        @builder.object.errors.messages.dig(@attribute_name).present?
     end
 
     def attribute_identifier

data/lib/govuk_design_system_formbuilder/builder.rb

@@ -140,7 +140,7 @@ module GOVUKDesignSystemFormBuilder
     # @note Setting +max_chars+ or +max_words+ will add a caption beneath the +textarea+ with a live count of words
     #   or characters
     #
-    # @example A number field with placeholder, min, max and step
+    # @example A text area with a custom number of rows and a word limit
     #   = f.govuk_number_field :cv,
     #     label: { text: 'Tell us about your work history' },
     #     rows: 8,
@@ -207,6 +207,7 @@ module GOVUKDesignSystemFormBuilder
     # @param inline [Boolean] controls whether the radio buttons are displayed inline or not
     # @option legend text [String] the fieldset legend's text content
     # @option legend size [String] the size of the fieldset legend font, can be +xl+, +l+, +m+ or +s+
+    # @option legend tag [Symbol,String] the tag used for the fieldset's header, defaults to +h1+, defaults to +h1+
     # @param block [Block] any HTML passed in is inserted inside the fieldset container,
     #   between the error and the radios container element
     # @return [ActiveSupport::SafeBuffer] HTML output
@@ -261,6 +262,7 @@ module GOVUKDesignSystemFormBuilder
     # @param inline [Boolean] controls whether the radio buttons are displayed inline or not
     # @option legend text [String] the fieldset legend's text content
     # @option legend size [String] the size of the fieldset legend font, can be +xl+, +l+, +m+ or +s+
+    # @option legend tag [Symbol,String] the tag used for the fieldset's header, defaults to +h1+
     # @param block [Block] any HTML passed in will be injected into the fieldset
     #   element and should contain radio buttons and optionally a divider
     # @see https://design-system.service.gov.uk/components/radios/ GOV.UK Radios
@@ -299,6 +301,7 @@ module GOVUKDesignSystemFormBuilder
     # @param hint_text [String] the contents of the hint
     # @option legend text [String] the fieldset legend's text content
     # @option legend size [String] the size of the fieldset legend font, can be +xl+, +l+, +m+ or +s+
+    # @option legend tag [Symbol,String] the tag used for the fieldset's header, defaults to +h1+
     # @see https://design-system.service.gov.uk/components/radios/ GOV.UK Radios
     # @param block [Block] Any supplied HTML will be wrapped in a conditional
     #   container and only revealed when the radio button is picked
@@ -336,6 +339,7 @@ module GOVUKDesignSystemFormBuilder
     # @param legend [Hash] options for configuring the hash
     # @option legend text [String] the fieldset legend's text content
     # @option legend size [String] the size of the fieldset legend font, can be +xl+, +l+, +m+ or +s+
+    # @option legend tag [Symbol,String] the tag used for the fieldset's header, defaults to +h1+
     # @param block [Block] any HTML passed in will be injected into the fieldset, after the hint and before the checkboxes
     # @return [ActiveSupport::SafeBuffer] HTML output
     #
@@ -401,7 +405,7 @@ module GOVUKDesignSystemFormBuilder
       Elements::Submit.new(self, text, warning: warning, secondary: secondary, prevent_double_click: prevent_double_click, &block).html
     end
 
-    # Generates three number inputs for the +day+, +month+ and +year+ components of a date
+    # Generates three inputs for the +day+, +month+ and +year+ components of a date
     #
     # @note When using this input be aware that Rails's multiparam time and date handling falls foul
     #   of {https://bugs.ruby-lang.org/issues/5988 this} bug, so incorrect dates like +2019-09-31+ will
@@ -411,11 +415,14 @@ module GOVUKDesignSystemFormBuilder
     # @param legend [Hash] options for configuring the hash
     # @option legend text [String] the fieldset legend's text content
     # @option legend size [String] the size of the fieldset legend font, can be +xl+, +l+, +m+ or +s+
+    # @option legend tag [Symbol,String] the tag used for the fieldset's header, defaults to +h1+
     # @param block [Block] arbitrary HTML that will be rendered between the hint and the input group
     # @param date_of_birth [Boolean] if +true+ {https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/autocomplete#Values birth date auto completion attributes}
     #   will be added to the inputs
     # @return [ActiveSupport::SafeBuffer] HTML output
     #
+    # @see https://github.com/alphagov/govuk-frontend/issues/1449 GOV.UK date input element attributes, using text instead of number
+    #
     # @example A regular date input with a legend and hint
     #   = f.govuk_date_field :starts_on,
     #     legend: { 'When does your event start?' },

data/lib/govuk_design_system_formbuilder/containers/fieldset.rb

@@ -13,7 +13,7 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def html
-        @builder.content_tag('div', class: fieldset_classes, aria: { describedby: @described_by }) do
+        @builder.content_tag('fieldset', class: fieldset_classes, aria: { describedby: @described_by }) do
           @builder.safe_join([
             build_legend,
             yield
@@ -38,6 +38,7 @@ module GOVUKDesignSystemFormBuilder
       def legend_classes
         size = @legend.dig(:size)
         fail "invalid size #{size}, must be #{LEGEND_SIZES.join(', ')}" unless size.in?(LEGEND_SIZES)
+
         "govuk-fieldset__legend govuk-fieldset__legend--#{size}"
       end
 

data/lib/govuk_design_system_formbuilder/elements/date.rb

@@ -25,10 +25,9 @@ module GOVUKDesignSystemFormBuilder
                 @builder.content_tag('div', class: 'govuk-date-input') do
                   @builder.safe_join(
                     [
-                      date_input_group(:day, min: 1, max: 31),
-                      date_input_group(:month, min: 1, max: 12),
-                      # FIXME there must be more sensible defaults than this!
-                      date_input_group(:year, min: 1900, max: 2100, width: 4)
+                      date_input_group(:day),
+                      date_input_group(:month),
+                      date_input_group(:year, width: 4)
                     ]
                   )
                 end
@@ -40,7 +39,7 @@ module GOVUKDesignSystemFormBuilder
 
     private
 
-      def date_input_group(segment, min:, max:, width: 2)
+      def date_input_group(segment, width: 2)
         value = @builder.object.try(@attribute_name).try(segment)
 
         @builder.content_tag('div', class: %w(govuk-date-input__item)) do
@@ -57,10 +56,9 @@ module GOVUKDesignSystemFormBuilder
                   id: date_attribute_descriptor(segment),
                   class: date_input_classes(width),
                   name: date_attribute_identifier(segment),
-                  type: 'number',
-                  min: min,
-                  max: max,
-                  step: 1,
+                  type: 'text',
+                  pattern: '[0-9]*',
+                  inputmode: 'numeric',
                   value: value,
                   autocomplete: date_of_birth_autocomplete_value(segment)
                 )

data/lib/govuk_design_system_formbuilder/elements/error_message.rb

@@ -1,9 +1,8 @@
 module GOVUKDesignSystemFormBuilder
   module Elements
     class ErrorMessage < GOVUKDesignSystemFormBuilder::Base
-      def initialize(builder, object_name, attribute_name, options = {})
+      def initialize(builder, object_name, attribute_name)
         super(builder, object_name, attribute_name)
-        @options = default_options.merge(options)
       end
 
       def html
@@ -18,13 +17,7 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def message
-        @builder.object.errors.messages[@attribute_name]
-      end
-
-    private
-
-      def default_options
-        {}
+        @builder.object.errors.messages.dig(@attribute_name)
       end
     end
   end

data/lib/govuk_design_system_formbuilder/version.rb

@@ -1,3 +1,3 @@
 module GOVUKDesignSystemFormBuilder
-  VERSION = '0.7.5'.freeze
+  VERSION = '0.7.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_design_system_formbuilder
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors:
 - Peter Yates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-03 00:00:00.000000000 Z
+date: 2019-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails