metadata_presenter 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b189562f676341b0c9b1d6ad3e06eb514e7563d43273bb5397a27871bba72d3b
-  data.tar.gz: 65fbe4941dfca36471ce0e4349f932d0209fa7abef0155416b4e855fd54fa568
+  metadata.gz: 066133455b4cf94730e5bebe20ac439262cacd2128e3004d988035e822efc818
+  data.tar.gz: c4513e4dc197c1730ba538b2fc50f1c5302ad70c5a31d3377cb0a23f581fae33
 SHA512:
-  metadata.gz: 8c872d7137b780e33cfa485e6d6d7dbd6647e7eaf48fea01d94003faede70531d22caf02867d8bdea634ff43b1f7878fee1ac060855d16b3db27bc9e8de7eea0
-  data.tar.gz: 517418f03929151d2dfbc420e1fec644903bf4b72cbda01f2a3d1f4fe2192d433dbda1799ed73ef664791c0be36c5dc2c92e346085de6087d48e3eecf917c794
+  metadata.gz: 6a83357fac7381b7191f9c46edf93f4090be55e40491e06427f108430e5ee4069cc5d797da46d32f289d7785e05a02ae2808059eb7bf470b113bdbf56caf4b91
+  data.tar.gz: 31760a4dcedb66f45ac8be4bb93882d8278d58fcccf686f734dbf3dc0a762c09608cd54bf20718220ae2b8d0c7e3b47bd546a3f2edb9bf53aa30fe9e19703ca3

data/app/validators/metadata_presenter/base_validator.rb

@@ -62,6 +62,12 @@ module MetadataPresenter
       message % error_message_hash if message.present?
     end
 
+    # @return [String] user answer for the specific component
+    #
+    def user_answer
+      answers[component.name]
+    end
+
     # The default error message will be look using the schema key.
     # Assuming the schema key is 'grogu' then the default message
     # will look for 'error.grogu.value'.

data/app/validators/metadata_presenter/max_length_validator.rb

@@ -1,7 +1,7 @@
 module MetadataPresenter
   class MaxLengthValidator < BaseValidator
     def invalid_answer?
-      answers[component.name].to_s.size > component.validation[schema_key]
+      user_answer.to_s.size > component.validation[schema_key]
     end
   end
 end

data/app/validators/metadata_presenter/min_length_validator.rb

@@ -1,7 +1,7 @@
 module MetadataPresenter
   class MinLengthValidator < BaseValidator
     def invalid_answer?
-      answers[component.name].to_s.size < component.validation[schema_key]
+      user_answer.to_s.size < component.validation[schema_key]
     end
   end
 end

data/app/validators/metadata_presenter/number_validator.rb

@@ -0,0 +1,7 @@
+module MetadataPresenter
+  class NumberValidator < BaseValidator
+    def invalid_answer?
+      Float(user_answer, exception: false).blank?
+    end
+  end
+end

data/app/validators/metadata_presenter/required_validator.rb

@@ -1,7 +1,7 @@
 module MetadataPresenter
   class RequiredValidator < BaseValidator
     def invalid_answer?
-      answers[component.name].blank?
+      user_answer.blank?
     end
   end
 end

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

@@ -0,0 +1,8 @@
+<%=
+  f.govuk_text_field component.id.to_sym,
+    label: { text: component.label },
+    hint: { text: component.hint },
+    name: "answers[#{component.name}]",
+    value: answer(component.name),
+    width: component.width_class_input.to_i
+%>

data/default_metadata/component/number.json

@@ -0,0 +1,12 @@
+{
+  "_id": "component.number",
+  "_type": "number",
+  "errors": {},
+  "hint": "Component hint",
+  "label": "Component label",
+  "name": "component-name",
+  "width_class_input": "10",
+  "validation": {
+    "number": true
+  }
+}

data/default_metadata/string/error.number.json

@@ -0,0 +1,6 @@
+{
+  "_id": "error.number",
+  "_type": "string.error",
+  "description": "Input (number) is not a number",
+  "value": "Enter a number for %{control}"
+}

data/fixtures/version.json

@@ -124,6 +124,28 @@
       "heading": "Parent name",
       "url": "/parent-name"
     },
+    {
+      "_id": "page.your_age",
+      "url": "your-age",
+      "_type":"page.singlequestion",
+      "_uuid":"59d1326c-32e6-45e9-b57a-bcc8e2fb6b2c",
+      "heading":"Your age",
+      "components": [
+        {
+          "_id": "your_age_number_1",
+          "hint": "Component hint",
+          "name": "your_age_number_1",
+          "_type": "number",
+          "label": "Your age",
+          "errors": {},
+          "validation": {
+            "required": true,
+            "number": true
+          },
+          "width_class_input": "10"
+        }
+      ]
+    },
     {
       "_uuid": "7b748584-100e-4d81-a54a-5049190136cc",
       "_id": "page.family_hobbies",

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '0.7.1'
+  VERSION = '0.8.0'
 end

data/schemas/component/number.json

@@ -0,0 +1,29 @@
+{
+  "$id": "http://gov.uk/schema/v1.0.0/number",
+  "_name": "component.number",
+  "title": "Number",
+  "description": "Let users enter a number",
+  "type": "object",
+  "properties": {
+    "_type": {
+      "const": "number"
+    },
+    "name": {
+      "inputType": "number"
+    },
+    "width_class_input": {
+      "default": "10"
+    }
+  },
+  "allOf": [
+    {
+      "$ref": "definition.field"
+    },
+    {
+      "$ref": "validations#/definitions/number_bundle"
+    },
+    {
+      "$ref": "definition.width_class.input"
+    }
+  ]
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - MoJ Online
@@ -240,11 +240,13 @@ files:
 - app/validators/metadata_presenter/base_validator.rb
 - app/validators/metadata_presenter/max_length_validator.rb
 - app/validators/metadata_presenter/min_length_validator.rb
+- app/validators/metadata_presenter/number_validator.rb
 - app/validators/metadata_presenter/required_validator.rb
 - app/validators/metadata_presenter/validate_answers.rb
 - app/validators/metadata_presenter/validate_schema.rb
 - app/views/errors/404.html
 - app/views/layouts/metadata_presenter/application.html.erb
+- app/views/metadata_presenter/component/_number.html.erb
 - app/views/metadata_presenter/component/_text.html.erb
 - app/views/metadata_presenter/component/_textarea.html.erb
 - app/views/metadata_presenter/header/show.html.erb
@@ -256,6 +258,7 @@ files:
 - config/initializers/default_metadata.rb
 - config/initializers/schemas.rb
 - config/routes.rb
+- default_metadata/component/number.json
 - default_metadata/component/text.json
 - default_metadata/component/textarea.json
 - default_metadata/config/meta.json
@@ -267,6 +270,7 @@ files:
 - default_metadata/service/base.json
 - default_metadata/string/error.max_length.json
 - default_metadata/string/error.min_length.json
+- default_metadata/string/error.number.json
 - default_metadata/string/error.required.json
 - fixtures/non_finished_service.json
 - fixtures/service.json
@@ -276,6 +280,7 @@ files:
 - lib/metadata_presenter/test_helpers.rb
 - lib/metadata_presenter/version.rb
 - lib/tasks/metadata_presenter_tasks.rake
+- schemas/component/number.json
 - schemas/component/text.json
 - schemas/component/textarea.json
 - schemas/condition/condition.json