govuk_design_system_formbuilder 1.1.0.beta.1 → 1.1.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9c9499b630e3696a4d327de2e886f683126009aaf04a40d415c52d03fd48fdf
-  data.tar.gz: ae9a0f7b5c079b689da3e719031632a4007ad51b7e7bf4800575d8ba8b529b61
+  metadata.gz: 82e501f7e5b7cd7dd736262ffb97f54c0aeead0342d27d8a349d05f13839b58b
+  data.tar.gz: ea1da5f05bb735f6fdd4d0f12dc0baefde84b07e54dc493625407f0315c9cf3f
 SHA512:
-  metadata.gz: 32d92bf557aec39313728bb51ac4e43ac4a0ba983749a9bce6b9f2b8a107062ecdbd413bb1fb1583844781230f6c8e33f5f3c4eac84d7cbf432bdf0137e6e89d
-  data.tar.gz: ef4303cf4ea3ee8082f2597f8cf7f5d84e2b3182dd566fc9c77ad9bc3e21867be362356eb3b94519d132bbed8471c473e9ad023ce38fb4aa97208ecf195001df
+  metadata.gz: c7244ee3061ca5184f18fd12ed6b98e74eb842d465fe77becae6322728d95b7acfe4b444ce37c48df2a687129bd52b5b5d85bd1d11c3662b42408f1d1c4d7d87
+  data.tar.gz: 3546f3587c2df1aea3c66dc50e835a228e0735d653bf41982ff13651c2a06310431336484b1872635c7f37ba0e2206f992a343c5022e4eec12edcbfeff9529a5

data/lib/govuk_design_system_formbuilder/containers/fieldset.rb

@@ -36,7 +36,7 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def legend_text
-        [@legend.dig(:text), localised_text('fieldset')].compact.first
+        [@legend.dig(:text), localised_text(:legend)].compact.first
       end
 
       def fieldset_classes

data/lib/govuk_design_system_formbuilder/elements/hint.rb

@@ -23,7 +23,7 @@ module GOVUKDesignSystemFormBuilder
       def hint_text(supplied)
         [
           supplied.presence,
-          localised_text('hint')
+          localised_text(:hint)
         ].compact.first
       end
 

data/lib/govuk_design_system_formbuilder/elements/label.rb

@@ -37,7 +37,7 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def label_text(option_text, hidden)
-        text = [option_text, @value, localised_text('label'), @attribute_name.capitalize].compact.first.to_s
+        text = [option_text, @value, localised_text(:label), @attribute_name.capitalize].compact.first.to_s
 
         if hidden
           tag.span(text, class: %w(govuk-visually-hidden))

data/lib/govuk_design_system_formbuilder/traits/localisation.rb

@@ -14,7 +14,27 @@ module GOVUKDesignSystemFormBuilder
       def localisation_key(context)
         return nil unless @object_name.present? && @attribute_name.present?
 
-        ['helpers', context, @object_name, @attribute_name].join('.')
+        schema(context)
+      end
+
+      def schema(context)
+        schema_root(context)
+          .push(@object_name, @attribute_name)
+          .map { |e| e == :__context__ ? context : e }
+          .join('.')
+      end
+
+      def schema_root(context)
+        contextual_schema = case context
+                            when :legend
+                              config.localisation_schema_legend
+                            when :hint
+                              config.localisation_schema_hint
+                            when :label
+                              config.localisation_schema_label
+                            end
+
+        (contextual_schema || config.localisation_schema_fallback).dup
       end
     end
   end

data/lib/govuk_design_system_formbuilder/version.rb

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

data/lib/govuk_design_system_formbuilder.rb

@@ -52,12 +52,47 @@ require 'govuk_design_system_formbuilder/containers/supplemental'
 module GOVUKDesignSystemFormBuilder
   include ActiveSupport::Configurable
 
+  # @!group Defaults
+
+  # Default form builder configuration
+  #
+  # * +:default_legend_size+ controls the default size of legend text.
+  #   Can be either +xl+, +l+, +m+ or +s+.
+  #
+  # * +:default_legend_tag+ controls the default tag that legends are
+  #   wrapped in. Defaults to +h1+.
+  #
+  # * +:default_submit_button_text+ sets the value assigned to +govuk_submit+,
+  #   defaults to 'Continue'.
+  #
+  # * +:default_submit_button_text+ sets the text used to divide the last radio
+  #   button in radio button fieldsets. As per the GOV.UK Design System spec,
+  #   it defaults to 'or'.
+  #
+  # * +:default_error_summary_title+ sets the text used in error summary
+  #   blocks. As per the GOV.UK Design System spec, it defaults to
+  #   'There is a problem'.
+  #
+  # * +:localisation_schema_fallback+ sets the prefix elements for the array
+  #   used to build the localisation string. The final two elements are always
+  #   are the object name and attribute name. The _special_ value +__context__+,
+  #   is used as a placeholder for the context (label, fieldset or hint).
+  #
+  # * +:localisation_schema_legend+, +:localisation_schema_hint+ and
+  #   +:localisation_schema_label+ each override the schema root for their
+  #   particular context, allowing them to be independently customised.
+  # ===
   DEFAULTS = {
     default_legend_size: 'm',
     default_legend_tag: 'h1',
     default_submit_button_text: 'Continue',
     default_radio_divider_text: 'or',
-    default_error_summary_title: 'There is a problem'
+    default_error_summary_title: 'There is a problem',
+
+    localisation_schema_fallback: %i(helpers __context__),
+    localisation_schema_label: nil,
+    localisation_schema_hint: nil,
+    localisation_schema_legend: nil
   }.freeze
 
   DEFAULTS.keys.each { |k| config_accessor(k) { DEFAULTS[k] } }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_design_system_formbuilder
 version: !ruby/object:Gem::Version
-  version: 1.1.0.beta.1
+  version: 1.1.0.beta.2
 platform: ruby
 authors:
 - Peter Yates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-17 00:00:00.000000000 Z
+date: 2019-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview