metadata_presenter 2.16.2 → 2.16.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee73fa8e7ee6915b954a8a58f136bed3332a9fbcfbb2ecd006cf97f9127d6ea4
-  data.tar.gz: 8d85729879781b65bef1f480c1ac2592e43425392f04c9dee32aef83f3bd2a0f
+  metadata.gz: 9b65c4788c5db434ecab81b6fe447e1197c6d5feed250ab185f859bf0bf1020c
+  data.tar.gz: c012c27627b1ffb8a1efdd40018646adb9e361bd4c578efce70117abc93e8d49
 SHA512:
-  metadata.gz: 99ef1bda6a48e398dbb44c17fdb7d8a388f710a72f7e50d3b20ff6bceb4d90e7ffe0f266f49fe8df16e87400e5ff5a5e4c7230d12e43bbab252ad62cd7be82e0
-  data.tar.gz: 4ab75d6e8c8f974fd0fdc164f2f4e4ecafee18401464170f5186851bb959ecae7611dd5fc69e1aca53ab5ece72dbfe9ab272c9b878dbe6d7d2871c08c045d6f1
+  metadata.gz: ee3186b76cb361a99b83d40af98c2b0d8820d63c650dd976eac5c434f96f565fb9cfcc10a6ce3ead48f27b0c983ca197bd508dc7240826ba2c92cd29ad2ae29d
+  data.tar.gz: 287750099341c719fb2fbfd538d11f25ab32b47c91001d79eb815d6122e1b60267fe6b4104c5b9123dedab3cee59da6b12005939b5a4966bfbe4a52bc4890e50

data/app/validators/metadata_presenter/maximum_validator.rb

@@ -0,0 +1,7 @@
+module MetadataPresenter
+  class MaximumValidator < BaseValidator
+    def invalid_answer?
+      Float(user_answer, exception: false) > Float(component.validation[schema_key], exception: false)
+    end
+  end
+end

data/app/validators/metadata_presenter/minimum_validator.rb

@@ -0,0 +1,7 @@
+module MetadataPresenter
+  class MinimumValidator < BaseValidator
+    def invalid_answer?
+      Float(user_answer, exception: false) < Float(component.validation[schema_key], exception: false)
+    end
+  end
+end

data/config/initializers/default_metadata.rb

@@ -7,7 +7,7 @@ default_metadata = Dir.glob("#{Rails.application.config.default_metadata_directo
 default_metadata.each do |metadata_file|
   metadata = JSON.parse(File.read(metadata_file))
 
-  key = metadata['_id'] || metadata['_type']
+  key = metadata['_id'] || metadata['_type'] || "#{metadata_file.split('/')[-2]}.#{File.basename(metadata_file, '.*')}"
   Rails.logger.info(key)
 
   Rails.application.config.default_metadata[key] = metadata

data/config/initializers/schemas.rb

@@ -8,6 +8,15 @@ schemas.each do |schema_file|
   Rails.logger.info(schema['_name'])
   jschema = JSON::Schema.new(schema, Addressable::URI.parse(schema['_name']))
   JSON::Validator.add_schema(jschema)
+
+  if schema.key?('definitions')
+    schema['definitions'].each do |key, definition|
+      definition_key = "#{schema['_name']}.#{key}"
+      Rails.logger.info(definition_key)
+      jschema = JSON::Schema.new(definition, Addressable::URI.parse(definition_key))
+      JSON::Validator.add_schema(jschema)
+    end
+  end
 end
 
 Rails.logger.info("Total loaded schemas => #{JSON::Validator.schemas.count}")

data/default_metadata/string/error.maximum.json

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

data/default_metadata/string/error.minimum.json

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

data/default_metadata/validations/minimum.json

@@ -0,0 +1 @@
+{ "minimum": "0" }

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '2.16.2'.freeze
+  VERSION = '2.16.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 2.16.2
+  version: 2.16.3
 platform: ruby
 authors:
 - MoJ Forms
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-22 00:00:00.000000000 Z
+date: 2022-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_design_system_formbuilder
@@ -28,14 +28,14 @@ dependencies:
   name: json-schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
         version: 2.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
         version: 2.8.1
 - !ruby/object:Gem::Dependency
@@ -317,7 +317,9 @@ files:
 - 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/maximum_validator.rb
 - app/validators/metadata_presenter/min_length_validator.rb
+- app/validators/metadata_presenter/minimum_validator.rb
 - app/validators/metadata_presenter/number_validator.rb
 - app/validators/metadata_presenter/required_validator.rb
 - app/validators/metadata_presenter/upload_validator.rb
@@ -389,10 +391,13 @@ files:
 - default_metadata/string/error.email.json
 - default_metadata/string/error.max_length.json
 - default_metadata/string/error.max_size.json
+- default_metadata/string/error.maximum.json
 - default_metadata/string/error.min_length.json
+- default_metadata/string/error.minimum.json
 - default_metadata/string/error.number.json
 - default_metadata/string/error.required.json
 - default_metadata/string/error.virus_scan.json
+- default_metadata/validations/minimum.json
 - default_text/content.json
 - fixtures/branching.json
 - fixtures/branching_10.json