metadata_presenter 1.7.2 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ac5fd51e02d3200c324282f394e5d8d3b11e0e440592e627290dfd7b6c767ba
-  data.tar.gz: bced641e349533c820815867b08bfca21f7d8c0bbd619ed19615e424edcaa2a6
+  metadata.gz: cf6c41a569262e3d405b1611d563f30f4e0c5a13134c920349a24a1c2f3365e1
+  data.tar.gz: ac8d4ea6aa1aa1aca3c942ad098ee35b4f680668de3e53b087efc3ae10bb2c1d
 SHA512:
-  metadata.gz: d38891660bc18dfe3472b43b84efc4a4752be370ba88decb17aad07aa47d779282214602bd52b10db043ad9aec8cc582e2010828deb8916f4b4b40fe069165d7
-  data.tar.gz: 289b34c930dd5c2322d6c32bb22d761c2d2f973e8ae8be7edd5104d3af2f429055ac5edbe76a56b9e78b63e48da5958e551f3e1b66a444eaa02572a41ee3febf
+  metadata.gz: 07f84b9e3fa53d81c7acbc2b108926581d0be3d2ec8d6123afbdc63fdffdef32b1e4c8104a276c454735639c3f580764efbb482ac68347362a640d6406e7c65a
+  data.tar.gz: 29f2f870b2b832bec55069adf227d6de566deb80341d96987f8cd7ef108414db31ed21bde0b4d076f2593ace47498af2d4c4b2f815941ceb1c46f3197a235955

data/app/models/metadata_presenter/next_page.rb

@@ -49,11 +49,11 @@ module MetadataPresenter
     end
 
     def current_page_flow
-      service.flow(current_page_uuid)
+      service.flow_object(current_page_uuid)
     end
 
     def next_flow
-      service.flow(current_page_flow.default_next)
+      service.flow_object(current_page_flow.default_next)
     end
 
     def next_flow_branch_object?

data/app/models/metadata_presenter/previous_page.rb

@@ -7,7 +7,7 @@ module MetadataPresenter
       # what happens when a user enters in the middle of the flow
       return if no_current_or_referrer_pages? || service.no_back_link?(current_page)
 
-      if flow.present?
+      if service.flow.present?
         return referrer_page if return_to_referrer?
 
         TraversedPages.new(service, user_data, current_page).last
@@ -16,10 +16,6 @@ module MetadataPresenter
       end
     end
 
-    def flow
-      service.metadata['flow']
-    end
-
     private
 
     def referrer_page

data/app/models/metadata_presenter/service.rb

@@ -5,8 +5,8 @@ class MetadataPresenter::Service < MetadataPresenter::Metadata
     end
   end
 
-  def flow(page_uuid)
-    MetadataPresenter::Flow.new(metadata.flow[page_uuid])
+  def flow_object(uuid)
+    MetadataPresenter::Flow.new(metadata.flow[uuid])
   rescue StandardError
     nil
   end

data/app/models/metadata_presenter/traversed_pages.rb

@@ -14,10 +14,10 @@ module MetadataPresenter
     def all
       page_uuid = service.start_page.uuid
 
-      service.metadata['flow'].size.times do
+      service.flow.size.times do
         break if page_uuid == current_page.uuid
 
-        flow_object = service.flow(page_uuid)
+        flow_object = service.flow_object(page_uuid)
 
         if flow_object.branch?
           page = EvaluateConditions.new(

data/fixtures/no_flow_service.json

@@ -0,0 +1,189 @@
+{
+  "_id": "service.base",
+  "_type": "service.base",
+  "pages": [
+    {
+      "_id": "page.start",
+      "url": "/",
+      "body": "Use this service to:\r\n\r\n* do something\r\n* update your name, address or other details\r\n* do something else\r\n\r\nRegistering takes around 5 minutes.",
+      "lede": "",
+      "_type": "page.start",
+      "_uuid": "cf6dc32f-502c-4215-8c27-1151a45735bb",
+      "steps": [
+        "page.name",
+        "page.email-address",
+        "page.parent-name",
+        "page.check-answers",
+        "page.confirmation"
+      ],
+      "heading": "Service name goes here",
+      "before_you_start": "###Before you start\r\nYou can also register by post.\r\n\r\nThe online service is also available in Welsh (Cymraeg).\r\n\r\nYou cannot register for this service if you’re in the UK illegally."
+    },
+    {
+      "_id": "page.name",
+      "url": "name",
+      "body": "Body section",
+      "lede": "",
+      "_type": "page.singlequestion",
+      "_uuid": "9e1ba77f-f1e5-42f4-b090-437aa9af7f73",
+      "heading": "Question",
+      "components": [
+        {
+          "_id": "name_text_1",
+          "hint": "",
+          "name": "name_text_1",
+          "_type": "text",
+          "_uuid": "27d377a2-6828-44ca-87d1-b83ddac98284",
+          "label": "Full name",
+          "errors": {},
+          "collection": "components",
+          "validation": {
+            "required": true,
+            "max_length": 10,
+            "min_length": 2
+          }
+        }
+      ]
+    },
+    {
+      "_id": "page.email-address",
+      "url": "email-address",
+      "body": "Body section",
+      "lede": "",
+      "_type": "page.singlequestion",
+      "_uuid": "df1ba645-f748-46d0-ad75-f34112653e37",
+      "heading": "Question",
+      "components": [
+        {
+          "_id": "email-address_text_1",
+          "hint": "",
+          "name": "email-address_text_1",
+          "_type": "text",
+          "_uuid": "f27e5788-e784-4bfd-8b21-2fab8ce95abb",
+          "label": "Email address",
+          "errors": {
+            "format": {},
+            "required": {
+              "any": "Enter an email address"
+            },
+            "max_length": {
+              "any": "%{control} is too long."
+            },
+            "min_length": {
+              "any": "%{control} is too short."
+            }
+          },
+          "collection": "components",
+          "validation": {
+            "required": true,
+            "max_length": 30,
+            "min_length": 2
+          }
+        }
+      ]
+    },
+    {
+      "_id": "page.parent-name",
+      "url": "parent-name",
+      "body": "Body section",
+      "lede": "",
+      "_type": "page.singlequestion",
+      "_uuid": "4b8c6bf3-878a-4446-9198-48351b3e2185",
+      "heading": "Question",
+      "components": [
+        {
+          "_id": "parent-name_text_1",
+          "hint": "",
+          "name": "parent-name_text_1",
+          "_type": "text",
+          "_uuid": "5ad372fa-ed35-477f-b471-4d444f991210",
+          "label": "Parent name",
+          "errors": {},
+          "collection": "components",
+          "validation": {
+            "required": false,
+            "max_length": 10,
+            "min_length": 2
+          }
+        }
+      ]
+    },
+    {
+      "_id": "page.check-answers",
+      "url": "check-answers",
+      "_type": "page.checkanswers",
+      "_uuid": "e337070b-f636-49a3-a65c-f506675265f0",
+      "heading": "Check your answers",
+      "send_body": "By submitting this application you confirm that, to the best of your knowledge, the details you are providing are correct.",
+      "components": [
+        {
+          "_id": "check-answers_content_2",
+          "name": "check-answers_content_2",
+          "_type": "content",
+          "_uuid": "b065ff4f-90c5-4ba2-b4ac-c984a9dd2470",
+          "content": "Take the cannoli.",
+          "collection": "components"
+        }
+      ],
+      "send_heading": "Now send your application",
+      "add_component": "content",
+      "extra_components": [
+        {
+          "_id": "check-answers_content_1",
+          "name": "check-answers_content_1",
+          "_type": "content",
+          "_uuid": "3e6ef27e-91a6-402f-8291-b7ce669e824e",
+          "content": "Check yourself before you wreck yourself.",
+          "collection": "extra_components"
+        }
+      ],
+      "add_extra_component": "content"
+    },
+    {
+      "_id": "page.confirmation",
+      "url": "confirmation",
+      "body": "Some day I will be the most powerful Jedi ever!",
+      "lede": "",
+      "_type": "page.confirmation",
+      "_uuid": "778e364b-9a7f-4829-8eb2-510e08f156a3",
+      "heading": "Complaint sent",
+      "components": []
+    }
+  ],
+  "locale": "en",
+  "created_at": "2021-04-21T13:10:19Z",
+  "created_by": "099d5bf5-5f7b-444c-86ee-9e189cc1a369",
+  "service_id": "488edccd-8411-4ffb-a38b-6a96c6ac28d6",
+  "version_id": "27dc30c9-f7b8-4dec-973a-bd153f6797df",
+  "service_name": "Version Fixture",
+  "configuration": {
+    "meta": {
+      "_id": "config.meta",
+      "_type": "config.meta",
+      "items": [
+        {
+          "_id": "config.meta--link",
+          "href": "cookies",
+          "text": "Cookies",
+          "_type": "link"
+        },
+        {
+          "_id": "config.meta--link--2",
+          "href": "privacy",
+          "text": "Privacy",
+          "_type": "link"
+        },
+        {
+          "_id": "config.meta--link--3",
+          "href": "accessibility",
+          "text": "Accessibility",
+          "_type": "link"
+        }
+      ]
+    },
+    "service": {
+      "_id": "config.service",
+      "_type": "config.service"
+    }
+  }
+}

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '1.7.2'.freeze
+  VERSION = '1.7.3'.freeze
 end

data/lib/tasks/metadata_presenter_tasks.rake

@@ -45,7 +45,7 @@ module MetadataPresenter
 
     def draw_nodes
       flow.each do |id, _value|
-        flow_object = service.flow(id)
+        flow_object = service.flow_object(id)
 
         if flow_object.branch?
           full_description = flow_object.conditions.map.each_with_index do |condition, _index|
@@ -65,7 +65,7 @@ module MetadataPresenter
 
     def draw_edges
       flow.each do |id, _value|
-        flow_object = service.flow(id)
+        flow_object = service.flow_object(id)
         current_node = nodes[id]
         node_next = nodes[flow_object.default_next]
 
@@ -83,7 +83,7 @@ module MetadataPresenter
     end
 
     def flow
-      metadata['flow']
+      service.flow
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.7.3
 platform: ruby
 authors:
 - MoJ Online
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-07 00:00:00.000000000 Z
+date: 2021-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_design_system_formbuilder
@@ -378,6 +378,7 @@ files:
 - fixtures/branching.json
 - fixtures/invalid_content_page.json
 - fixtures/no_component_page.json
+- fixtures/no_flow_service.json
 - fixtures/non_finished_service.json
 - fixtures/service.json
 - fixtures/version.json