govuk_design_system_formbuilder 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20e6f4eee756b2a59954309af86bb0468a16cf9cf1d3b01c35c0f9f62c1199b4
-  data.tar.gz: ba834c6795f6e5c49e5f26628b5260eb2d51da1014af12a5f7b1f670d8b6c2d3
+  metadata.gz: 3ebd25c1817c070b758b43169675f06a6289f3ec74a5bacee308cc9ec5a92249
+  data.tar.gz: 8dd04473e33667cce31788b3fed030bea158f89de34f03ff09a57198159db116
 SHA512:
-  metadata.gz: dc4c66869d8500766c9a950fb58d94a8ff2c9418ccb665f7d0c6cf3899b5644a0cb4299396c8bc1c638e3a431726a0e9a73d6e32dab1eeac8699687f5ecc5e24
-  data.tar.gz: 05d41b7aca00b52c0b3d33164b9037ff8e6e5bba01564d897f33bb2554e7aa3201a813ed704623969d393e1d5e17f403f61c1e46650c3fd020a205a345078a17
+  metadata.gz: fb2a8f5fc36788c691e732ae5caf56ae0a7483f77ddd1ae668c8fcc35d96fcaeefa9e310eb682d815068546aa2250330e5ba54cf3e573dc3a55d6d47b3885deb
+  data.tar.gz: 8b69dc4d31cb8104458c2b14a241458c4f290a38b17000ea280f5a40e86531fbb08b2653d11da040ab639e013a3aef59637a26d730579c96094498eadfc95f2c

data/lib/govuk_design_system_formbuilder.rb

@@ -4,13 +4,19 @@ require 'govuk_design_system_formbuilder/base'
 
 require 'govuk_design_system_formbuilder/elements/hint'
 require 'govuk_design_system_formbuilder/elements/label'
-require 'govuk_design_system_formbuilder/elements/input'
 require 'govuk_design_system_formbuilder/elements/date'
 require 'govuk_design_system_formbuilder/elements/select'
 require 'govuk_design_system_formbuilder/elements/submit'
 require 'govuk_design_system_formbuilder/elements/text_area'
 require 'govuk_design_system_formbuilder/elements/file'
 
+require 'govuk_design_system_formbuilder/elements/inputs/base'
+require 'govuk_design_system_formbuilder/elements/inputs/email'
+require 'govuk_design_system_formbuilder/elements/inputs/number'
+require 'govuk_design_system_formbuilder/elements/inputs/phone'
+require 'govuk_design_system_formbuilder/elements/inputs/text'
+require 'govuk_design_system_formbuilder/elements/inputs/url'
+
 require 'govuk_design_system_formbuilder/elements/radios/collection'
 require 'govuk_design_system_formbuilder/elements/radios/collection_radio_button'
 require 'govuk_design_system_formbuilder/elements/radios/fieldset_radio_button'

data/lib/govuk_design_system_formbuilder/builder.rb

@@ -23,7 +23,7 @@ module GOVUKDesignSystemFormBuilder
     #     required: true,
     #     placeholder: 'Ralph Wiggum'
     def govuk_text_field(attribute_name, hint_text: nil, label: {}, width: nil, **args, &block)
-      Elements::Input.new(self, object_name, attribute_name, attribute_type: :text, hint_text: hint_text, label: label, width: width, **args, &block).html
+      Elements::Inputs::Text.new(self, object_name, attribute_name, hint_text: hint_text, label: label, width: width, **args, &block).html
     end
 
     # Generates a input of type +tel+
@@ -50,7 +50,7 @@ module GOVUKDesignSystemFormBuilder
     #     required: true,
     #     placeholder: '0123 456 789'
     def govuk_phone_field(attribute_name, hint_text: nil, label: {}, width: nil, **args, &block)
-      Elements::Input.new(self, object_name, attribute_name, attribute_type: :phone, hint_text: hint_text, label: label, width: width, **args, &block).html
+      Elements::Inputs::Phone.new(self, object_name, attribute_name, hint_text: hint_text, label: label, width: width, **args, &block).html
     end
 
     # Generates a input of type +email+
@@ -75,7 +75,7 @@ module GOVUKDesignSystemFormBuilder
     #     label: { text: 'Enter your email address' },
     #     placeholder: 'ralph.wiggum@springfield.edu'
     def govuk_email_field(attribute_name, hint_text: nil, label: {}, width: nil, **args, &block)
-      Elements::Input.new(self, object_name, attribute_name, attribute_type: :email, hint_text: hint_text, label: label, width: width, **args, &block).html
+      Elements::Inputs::Email.new(self, object_name, attribute_name, hint_text: hint_text, label: label, width: width, **args, &block).html
     end
 
     # Generates a input of type +url+
@@ -100,7 +100,7 @@ module GOVUKDesignSystemFormBuilder
     #     placeholder: 'https://www.gov.uk',
     #     autocomplete: 'url'
     def govuk_url_field(attribute_name, hint_text: nil, label: {}, width: nil, **args, &block)
-      Elements::Input.new(self, object_name, attribute_name, attribute_type: :url, hint_text: hint_text, label: label, width: width, **args, &block).html
+      Elements::Inputs::URL.new(self, object_name, attribute_name, hint_text: hint_text, label: label, width: width, **args, &block).html
     end
 
     # Generates a input of type +number+
@@ -127,7 +127,7 @@ module GOVUKDesignSystemFormBuilder
     #     max: 150,
     #     step: 5
     def govuk_number_field(attribute_name, hint_text: nil, label: {}, width: nil, **args, &block)
-      Elements::Input.new(self, object_name, attribute_name, attribute_type: :number, hint_text: hint_text, label: label, width: width, **args, &block).html
+      Elements::Inputs::Number.new(self, object_name, attribute_name, hint_text: hint_text, label: label, width: width, **args, &block).html
     end
 
     # Generates a +textarea+ element with a label, optional hint. Also offers

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

@@ -30,7 +30,7 @@ module GOVUKDesignSystemFormBuilder
       private
 
         def label_element
-          @label_element ||= Label.new(@checkbox, @object_name, @attribute_name, value: @value)
+          @label_element ||= Label.new(@builder, @object_name, @attribute_name, @checkbox, value: @value, link_errors: @link_errors)
         end
 
         def hint_element

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

@@ -2,13 +2,16 @@ module GOVUKDesignSystemFormBuilder
   module Elements
     module CheckBoxes
       class Label < GOVUKDesignSystemFormBuilder::Base
-        def initialize(builder, object_name, attribute_name, value:)
+        def initialize(builder, object_name, attribute_name, checkbox, value:, link_errors: true)
           super(builder, object_name, attribute_name)
-          @value = value
+
+          @checkbox    = checkbox
+          @value       = value
+          @link_errors = link_errors
         end
 
         def html
-          @builder.label(for: field_id, class: label_classes)
+          @checkbox.label(for: field_id(link_errors: @link_errors), class: label_classes)
         end
 
       private

data/lib/govuk_design_system_formbuilder/elements/inputs/base.rb

@@ -0,0 +1,79 @@
+module GOVUKDesignSystemFormBuilder
+  module Elements
+    module Inputs
+      class Base < GOVUKDesignSystemFormBuilder::Base
+        def initialize(builder, object_name, attribute_name, hint_text:, label:, width:, **extra_args, &block)
+          super(builder, object_name, attribute_name, &block)
+
+          @width          = width
+          @extra_args     = extra_args
+          @label          = label
+          @hint_text      = hint_text
+        end
+
+        def html
+          Containers::FormGroup.new(@builder, @object_name, @attribute_name).html do
+            @builder.safe_join(
+              [
+                label_element.html,
+                hint_element.html,
+                supplemental_content.html,
+                error_element.html,
+                @builder.send(
+                  builder_method,
+                  @attribute_name,
+                  id: field_id(link_errors: true),
+                  class: input_classes,
+                  aria: {
+                    describedby: described_by(
+                      hint_id,
+                      error_id,
+                      supplemental_id
+                    )
+                  },
+                  **@extra_args
+                )
+              ]
+            )
+          end
+        end
+
+      private
+
+        def input_classes
+          %w(govuk-input).push(width_classes, error_classes).compact
+        end
+
+        def error_classes
+          ('govuk-input--error') if has_errors?
+        end
+
+        def width_classes
+          return if @width.blank?
+
+          case @width
+          when nil then nil
+
+            # fixed (character) widths
+          when 20 then 'govuk-input--width-20'
+          when 10 then 'govuk-input--width-10'
+          when 5  then 'govuk-input--width-5'
+          when 4  then 'govuk-input--width-4'
+          when 3  then 'govuk-input--width-3'
+          when 2  then 'govuk-input--width-2'
+
+            # fluid widths
+          when 'full'           then 'govuk-!-width-full'
+          when 'three-quarters' then 'govuk-!-width-three-quarters'
+          when 'two-thirds'     then 'govuk-!-width-two-thirds'
+          when 'one-half'       then 'govuk-!-width-one-half'
+          when 'one-third'      then 'govuk-!-width-one-third'
+          when 'one-quarter'    then 'govuk-!-width-one-quarter'
+
+          else fail(ArgumentError, "invalid width '#{@width}'")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/govuk_design_system_formbuilder/elements/inputs/email.rb

@@ -0,0 +1,11 @@
+module GOVUKDesignSystemFormBuilder
+  module Elements
+    module Inputs
+      class Email < Base
+        def builder_method
+          :email_field
+        end
+      end
+    end
+  end
+end

data/lib/govuk_design_system_formbuilder/elements/inputs/number.rb

@@ -0,0 +1,11 @@
+module GOVUKDesignSystemFormBuilder
+  module Elements
+    module Inputs
+      class Number < Base
+        def builder_method
+          :number_field
+        end
+      end
+    end
+  end
+end

data/lib/govuk_design_system_formbuilder/elements/inputs/phone.rb

@@ -0,0 +1,11 @@
+module GOVUKDesignSystemFormBuilder
+  module Elements
+    module Inputs
+      class Phone < Base
+        def builder_method
+          :phone_field
+        end
+      end
+    end
+  end
+end

data/lib/govuk_design_system_formbuilder/elements/inputs/text.rb

@@ -0,0 +1,11 @@
+module GOVUKDesignSystemFormBuilder
+  module Elements
+    module Inputs
+      class Text < Base
+        def builder_method
+          :text_field
+        end
+      end
+    end
+  end
+end

data/lib/govuk_design_system_formbuilder/elements/inputs/url.rb

@@ -0,0 +1,11 @@
+module GOVUKDesignSystemFormBuilder
+  module Elements
+    module Inputs
+      class URL < Base
+        def builder_method
+          :url_field
+        end
+      end
+    end
+  end
+end

data/lib/govuk_design_system_formbuilder/elements/label.rb

@@ -1,7 +1,7 @@
 module GOVUKDesignSystemFormBuilder
   module Elements
     class Label < GOVUKDesignSystemFormBuilder::Base
-      def initialize(builder, object_name, attribute_name, text: nil, value: nil, size: nil, hidden: false, radio: false, checkbox: false, tag: nil)
+      def initialize(builder, object_name, attribute_name, text: nil, value: nil, size: nil, hidden: false, radio: false, checkbox: false, tag: nil, link_errors: true)
         super(builder, object_name, attribute_name)
 
         @text           = label_text(text, hidden)
@@ -10,6 +10,7 @@ module GOVUKDesignSystemFormBuilder
         @radio_class    = radio_class(radio)
         @checkbox_class = checkbox_class(checkbox)
         @tag            = tag
+        @link_errors    = link_errors
       end
 
       def html
@@ -28,7 +29,7 @@ module GOVUKDesignSystemFormBuilder
         @builder.label(
           @attribute_name,
           value: @value,
-          for: field_id(link_errors: true),
+          for: field_id(link_errors: @link_errors),
           class: %w(govuk-label).push(@size_class, @weight_class, @radio_class, @checkbox_class).compact
         ) do
           @text

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

@@ -41,7 +41,7 @@ module GOVUKDesignSystemFormBuilder
         end
 
         def label_element
-          @label_element ||= Elements::Label.new(@builder, @object_name, @attribute_name, text: @text, value: @value, radio: true, size: label_size)
+          @label_element ||= Elements::Label.new(@builder, @object_name, @attribute_name, text: @text, value: @value, radio: true, size: label_size, link_errors: @link_errors)
         end
 
         def label_size

data/lib/govuk_design_system_formbuilder/elements/select.rb

@@ -45,7 +45,9 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def select_classes
-        %w(govuk-select)
+        %w(govuk-select).tap do |classes|
+          classes.push('govuk-select--error') if has_errors?
+        end
       end
     end
   end

data/lib/govuk_design_system_formbuilder/version.rb

@@ -1,3 +1,3 @@
 module GOVUKDesignSystemFormBuilder
-  VERSION = '0.9.4'.freeze
+  VERSION = '0.9.5'.freeze
 end

metadata

@@ -1,29 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: govuk_design_system_formbuilder
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Peter Yates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-18 00:00:00.000000000 Z
+date: 2019-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: govuk-lint
   requirement: !ruby/object:Gem::Requirement
@@ -114,20 +142,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: nanoc
   requirement: !ruby/object:Gem::Requirement
@@ -256,7 +270,12 @@ files:
 - lib/govuk_design_system_formbuilder/elements/error_summary.rb
 - lib/govuk_design_system_formbuilder/elements/file.rb
 - lib/govuk_design_system_formbuilder/elements/hint.rb
-- lib/govuk_design_system_formbuilder/elements/input.rb
+- lib/govuk_design_system_formbuilder/elements/inputs/base.rb
+- lib/govuk_design_system_formbuilder/elements/inputs/email.rb
+- lib/govuk_design_system_formbuilder/elements/inputs/number.rb
+- lib/govuk_design_system_formbuilder/elements/inputs/phone.rb
+- lib/govuk_design_system_formbuilder/elements/inputs/text.rb
+- lib/govuk_design_system_formbuilder/elements/inputs/url.rb
 - lib/govuk_design_system_formbuilder/elements/label.rb
 - lib/govuk_design_system_formbuilder/elements/radios/collection.rb
 - lib/govuk_design_system_formbuilder/elements/radios/collection_radio_button.rb

data/lib/govuk_design_system_formbuilder/elements/input.rb

@@ -1,78 +0,0 @@
-module GOVUKDesignSystemFormBuilder
-  module Elements
-    class Input < GOVUKDesignSystemFormBuilder::Base
-      def initialize(builder, object_name, attribute_name, attribute_type:, hint_text:, label:, width:, **extra_args, &block)
-        super(builder, object_name, attribute_name, &block)
-
-        @width          = width
-        @extra_args     = extra_args
-        @builder_method = [attribute_type, 'field'].join('_')
-        @label          = label
-        @hint_text      = hint_text
-      end
-
-      def html
-        Containers::FormGroup.new(@builder, @object_name, @attribute_name).html do
-          @builder.safe_join(
-            [
-              label_element.html,
-              hint_element.html,
-              supplemental_content.html,
-              error_element.html,
-              @builder.send(
-                @builder_method,
-                @attribute_name,
-                id: field_id(link_errors: true),
-                class: input_classes,
-                aria: {
-                  describedby: described_by(
-                    hint_id,
-                    error_id,
-                    supplemental_id
-                  )
-                },
-                **@extra_args
-              )
-            ]
-          )
-        end
-      end
-
-    private
-
-      def input_classes
-        %w(govuk-input).push(width_classes, error_classes).compact
-      end
-
-      def error_classes
-        ('govuk-input--error') if has_errors?
-      end
-
-      def width_classes
-        return if @width.blank?
-
-        case @width
-        when nil then nil
-
-          # fixed (character) widths
-        when 20 then 'govuk-input--width-20'
-        when 10 then 'govuk-input--width-10'
-        when 5  then 'govuk-input--width-5'
-        when 4  then 'govuk-input--width-4'
-        when 3  then 'govuk-input--width-3'
-        when 2  then 'govuk-input--width-2'
-
-          # fluid widths
-        when 'full'           then 'govuk-!-width-full'
-        when 'three-quarters' then 'govuk-!-width-three-quarters'
-        when 'two-thirds'     then 'govuk-!-width-two-thirds'
-        when 'one-half'       then 'govuk-!-width-one-half'
-        when 'one-third'      then 'govuk-!-width-one-third'
-        when 'one-quarter'    then 'govuk-!-width-one-quarter'
-
-        else fail(ArgumentError, "invalid width '#{@width}'")
-        end
-      end
-    end
-  end
-end