govuk_elements_form_builder 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 475401203a5c26078dbc79f8f6d6c494b01728a5
-  data.tar.gz: e61aa54296d87f99ac76edd48fb39cf9279e5ceb
+  metadata.gz: 843a031b73d07acdc383b877b9f8e89633643973
+  data.tar.gz: 536f03612b0bf4a5ca317dd2077aa9ba9faca839
 SHA512:
-  metadata.gz: 76a3eaeb0c325a24b1071df6e1d7db2a6c9653b14910b0ef373c4b00a6c1b17ddfa7b87de92877b62ac501761cc217efa68060e13bbc6a095a6313bd04bc01d5
-  data.tar.gz: 27f5f53f9da16ab85175ab5410ebc7d1be5e54d8b9d9919b93ec4153bcc16d55cacdb5c5c057148d63ab296613e1e0942a6470f8399d748ce48f2816e2735810
+  metadata.gz: abb4867e3a120e9e73a9e372fc257fe288d96e13a4818d6612be9a8753bbe676e92b74b52630abb0408374eb3d45a8e1e00d49a88905d6deb49500306fc53563
+  data.tar.gz: 522235932ca947ca2ef1d37220f09f1047010e4e2c9eaebb77cdc2cd4b3f00f57c432b0db06026510aaf72ed81067ca2e46c803421a545ebccf8b9d1bfd5598f

data/app/helpers/govuk_elements_errors_helper.rb

@@ -178,8 +178,9 @@ module GovukElementsErrorsHelper
     end
   end
 
+  # `underscore` changes '::' to '/' to convert namespaces to paths
   def self.underscore_name object
-    object.class.name.underscore
+    object.class.name.underscore.tr('/'.freeze, '_'.freeze)
   end
 
   private_class_method :error_summary_div

data/lib/govuk_elements_form_builder/form_builder.rb

@@ -28,11 +28,15 @@ module GovukElementsFormBuilder
       define_method(method_name) do |attribute, *args|
         content_tag :div, class: form_group_classes(attribute), id: form_group_id(attribute) do
           options = args.extract_options!
+
+          set_label_classes! options
           set_field_classes! options
 
-          label = label(attribute, class: "form-label")
+          label = label(attribute, options[:label_options])
+
           add_hint :label, label, attribute
-          (label + super(attribute, options.except(:label)) ).html_safe
+
+          (label + super(attribute, options.except(:label, :label_options))).html_safe
         end
       end
     end
@@ -92,6 +96,26 @@ module GovukElementsFormBuilder
                         end
     end
 
+    def set_label_classes! options
+      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|

data/lib/govuk_elements_form_builder/version.rb

@@ -1,3 +1,3 @@
 module GovukElementsFormBuilder
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_elements_form_builder
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Alistair Laing
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-29 00:00:00.000000000 Z
+date: 2017-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails