metadata_presenter 2.16.2 → 2.16.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee73fa8e7ee6915b954a8a58f136bed3332a9fbcfbb2ecd006cf97f9127d6ea4
-  data.tar.gz: 8d85729879781b65bef1f480c1ac2592e43425392f04c9dee32aef83f3bd2a0f
+  metadata.gz: 70811b7dcebfe0ac13785d7ed31727608a70ebd8456f4bd142f0587149aaca63
+  data.tar.gz: 343e9eeac89db129ffef7ebc7cf26941bea96d3bea55956e6f140691e4c8da84
 SHA512:
-  metadata.gz: 99ef1bda6a48e398dbb44c17fdb7d8a388f710a72f7e50d3b20ff6bceb4d90e7ffe0f266f49fe8df16e87400e5ff5a5e4c7230d12e43bbab252ad62cd7be82e0
-  data.tar.gz: 4ab75d6e8c8f974fd0fdc164f2f4e4ecafee18401464170f5186851bb959ecae7611dd5fc69e1aca53ab5ece72dbfe9ab272c9b878dbe6d7d2871c08c045d6f1
+  metadata.gz: f99d6e22db36b85c63e0ffba62e669f7ec97154ed6ef569a949b523f329e1ef027448f9da54e98ef3a8148f9cf4987b593221729fc0f1ae4216135ca55ce02b1
+  data.tar.gz: 8bb5143caa40c516352afed3e5ec44b30986c3dbd40fb2ce038bcf8ad21380744c02f0216c4339bbddd77e3b9345cdd7e251c086a70dc3e8e9fa93f3bfe4a25a

data/app/models/metadata_presenter/component.rb

@@ -1,4 +1,6 @@
 class MetadataPresenter::Component < MetadataPresenter::Metadata
+  VALIDATION_BUNDLES = { 'number' => 'number' }.freeze
+
   def to_partial_path
     "metadata_presenter/component/#{type}"
   end
@@ -30,4 +32,22 @@ class MetadataPresenter::Component < MetadataPresenter::Metadata
   def find_item_by_uuid(uuid)
     items.find { |item| item.uuid == uuid }
   end
+
+  def supported_validations
+    return [] if validation_bundle_key.nil?
+
+    JSON::Validator.schema_for_uri(validation_bundle_key)
+                   .schema['properties']['validation']['properties']
+                   .keys
+  end
+
+  private
+
+  def validation_bundle_key
+    @validation_bundle_key ||=
+      if type.in?(VALIDATION_BUNDLES.keys)
+        definition_bundle = VALIDATION_BUNDLES[type]
+        "validations.#{definition_bundle}_bundle"
+      end
+  end
 end

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/app/views/layouts/metadata_presenter/application.html.erb

@@ -30,7 +30,6 @@
     </div>
     <%= render template: 'metadata_presenter/footer/footer' %>
 
-    <%= javascript_pack_tag 'application' %>
     <%= javascript_pack_tag 'govuk' %>
   </body>
 </html>

data/app/views/metadata_presenter/page/confirmation.html.erb

@@ -1,5 +1,5 @@
 <div class="fb-main-grid-wrapper" data-fb-pagetype="<%= @page.type %>">
-  <div class="govuk-panel govuk-panel--confirmation">
+  <div class="govuk-panel govuk-panel--confirmation govuk-grid-column-two-thirds">
     <h1 class="fb-editable govuk-panel__title"
         data-fb-content-type="element"
         data-fb-content-id="page[heading]">

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.5'.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.5
 platform: ruby
 authors:
 - MoJ Forms
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-22 00:00:00.000000000 Z
+date: 2022-05-09 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