metadata_presenter 1.7.4 → 1.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3ed3876afc6593e2b6108203f7b46401212fc213191d6db6c9a7f3322f6b342
-  data.tar.gz: c60618fb9af15d327a198cc8cbcbca389ffc7f3554a1bdcf63596b8d024ef727
+  metadata.gz: 86a854cda58e43b201b7822776e20af692ea00f7e95bed976bf546d0bb2259c4
+  data.tar.gz: cf833a226b554e172ba02d4d24b4c1a6a611b44033d5fa7c253d4739fa3c4723
 SHA512:
-  metadata.gz: 2d294dd3c15cac7c56a99c37b0c59d58a4bfba7ecec43ef17548b587e74113e9b1161a99722b5da9c2d3593623e0aa425f8a55b8778364541a859dd9784cd03a
-  data.tar.gz: 35a4408bbe40c5d13cd7bde8924a70380f6ac9d19356050211e1b6ee5683595f5b709b5a275fa7e3d74dac373578d96b8c8af3d08c39775f5d9a286844777159
+  metadata.gz: aa52155a487fe1d8f9cc20249f8e13ae421ea4c26bd0ce60f8cc80b45fc78cda45a5bbed43172bfa24559807fd7d90d33c573ede095a0d1525150ec26b09d191
+  data.tar.gz: 26cf5ce6a264158f9fe45bf96420bbc4cf25e988b8030144eb920ec1fb327731235efcf81dafd52165b17b21560c30561714b9de28236706559e65872a99609f

data/config/initializers/default_metadata.rb

@@ -6,8 +6,11 @@ Rails.logger.info('Loading default metadata')
 default_metadata = Dir.glob("#{Rails.application.config.default_metadata_directory}/*/**")
 default_metadata.each do |metadata_file|
   metadata = JSON.parse(File.read(metadata_file))
-  Rails.logger.info(metadata['_id'])
-  Rails.application.config.default_metadata[metadata['_id']] = metadata
+
+  key = metadata['_id'] || metadata['_type']
+  Rails.logger.info(key)
+
+  Rails.application.config.default_metadata[key] = metadata
 end
 
 Rails.logger.info(

data/default_metadata/flow/branch.json

@@ -1,5 +1,4 @@
 {
-  "_id": "flow.branch",
   "_type": "flow.branch",
   "next": {
     "default": "",

data/default_metadata/flow/page.json

@@ -1,5 +1,4 @@
 {
-  "_id": "flow.page",
   "_type": "flow.page",
   "next": {
     "default": ""

data/fixtures/no_flow_service.json

@@ -185,5 +185,6 @@
       "_id": "config.service",
       "_type": "config.service"
     }
-  }
+  },
+  "standalone_pages": []
 }

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '1.7.4'.freeze
+  VERSION = '1.7.5'.freeze
 end

data/schemas/flow/base.json

@@ -0,0 +1,24 @@
+{
+  "$id": "http://gov.uk/schema/v1.0.0/flow/base",
+  "_name": "flow.base",
+  "title": "Base flow object",
+  "description": "Base flow object containing page or branch objects",
+  "type": "object",
+  "patternProperties": {
+    "type": "object",
+    "^S_": {
+      "type": "string"
+    },
+    "properties": {
+      "anyOf": [
+        {
+          "$ref": "flow.page"
+        },
+        {
+          "$ref": "flow.branch"
+        }
+      ]
+    },
+    "additionalProperties": false
+  }
+}

data/schemas/service/base.json

@@ -33,17 +33,7 @@
       "$ref": "configuration"
     },
     "flow": {
-      "type": "object",
-      "items": {
-        "anyOf": [
-          {
-            "$ref": "flow.page"
-          },
-          {
-            "$ref": "flow.branch"
-          }
-        ]
-      }
+      "$ref": "flow.base"
     },
     "pages": {
       "type": "array",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 1.7.4
+  version: 1.7.5
 platform: ruby
 authors:
 - MoJ Online
@@ -438,6 +438,7 @@ files:
 - schemas/definition/width_class.input.json
 - schemas/definition/width_class.json
 - schemas/errors/errors.json
+- schemas/flow/base.json
 - schemas/flow/branch.json
 - schemas/flow/page.json
 - schemas/link/link.json