validate exam key format, add key validator to section

prysmex · Mar 7, 2024 · 13664c5 · 13664c5
1 parent 2fc0c14
commit 13664c5
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 13 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    json_schema_form (0.15.21)
+    json_schema_form (0.15.22)
       activesupport (~> 6)
       dry-schema (~> 1.13)
       json_schemer (= 2.1.1)

diff --git a/lib/jsf/forms/fixtures/form.json b/lib/jsf/forms/fixtures/form.json
@@ -1,5 +1,5 @@
 {
-  "$id": "http://example.com/example.json",
+  // "$id": "http://example.com/example.json",
   // "$schema": "https://json-schema.org/draft/2020-12/schema",
   "allOf": [],
   "availableLocales": [],

diff --git a/lib/jsf/forms/fixtures/response.json b/lib/jsf/forms/fixtures/response.json
@@ -1,6 +1,7 @@
 {
   "const": "no_score_1",
   "displayProperties": {
+    // "color": null,
     "i18n": {
       "en": "no_score_1_en",
       "es": "no_score_1_es"

diff --git a/lib/jsf/forms/fixtures/response/failing.json b/lib/jsf/forms/fixtures/response/failing.json
@@ -1,7 +1,7 @@
 {
   "const": "score_1",
   "displayProperties": {
-    "color": null,
+    // "color": null,
     "i18n": {
       "en": "score_1_en",
       "es": "score_1_es"

diff --git a/lib/jsf/forms/fixtures/response/scoring.json b/lib/jsf/forms/fixtures/response/scoring.json
@@ -1,7 +1,7 @@
 {
   "const": "score_1",
   "displayProperties": {
-    "color": null,
+    // "color": null,
     "i18n": {
       "en": "score_1_en",
       "es": "score_1_es"

diff --git a/lib/jsf/forms/fixtures/response/scoring_and_failing.json b/lib/jsf/forms/fixtures/response/scoring_and_failing.json
@@ -1,7 +1,7 @@
 {
   "const": "score_1",
   "displayProperties": {
-    "color": null,
+    // "color": null,
     "i18n": {
       "en": "score_1_en",
       "es": "score_1_es"

diff --git a/lib/jsf/forms/form.rb b/lib/jsf/forms/form.rb
@@ -193,7 +193,7 @@ def dry_schema(passthru)
               required(:hasScoring) { bool? }
             end
             if exam
-              required(:$id).value(:str?)
+              required(:$id).filled{ str? & format?(/^((?!#).)*$/) } # does not contain '#'
               required(:displayProperties).hash do
                 required(:component).value(eql?: 'exam')
                 required(:passingGrade).filled(:integer, gt?: 0, lteq?: 100)

diff --git a/lib/jsf/forms/section.rb b/lib/jsf/forms/section.rb
@@ -42,6 +42,7 @@ def dry_schema(passthru)
         hide_on_create = run_validation?(passthru, :hideOnCreate, optional: true)
 
         Dry::Schema.JSON do
+          config.validate_keys = true
 
           before(:key_validator) do |result| # result.to_h (shallow dup)
             result.to_h.tap do |h|
@@ -70,12 +71,7 @@ def dry_schema(passthru)
           end
           optional(:maxItems).filled(:integer)
           optional(:minItems).filled(:integer)
-          required(:items).hash do
-            # optional(:properties)
-            # optional(:allOf)
-            # optional(:required)
-            # required(:type).value(eql?: 'object')
-          end
+          required(:items).hash
           required(:type)
         end
       end

diff --git a/lib/jsf/version.rb b/lib/jsf/version.rb
@@ -1,3 +1,3 @@
 module JSF
-  VERSION = "0.15.21"
+  VERSION = "0.15.22"
 end