govuk_elements_form_builder 0.1.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3927b7f760b5e6e30f00313e8340dd4967d6b012
-  data.tar.gz: 4b8d9592192896e4b407e33efba591c919ed8827
+  metadata.gz: b43d881f552b63310176c72eaa304ed53e5b89de
+  data.tar.gz: 2b0086ffaabcbf31e15311ffee4eddae8ad62cb1
 SHA512:
-  metadata.gz: 0a0fc0512b037756437895aeb25aca5b60e7265416b7a33c06fd54127f35f71918c1e0fb8d216d8bd522da40e188214ec05690bdce1d22405660ccea29100059
-  data.tar.gz: e80d7e0157a766a60febc560ec13f571f4de2e6710ca08b8056fb87e97ca9959468659c6cae382f6020b76f0b91939e911bdd56f7a26771d49f5f490d8747734
+  metadata.gz: e94aa32b4bcaefa3020fe6797fcb7eb6acb2ed484bf70deec782908678c53fe21a2c4d9befac3f3d9370631f0f51ee05d883dca1c622ec5298cf9eb5253e0ce4
+  data.tar.gz: 7633c157a26792fdc1ae018b649b16ecf0bfc50b3d505c6afd71a9b0369c86a99d99b961ddd6d302b7ac3b223668e611bce81b88f5189a61d4ce0583adaa6282

data/lib/govuk_elements_form_builder/form_builder.rb

@@ -30,7 +30,7 @@ module GovukElementsFormBuilder
           options = args.extract_options!
 
           set_label_classes! options
-          set_field_classes! options
+          set_field_classes! options, attribute
 
           label = label(attribute, options[:label_options])
 
@@ -47,7 +47,7 @@ module GovukElementsFormBuilder
                   id: form_group_id(attribute) do
         content_tag :fieldset, fieldset_options(attribute, options) do
           safe_join([
-                      fieldset_legend(attribute, options),
+                      fieldset_legend(attribute),
                       radio_inputs(attribute, options)
                     ], "\n")
         end
@@ -60,7 +60,7 @@ module GovukElementsFormBuilder
                   id: form_group_id(attributes) do
         content_tag :fieldset, fieldset_options(attributes, options) do
           safe_join([
-                      fieldset_legend(legend_key, options),
+                      fieldset_legend(legend_key),
                       check_box_inputs(attributes)
                     ], "\n")
         end
@@ -72,7 +72,7 @@ module GovukElementsFormBuilder
       content_tag :div, class: form_group_classes(method), id: form_group_id(method) do
 
         html_options = args.extract_options!
-        set_field_classes! html_options
+        set_field_classes! html_options, method
 
         label = label(method, class: "form-label")
         add_hint :label, label, method
@@ -84,36 +84,47 @@ module GovukElementsFormBuilder
 
     private
 
-    # Given an attributes hash that could include any number of arbitrary keys, this method
-    # ensure we merge one or more 'default' attributes into the hash, creating the keys if
-    # don't exist, or merging the defaults if the keys already exists.
-    # It supports strings or arrays as values.
-    #
-    def merge_attributes attributes, default:
-      hash = attributes || {}
-      hash.merge(default) { |_key, oldval, newval| Array(newval) + Array(oldval) }
-    end
-
-    def set_field_classes! options
-      options ||= {}
-      options.merge!(
-        merge_attributes(options, default: {class: 'form-control'})
-      )
+    def set_field_classes! options, attribute
+      text_field_class = "form-control"
+      text_field_class = [text_field_class, 'form-control-error'] if error_for? attribute
+      options[:class] = case options[:class]
+                        when String
+                          [text_field_class, options[:class]]
+                        when Array
+                          options[:class].unshift text_field_class
+                        else
+                          options[:class] = text_field_class
+                        end
     end
 
     def set_label_classes! options
-      options ||= {}
-      options[:label_options] ||= {}
-      options[:label_options].merge!(
-        merge_attributes(options[:label_options], default: {class: 'form-label'})
-      )
+      text_field_class = "form-label"
+
+      if options.present? && options[:label_options].present?
+        options[:label_options][:class] = case options[:label_options][:class]
+                                            when String
+                                              [text_field_class, options[:label_options][:class]]
+                                            when Array
+                                              options[:label_options][:class].unshift text_field_class
+                                            else
+                                              options[:label_options][:class] = text_field_class
+                                          end
+      else
+        options ||= {}
+        options[:label_options] ||= {}
+        options[:label_options][:class] = text_field_class
+      end
+
     end
 
     def check_box_inputs attributes
       attributes.map do |attribute|
-        label(attribute, class: 'block-label selection-button-checkbox') do |tag|
-          input = check_box(attribute)
-          input + localized_label("#{attribute}")
+        input = check_box(attribute)
+        label = label(attribute) do |tag|
+          localized_label("#{attribute}")
+        end
+        content_tag :div, class: "multiple-choice" do
+          input + label
         end
       end
     end
@@ -122,26 +133,27 @@ module GovukElementsFormBuilder
       choices = options[:choices] || [ :yes, :no ]
       choices.map do |choice|
         value = choice.send(options[:value_method] || :to_s)
-        label attribute,
-              class: 'block-label selection-button-radio',
-              value: value do |tag|
-          input = radio_button(attribute, value)
-          text = if options.has_key? :text_method
-                   choice.send(options[:text_method])
-                 else
-                   localized_label("#{attribute}.#{choice}")
-                 end
-          input + text
+        input = radio_button(attribute, value)
+        label = label(attribute, value: value) do |tag|
+                text = if options.has_key? :text_method
+                        choice.send(options[:text_method])
+                      else
+                        localized_label("#{attribute}.#{choice}")
+                      end
+                text
+        end
+        content_tag :div, class: "multiple-choice" do
+          input + label
         end
       end
     end
 
-    def fieldset_legend attribute, options
+    def fieldset_legend attribute
       legend = content_tag(:legend) do
         tags = [content_tag(
                   :span,
                   fieldset_text(attribute),
-                  merge_attributes(options[:legend_options], default: {class: 'form-label-bold'})
+                  class: 'form-label-bold'
                 )]
 
         if error_for? attribute
@@ -219,7 +231,7 @@ module GovukElementsFormBuilder
     def form_group_classes attributes
       attributes = [attributes] if !attributes.respond_to? :count
       classes = 'form-group'
-      classes += ' error' if attributes.find { |a| error_for? a }
+      classes += ' form-group-error' if attributes.find { |a| error_for? a }
       classes
     end
 

data/lib/govuk_elements_form_builder/version.rb

@@ -1,3 +1,3 @@
 module GovukElementsFormBuilder
-  VERSION = "0.1.1"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_elements_form_builder
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Alistair Laing
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-17 00:00:00.000000000 Z
+date: 2017-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -25,6 +25,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: govuk_frontend_toolkit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.0
+- !ruby/object:Gem::Dependency
+  name: govuk_elements_rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement