govuk_design_system_formbuilder 0.7.6 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fc37b1f1f89baf5185ef1bc708f03ebe2a9d6a331ae880dacc2b797b670ce6a
-  data.tar.gz: a4195d6fd6b127f972c84277fd56d3ebc0b1eaed3a342257fa68db7c24ee6a14
+  metadata.gz: e6685d3566f5cb5c92a953b68294c59d35470853cd3802d0671f893df5b4e8dd
+  data.tar.gz: d598a5153f570008c05562511ca3e164a93aa151050663a1f30b2434c3869661
 SHA512:
-  metadata.gz: 86bbb01e953d5711ce6767a2cbc4dc97c01ee21ab852a8afe919b4552388f30ed1a00724dc6883208cb609581a9c8c384ea44940289de0ed8931ec6bf7762819
-  data.tar.gz: 3608d0f9feddd47aa1879dfcbb068f0fad726d6f7604738e693a293a7d1dacd81466a81b07c48d69a7bc4701ce82237233c2e4de3e092a37f616bbf7041de5b4
+  metadata.gz: d6cda652f21dfc6f7a654943d80ce8830c2aa6d0ccab953925eb656d3a8e2b0a3177fa876031910cfef8d59733859cc7b8902442c734d354b66b4d4c10f6fa20
+  data.tar.gz: f8f65e2eae38bd02a1b58d675b966abe4849489d09e73b320cc3a21e5f13a81c2694bfbde7bb641b2019e333857aebf723ccd215fb135551442b48c0889d5667

data/lib/govuk_design_system_formbuilder/base.rb

@@ -43,11 +43,9 @@ module GOVUKDesignSystemFormBuilder
     end
 
     def wrap_conditional(block)
-      conditional = @builder.content_tag('div', class: conditional_classes, id: conditional_id) do
+      @builder.content_tag('div', class: conditional_classes, id: conditional_id) do
         @builder.capture { block.call }
       end
-
-      return conditional, conditional_id
     end
 
   private

data/lib/govuk_design_system_formbuilder/builder.rb

@@ -145,7 +145,7 @@ module GOVUKDesignSystemFormBuilder
     #     label: { text: 'Tell us about your work history' },
     #     rows: 8,
     #     max_words: 300
-    def govuk_text_area(attribute_name, hint_text: nil, label: {}, max_words: nil, max_chars: nil, rows: 5, threshold: nil,  **args)
+    def govuk_text_area(attribute_name, hint_text: nil, label: {}, max_words: nil, max_chars: nil, rows: 5, threshold: nil, **args)
       Elements::TextArea.new(self, object_name, attribute_name, hint_text: hint_text, label: label, max_words: max_words, max_chars: max_chars, rows: rows, threshold: threshold, **args).html
     end
 
@@ -160,7 +160,7 @@ module GOVUKDesignSystemFormBuilder
     # @option label size [String] the size of the label font, can be +large+, +medium+, +regular+ or +small+
     # @option label weight [String] the weight of the label font, can be +bold+ or +regular+
     # @return [ActiveSupport::SafeBuffer] HTML output
-    def govuk_collection_select(attribute_name, collection, value_method, text_method, options: {}, html_options: {}, hint_text: nil, label: {}, &block)
+    def govuk_collection_select(attribute_name, collection, value_method, text_method, options: {}, html_options: { class: 'govuk-select' }, hint_text: nil, label: {})
       label_element = Elements::Label.new(self, object_name, attribute_name, label)
       hint_element  = Elements::Hint.new(self, object_name, attribute_name, hint_text)
       error_element = Elements::ErrorMessage.new(self, object_name, attribute_name)
@@ -227,12 +227,12 @@ module GOVUKDesignSystemFormBuilder
     #    legend: { text: 'Pick your favourite colour', size: 'm' },
     #    hint_text: 'If you cannot find the exact match choose something close',
     #    inline: false
-    def govuk_collection_radio_buttons(attribute_name, collection, value_method, text_method, hint_method = nil, hint_text: nil, legend: { text: nil, size: 'm' }, inline: false, &block)
+    def govuk_collection_radio_buttons(attribute_name, collection, value_method, text_method, hint_method = nil, hint_text: nil, legend: { text: nil, size: 'm' }, inline: false)
       hint_element  = Elements::Hint.new(self, object_name, attribute_name, hint_text)
       error_element = Elements::ErrorMessage.new(self, object_name, attribute_name)
 
       Containers::FormGroup.new(self, object_name, attribute_name).html do
-        Containers::Fieldset.new(self, object_name, attribute_name, legend: legend, described_by: [error_element.error_id, hint_element.hint_id]).html do
+        Containers::Fieldset.new(self, legend: legend, described_by: [error_element.error_id, hint_element.hint_id]).html do
           safe_join(
             [
               hint_element.html,
@@ -276,12 +276,12 @@ module GOVUKDesignSystemFormBuilder
     #    = f.govuk_radio_divider
     #    = f.govuk_radio_button :favourite_colour, :yellow, label: { text: 'Yellow' }
     #
-    def govuk_radio_buttons_fieldset(attribute_name, inline: false, hint_text: nil, legend: {}, &block)
+    def govuk_radio_buttons_fieldset(attribute_name, inline: false, hint_text: nil, legend: {})
       hint_element  = Elements::Hint.new(self, object_name, attribute_name, hint_text)
       error_element = Elements::ErrorMessage.new(self, object_name, attribute_name)
 
       Containers::FormGroup.new(self, object_name, attribute_name).html do
-        Containers::Fieldset.new(self, object_name, attribute_name, legend: legend, described_by: [error_element.error_id, hint_element.hint_id]).html do
+        Containers::Fieldset.new(self, legend: legend, described_by: [error_element.error_id, hint_element.hint_id]).html do
           safe_join([
             hint_element.html,
             error_element.html,
@@ -293,7 +293,6 @@ module GOVUKDesignSystemFormBuilder
       end
     end
 
-
     # Generates a radio button
     #
     # @note This should only be used from within a {#govuk_radio_buttons_fieldset}
@@ -363,7 +362,7 @@ module GOVUKDesignSystemFormBuilder
       error_element = Elements::ErrorMessage.new(self, object_name, attribute_name)
 
       Containers::FormGroup.new(self, object_name, attribute_name).html do
-        Containers::Fieldset.new(self, object_name, attribute_name, legend: legend, described_by: [error_element.error_id, hint_element.hint_id]).html do
+        Containers::Fieldset.new(self, legend: legend, described_by: [error_element.error_id, hint_element.hint_id]).html do
           safe_join(
             [
               hint_element.html,
@@ -449,5 +448,24 @@ module GOVUKDesignSystemFormBuilder
     def govuk_error_summary(title = 'There is a problem')
       Elements::ErrorSummary.new(self, object_name, title).html
     end
+
+    # Generates a fieldset containing the contents of the block
+    #
+    # @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+
+    #
+    # @example A fieldset containing address fields
+    #   = f.govuk_fieldset legend: { text: 'Address' }
+    #     = f.govuk_text_field :street
+    #     = f.govuk_text_field :town
+    #     = f.govuk_text_field :city
+    #
+    # @see https://design-system.service.gov.uk/components/fieldset/ GOV.UK fieldset
+    # @return [ActiveSupport::SafeBuffer] HTML output
+    def govuk_fieldset(legend: { text: 'Fieldset heading' }, &block)
+      Containers::Fieldset.new(self, legend: legend).html(&block)
+    end
   end
 end

data/lib/govuk_design_system_formbuilder/containers/character_count.rb

@@ -3,7 +3,9 @@ module GOVUKDesignSystemFormBuilder
     class CharacterCount < Base
       def initialize(builder, max_words:, max_chars:, threshold:)
         @builder = builder
+
         fail ArgumentError, 'limit can be words or chars' if max_words && max_chars
+
         @max_words = max_words
         @max_chars = max_chars
         @threshold = threshold

data/lib/govuk_design_system_formbuilder/containers/fieldset.rb

@@ -4,10 +4,10 @@ module GOVUKDesignSystemFormBuilder
       LEGEND_DEFAULTS = { text: nil, tag: 'h1', size: 'xl' }.freeze
 
       # FIXME standardise sizes with labels
-      LEGEND_SIZES = %w(xl l m s)
+      LEGEND_SIZES = %w(xl l m s).freeze
 
-      def initialize(builder, object_name, attribute_name, legend: {}, described_by: nil)
-        super(builder, object_name, attribute_name)
+      def initialize(builder, legend: {}, described_by: nil)
+        @builder = builder
         @legend = LEGEND_DEFAULTS.merge(legend)
         @described_by = descriptors(described_by)
       end

data/lib/govuk_design_system_formbuilder/containers/radios.rb

@@ -11,6 +11,7 @@ module GOVUKDesignSystemFormBuilder
           yield
         end
       end
+
     private
 
       def radios_classes

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

@@ -3,10 +3,10 @@ module GOVUKDesignSystemFormBuilder
     module CheckBoxes
       class Hint
         def initialize(builder, attribute, checkbox, text)
-          @builder = builder
+          @builder   = builder
           @attribute = attribute
-          @checkbox = checkbox
-          @text    = text
+          @checkbox  = checkbox
+          @text      = text
         end
 
         def html

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

@@ -10,7 +10,7 @@ module GOVUKDesignSystemFormBuilder
           @builder.label(class: label_classes)
         end
 
-        private
+      private
 
         def label_classes
           %w(govuk-label govuk-checkboxes__label)

data/lib/govuk_design_system_formbuilder/elements/date.rb

@@ -1,7 +1,7 @@
 module GOVUKDesignSystemFormBuilder
   module Elements
     class Date < GOVUKDesignSystemFormBuilder::Base
-      SEGMENTS = { day: '3i', month: '2i', year: '1i' }
+      SEGMENTS = { day: '3i', month: '2i', year: '1i' }.freeze
 
       def initialize(builder, object_name, attribute_name, legend:, hint_text:, date_of_birth: false, &block)
         super(builder, object_name, attribute_name)
@@ -16,7 +16,7 @@ module GOVUKDesignSystemFormBuilder
         error_element = Elements::ErrorMessage.new(@builder, @object_name, @attribute_name)
 
         Containers::FormGroup.new(@builder, @object_name, @attribute_name).html do
-          Containers::Fieldset.new(@builder, @object_name, @attribute_name, legend: @legend, described_by: [error_element.error_id, hint_element.hint_id]).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,

data/lib/govuk_design_system_formbuilder/elements/hint.rb

@@ -3,9 +3,10 @@ module GOVUKDesignSystemFormBuilder
     class Hint < GOVUKDesignSystemFormBuilder::Base
       def initialize(builder, object_name, attribute_name, text, value = nil, radio: false, checkbox: false)
         super(builder, object_name, attribute_name)
-        @value = value
-        @hint_text  = text
-        @radio_class = radio_class(radio)
+
+        @value          = value
+        @hint_text      = text
+        @radio_class    = radio_class(radio)
         @checkbox_class = checkbox_class(checkbox)
       end
 

data/lib/govuk_design_system_formbuilder/elements/radios/fieldset_radio.rb

@@ -4,10 +4,15 @@ module GOVUKDesignSystemFormBuilder
       class FieldsetRadio < Base
         def initialize(builder, object_name, attribute_name, value, label:, hint_text:, &block)
           super(builder, object_name, attribute_name)
-          @value = value
-          @label = label
-          @hint_text  = hint_text
-          @conditional_content, @conditional_id = wrap_conditional(block) if block_given?
+
+          @value     = value
+          @label     = label
+          @hint_text = hint_text
+
+          if block_given?
+            @conditional_content = wrap_conditional(block)
+            @conditional_id      = conditional_id
+          end
         end
 
         def html

data/lib/govuk_design_system_formbuilder/elements/submit.rb

@@ -2,14 +2,14 @@ module GOVUKDesignSystemFormBuilder
   module Elements
     class Submit < GOVUKDesignSystemFormBuilder::Base
       def initialize(builder, text, warning:, secondary:, prevent_double_click:, &block)
+        fail ArgumentError, 'buttons can be warning or secondary' if warning && secondary
+
         @builder              = builder
         @text                 = text
         @prevent_double_click = prevent_double_click
-
-        fail ArgumentError, 'buttons can be warning or secondary' if (warning && secondary)
-        @warning = warning
-        @secondary = secondary
-        @block_content = @builder.capture { block.call } if block_given?
+        @warning              = warning
+        @secondary            = secondary
+        @block_content        = @builder.capture { block.call } if block_given?
       end
 
       def html
@@ -20,6 +20,7 @@ module GOVUKDesignSystemFormBuilder
           ])
         end
       end
+
     private
 
       def submit_button_classes(content_present)

data/lib/govuk_design_system_formbuilder/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_design_system_formbuilder
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.7
 platform: ruby
 authors:
 - Peter Yates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-05 00:00:00.000000000 Z
+date: 2019-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -31,7 +31,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 5.2.3
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: govuk-lint
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -45,35 +45,41 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: 0.12.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: 0.12.2
 - !ruby/object:Gem::Dependency
-  name: rspec-html-matchers
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.7.0
 - !ruby/object:Gem::Dependency
-  name: govuk-lint
+  name: rspec-html-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -87,39 +93,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: '3.8'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: '0'
 description: A Rails form builder that generates form inputs adhering to the GOV.UK
   Design System
 email: