govuk_design_system_formbuilder 1.1.0.beta.2 → 1.1.0.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82e501f7e5b7cd7dd736262ffb97f54c0aeead0342d27d8a349d05f13839b58b
-  data.tar.gz: ea1da5f05bb735f6fdd4d0f12dc0baefde84b07e54dc493625407f0315c9cf3f
+  metadata.gz: 98afc3753ec1c0f03ef8e1f50ecb102a2c36bd8b9ebe1b466990509bceaf1106
+  data.tar.gz: 1c52249b0568bd1bce3f0af95406850d97e5952b035ebc62afd404cf0c219296
 SHA512:
-  metadata.gz: c7244ee3061ca5184f18fd12ed6b98e74eb842d465fe77becae6322728d95b7acfe4b444ce37c48df2a687129bd52b5b5d85bd1d11c3662b42408f1d1c4d7d87
-  data.tar.gz: 3546f3587c2df1aea3c66dc50e835a228e0735d653bf41982ff13651c2a06310431336484b1872635c7f37ba0e2206f992a343c5022e4eec12edcbfeff9529a5
+  metadata.gz: 92aae919b678bc4bf92b58964a2e10f96fbc3a1aab1f6b56da3a30b09ef909fd7e7d6ac56bda9dfb010a3ac9f04f94443a4b5cb8775511d184d7b311603725f7
+  data.tar.gz: c5dbd6977e7a4996d169e77874fcb87d8e952a0bb2dc8c95cd4a06ff2a0cdc59ad5b3dd1cf5844197f5c778d2c08a04992b7bba63772ff1e3f4e633a7774e773

data/lib/govuk_design_system_formbuilder.rb

@@ -1,53 +1,8 @@
 require 'active_support/configurable'
 
-require 'govuk_design_system_formbuilder/traits/collection_item'
-require 'govuk_design_system_formbuilder/traits/conditional'
-require 'govuk_design_system_formbuilder/traits/error'
-require 'govuk_design_system_formbuilder/traits/hint'
-require 'govuk_design_system_formbuilder/traits/label'
-require 'govuk_design_system_formbuilder/traits/localisation'
-require 'govuk_design_system_formbuilder/traits/supplemental'
-
-require 'govuk_design_system_formbuilder/version'
-require 'govuk_design_system_formbuilder/builder'
-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/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'
-
-require 'govuk_design_system_formbuilder/elements/check_boxes/collection'
-require 'govuk_design_system_formbuilder/elements/check_boxes/collection_check_box'
-require 'govuk_design_system_formbuilder/elements/check_boxes/fieldset_check_box'
-require 'govuk_design_system_formbuilder/elements/check_boxes/label'
-require 'govuk_design_system_formbuilder/elements/check_boxes/hint'
-
-require 'govuk_design_system_formbuilder/elements/error_message'
-require 'govuk_design_system_formbuilder/elements/error_summary'
-
-require 'govuk_design_system_formbuilder/containers/check_boxes_fieldset'
-require 'govuk_design_system_formbuilder/containers/form_group'
-require 'govuk_design_system_formbuilder/containers/fieldset'
-require 'govuk_design_system_formbuilder/containers/radios'
-require 'govuk_design_system_formbuilder/containers/radio_buttons_fieldset'
-require 'govuk_design_system_formbuilder/containers/check_boxes'
-require 'govuk_design_system_formbuilder/containers/character_count'
-require 'govuk_design_system_formbuilder/containers/supplemental'
+[%w(traits *.rb), %w(*.rb), %w(elements ** *.rb), %w(containers ** *.rb)]
+  .flat_map { |matcher| Dir.glob(File.join(__dir__, 'govuk_design_system_formbuilder', *matcher)) }
+  .each { |file| require file }
 
 module GOVUKDesignSystemFormBuilder
   include ActiveSupport::Configurable

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

@@ -2,6 +2,12 @@ module GOVUKDesignSystemFormBuilder
   module Elements
     module Inputs
       class Email < Base
+        include Traits::Input
+        include Traits::Error
+        include Traits::Hint
+        include Traits::Label
+        include Traits::Supplemental
+
         def builder_method
           :email_field
         end

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

@@ -2,6 +2,12 @@ module GOVUKDesignSystemFormBuilder
   module Elements
     module Inputs
       class Number < Base
+        include Traits::Input
+        include Traits::Error
+        include Traits::Hint
+        include Traits::Label
+        include Traits::Supplemental
+
         def builder_method
           :number_field
         end

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

@@ -2,6 +2,12 @@ module GOVUKDesignSystemFormBuilder
   module Elements
     module Inputs
       class Phone < Base
+        include Traits::Input
+        include Traits::Error
+        include Traits::Hint
+        include Traits::Label
+        include Traits::Supplemental
+
         def builder_method
           :phone_field
         end

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

@@ -2,6 +2,12 @@ module GOVUKDesignSystemFormBuilder
   module Elements
     module Inputs
       class Text < Base
+        include Traits::Input
+        include Traits::Error
+        include Traits::Hint
+        include Traits::Label
+        include Traits::Supplemental
+
         def builder_method
           :text_field
         end

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

@@ -2,6 +2,12 @@ module GOVUKDesignSystemFormBuilder
   module Elements
     module Inputs
       class URL < Base
+        include Traits::Input
+        include Traits::Error
+        include Traits::Hint
+        include Traits::Label
+        include Traits::Supplemental
+
         def builder_method
           :url_field
         end

data/lib/govuk_design_system_formbuilder/traits/input.rb

@@ -0,0 +1,77 @@
+module GOVUKDesignSystemFormBuilder
+  module Traits
+    module Input
+      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
+          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

data/lib/govuk_design_system_formbuilder/version.rb

@@ -1,3 +1,3 @@
 module GOVUKDesignSystemFormBuilder
-  VERSION = '1.1.0.beta.2'.freeze
+  VERSION = '1.1.0.beta.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_design_system_formbuilder
 version: !ruby/object:Gem::Version
-  version: 1.1.0.beta.2
+  version: 1.1.0.beta.3
 platform: ruby
 authors:
 - Peter Yates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-21 00:00:00.000000000 Z
+date: 2019-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -284,7 +284,6 @@ 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/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
@@ -301,6 +300,7 @@ files:
 - lib/govuk_design_system_formbuilder/traits/conditional.rb
 - lib/govuk_design_system_formbuilder/traits/error.rb
 - lib/govuk_design_system_formbuilder/traits/hint.rb
+- lib/govuk_design_system_formbuilder/traits/input.rb
 - lib/govuk_design_system_formbuilder/traits/label.rb
 - lib/govuk_design_system_formbuilder/traits/localisation.rb
 - lib/govuk_design_system_formbuilder/traits/supplemental.rb

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

@@ -1,84 +0,0 @@
-module GOVUKDesignSystemFormBuilder
-  module Elements
-    module Inputs
-      class Base < GOVUKDesignSystemFormBuilder::Base
-        include Traits::Error
-        include Traits::Hint
-        include Traits::Label
-        include Traits::Supplemental
-
-        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
-            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