metadata_presenter 2.15.1 → 2.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c872a270c9f0dcdaeda241c5f0d2a09d7b01f4f13334d191801f13b6026bca1d
-  data.tar.gz: 7da6c96aec0df8801aef5cf1e4d82ae39cfefd417fa47d26cb239a1c3ccd08b9
+  metadata.gz: ed17e32c3e0222e86ec8935840dd5830d8ed5390275ec2aa66a667765a2a654c
+  data.tar.gz: 33a20608a8f1af401191298821709f81df9da87635daecaf04ff56c03e6f79c0
 SHA512:
-  metadata.gz: 24ee1c3b678200fce8eded2be159ea94cc27efed191e542ae0874f141896b5fdea8e6f7355547df367a39319aa6673f6ab22079c3dcb245d87202d33117d8819
-  data.tar.gz: d1a4b738bff3e02a61e6e76a3d5c90c32540e084c36faa874e98d8715c1db5cfe0a016023684a5f2e18a7a377acd4b24b6bfcef7a36869b15bde759bb176d13a
+  metadata.gz: 6def253d26c9e957934d524a0d2dca9c5871cc7867114c7904d739338da7526967853583d8f2274deb7f751cd98aea9de956d2acf1af519b8853a1947784320f
+  data.tar.gz: 0e0075aa9e08a231f76ebe37bfa4767a051617606d6a7889d7a515c1dc8d2bfc2b8c65b6b44f901066b8a7fd86b9331f37ee9f02788195b67308d9652d4a0d4b

data/app/validators/metadata_presenter/email_validator.rb

@@ -0,0 +1,8 @@
+module MetadataPresenter
+  class EmailValidator < BaseValidator
+    def invalid_answer?
+      regex = URI::MailTo::EMAIL_REGEXP
+      user_answer.match(regex).nil?
+    end
+  end
+end

data/app/views/metadata_presenter/component/_email.html.erb

@@ -0,0 +1,11 @@
+<%=
+  f.govuk_email_field component.id.to_sym,
+    label: { text: input_title },
+    hint: {
+      data: { "fb-default-text" => default_text('hint') },
+      text: component.hint
+    },
+    name: "answers[#{component.name}]",
+    spellcheck: "false",
+    autocomplete: "email"
+%>

data/config/initializers/supported_components.rb

@@ -17,11 +17,11 @@ Rails.application.config.supported_components =
       content: %w(content)
     },
     multiplequestions: {
-      input: %w(text textarea number date radios checkboxes),
+      input: %w(text textarea number date radios checkboxes email),
       content: %w(content)
     },
     singlequestion: {
-      input: %w(text textarea number date radios checkboxes upload),
+      input: %w(text textarea number date radios checkboxes email upload),
       content: %w()
      }
   })

data/default_metadata/component/email.json

@@ -0,0 +1,12 @@
+{
+  "_id": "component.email",
+  "_type": "email",
+  "errors": {},
+  "label": "Question",
+  "hint": "",
+  "name": "component-name",
+  "validation": {
+    "email": true,
+    "required": true
+  }
+}

data/default_metadata/string/error.email.json

@@ -0,0 +1,6 @@
+{
+  "_id": "error.email",
+  "_type": "string.error",
+  "description": "Input (email) is not a valid email",
+  "value": "Enter an email address in the correct format, like name@example.com"
+}

data/fixtures/version.json

@@ -63,6 +63,12 @@
       }
     },
     "80420693-d6f2-4fce-a860-777ca774a6f5": {
+      "_type": "flow.page",
+      "next": {
+        "default": "adcb61c3-52b1-479b-be51-1bb610876d54"
+      }
+    },
+    "adcb61c3-52b1-479b-be51-1bb610876d54" : {
       "_type": "flow.page",
       "next": {
         "default": "2ef7d11e-0307-49e9-9fe2-345dc528dd66"
@@ -503,6 +509,31 @@
       "add_component": "content",
       "section_heading": "Chain of Command"
     },
+    {
+      "_id": "page.email",
+      "url": "email",
+      "body": "Body section",
+      "_type": "page.singlequestion",
+      "_uuid": "adcb61c3-52b1-479b-be51-1bb610876d54",
+      "heading": "Email",
+      "components": [
+        {
+          "_id": "email-address_email_1",
+          "hint": "",
+          "name": "email-address_email_1",
+          "_type": "email",
+          "_uuid": "482cb2d0-fda7-4e5c-9591-96dcb546e181",
+          "label": "Email address",
+          "errors": {},
+          "collection": "components",
+          "validation": {
+            "required": true,
+            "email": true,
+            "max_length": 256
+          }
+        }
+      ]
+    },
     {
       "_id": "page.dog-picture",
       "url": "dog-picture",

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '2.15.1'.freeze
+  VERSION = '2.15.2'.freeze
 end

data/schemas/component/email.json

@@ -0,0 +1,23 @@
+{
+  "$id": "http://gov.uk/schema/v1.0.0/email",
+  "_name": "component.email",
+  "title": "Email",
+  "description": "Let users enter an email address",
+  "type": "object",
+  "properties": {
+    "_type": {
+      "const": "email"
+    }
+  },
+  "allOf": [
+    {
+      "$ref": "http://gov.uk/schema/v1.0.0/definition/field"
+    },
+    {
+      "$ref": "http://gov.uk/schema/v1.0.0/definition/widthclass/input"
+    }
+  ],
+  "validation": {
+    "format": "email"
+  }
+}

data/schemas/component/text.json

@@ -13,9 +13,6 @@
     {
       "$ref": "definition.field"
     },
-    {
-      "$ref": "validations#/definitions/string_bundle"
-    },
     {
       "$ref": "definition.width_class.input"
     }

data/schemas/component/textarea.json

@@ -45,9 +45,6 @@
    {
       "$ref": "definition.field"
     },
-    {
-      "$ref": "validations#/definitions/string_bundle"
-    },
     {
       "$ref": "definition.width_class.input"
     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 2.15.1
+  version: 2.15.2
 platform: ruby
 authors:
 - MoJ Forms
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-07 00:00:00.000000000 Z
+date: 2022-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_design_system_formbuilder
@@ -312,6 +312,7 @@ files:
 - app/validators/metadata_presenter/accept_validator.rb
 - app/validators/metadata_presenter/base_validator.rb
 - app/validators/metadata_presenter/date_validator.rb
+- app/validators/metadata_presenter/email_validator.rb
 - app/validators/metadata_presenter/max_length_validator.rb
 - app/validators/metadata_presenter/max_size_validator.rb
 - app/validators/metadata_presenter/min_length_validator.rb
@@ -331,6 +332,7 @@ files:
 - app/views/metadata_presenter/component/_components.html.erb
 - app/views/metadata_presenter/component/_content.html.erb
 - app/views/metadata_presenter/component/_date.html.erb
+- app/views/metadata_presenter/component/_email.html.erb
 - app/views/metadata_presenter/component/_number.html.erb
 - app/views/metadata_presenter/component/_radios.html.erb
 - app/views/metadata_presenter/component/_text.html.erb
@@ -357,6 +359,7 @@ files:
 - default_metadata/component/checkboxes.json
 - default_metadata/component/content.json
 - default_metadata/component/date.json
+- default_metadata/component/email.json
 - default_metadata/component/number.json
 - default_metadata/component/radios.json
 - default_metadata/component/text.json
@@ -381,6 +384,7 @@ files:
 - default_metadata/service/base.json
 - default_metadata/string/error.accept.json
 - default_metadata/string/error.date.json
+- default_metadata/string/error.email.json
 - default_metadata/string/error.max_length.json
 - default_metadata/string/error.max_size.json
 - default_metadata/string/error.min_length.json
@@ -423,6 +427,7 @@ files:
 - schemas/component/checkboxes.json
 - schemas/component/content.json
 - schemas/component/date.json
+- schemas/component/email.json
 - schemas/component/number.json
 - schemas/component/radios.json
 - schemas/component/text.json