metadata_presenter 1.6.0 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37dfa1fbf4a8bd66310d1fa2e21f6c7a537806298a4cbc9b036f4a3af841262b
-  data.tar.gz: cd9ccaf657f85e4c5ac9b5513b74d3d956be16435958e55deb9bae9d7079a2cf
+  metadata.gz: cf6c41a569262e3d405b1611d563f30f4e0c5a13134c920349a24a1c2f3365e1
+  data.tar.gz: ac8d4ea6aa1aa1aca3c942ad098ee35b4f680668de3e53b087efc3ae10bb2c1d
 SHA512:
-  metadata.gz: dbc2c13d435a9ab81a7a09d6e68a1a0ba782f0fbbffa6e9704b696bf69c54ce7518d6254b0ce918a651c96985087a90e5caac7b56968c42eb89e60bb8a2d82c6
-  data.tar.gz: 9829ce7cd18ba363aad94ec5d785cbcd5eb22edd13e41fd8bbe76f1f882db7778223971ef4e53dc31bae23a17a91033c9926bd4d256156f95d4993b2df6ced32
+  metadata.gz: 07f84b9e3fa53d81c7acbc2b108926581d0be3d2ec8d6123afbdc63fdffdef32b1e4c8104a276c454735639c3f580764efbb482ac68347362a640d6406e7c65a
+  data.tar.gz: 29f2f870b2b832bec55069adf227d6de566deb80341d96987f8cd7ef108414db31ed21bde0b4d076f2593ace47498af2d4c4b2f815941ceb1c46f3197a235955

data/app/models/metadata_presenter/evaluate_conditions.rb

@@ -4,24 +4,32 @@ module MetadataPresenter
     attr_accessor :service, :flow, :user_data
 
     def page
-      results = conditions.map do |condition|
-        condition.criterias.map do |criteria|
+      evaluated_page_uuid = page_uuid || flow.default_next
+
+      service.find_page_by_uuid(evaluated_page_uuid)
+    end
+
+    def page_uuid
+      @results ||= conditions.map do |condition|
+        evaluated_criterias = condition.criterias.map do |criteria|
           criteria.service = service
 
-          next unless Operator.new(
+          Operator.new(
             criteria.operator
-          ).evaluate(criteria.field_label, user_data[criteria.criteria_component.id])
+          ).evaluate(
+            criteria.field_label,
+            user_data[criteria.criteria_component.id]
+          )
+        end
 
+        if condition.condition_type == 'or' && evaluated_criterias.any?
+          condition.next
+        elsif evaluated_criterias.all?
           condition.next
         end
       end
 
-      page_uuid = results.flatten.uniq.compact
-      if page_uuid.present?
-        service.find_page_by_uuid(page_uuid.first)
-      else
-        service.find_page_by_uuid(flow.default_next)
-      end
+      @results.flatten.compact.first
     end
 
     delegate :conditions, to: :flow

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/page_answers.rb

@@ -2,6 +2,7 @@ module MetadataPresenter
   class PageAnswers
     include ActiveModel::Model
     include ActiveModel::Validations
+    include ActionView::Helpers
     attr_reader :page, :answers, :uploaded_files
 
     def initialize(page, answers)
@@ -30,7 +31,7 @@ module MetadataPresenter
       elsif component && component.type == 'checkboxes'
         answers[method_name.to_s].to_a
       else
-        answers[method_name.to_s]
+        sanitize(answers[method_name.to_s])
       end
     end
 
@@ -40,10 +41,10 @@ module MetadataPresenter
       return {} unless file_details
 
       if file_details.is_a?(Hash) || file_details.is_a?(ActionController::Parameters)
-        file_details
+        file_details.merge('original_filename' => sanitize(file_details['original_filename']))
       else
         {
-          'original_filename' => file_details.original_filename,
+          'original_filename' => sanitize(file_details.original_filename),
           'content_type' => file_details.content_type,
           'tempfile' => file_details.tempfile.path.to_s
         }
@@ -62,7 +63,7 @@ module MetadataPresenter
         GOVUKDesignSystemFormBuilder::Elements::Date::SEGMENTS[:month],
         GOVUKDesignSystemFormBuilder::Elements::Date::SEGMENTS[:year]
       ].map do |segment|
-        answers["#{component_id}(#{segment})"]
+        sanitize(answers["#{component_id}(#{segment})"])
       end
     end
   end

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/branching.json

@@ -169,7 +169,7 @@
     "618b7537-b42b-4551-ae7d-053afa4d9ca9": {
       "_type": "branch",
       "next": {
-        "default": "e337070b-f636-49a3-a65c-f506675265f0",
+        "default": "dc7454f9-4186-48d7-b055-684d57bbcdc7",
         "conditions": [
           {
             "condition_type": "if",
@@ -201,10 +201,146 @@
     "bc666714-c0a2-4674-afe5-faff2e20d847": {
       "_type": "page",
       "next": {
-        "default": "e337070b-f636-49a3-a65c-f506675265f0"
+        "default": "dc7454f9-4186-48d7-b055-684d57bbcdc7"
       }
     },
     "e2887f44-5e8d-4dc0-b1de-496ab6039430": {
+      "_type": "page",
+      "next": {
+        "default": "dc7454f9-4186-48d7-b055-684d57bbcdc7"
+      }
+    },
+    "dc7454f9-4186-48d7-b055-684d57bbcdc7": {
+      "_type": "page",
+      "next": {
+        "default": "84a347fc-8d4b-486a-9996-6a86fa9544c5"
+      }
+    },
+    "84a347fc-8d4b-486a-9996-6a86fa9544c5": {
+      "_type": "branch",
+      "next": {
+        "default": "48357db5-7c06-4e85-94b1-5e1c9d8f39eb",
+        "conditions": [
+          {
+            "condition_type": "or",
+            "next": "2cc66e51-2c14-4023-86bf-ded49887cdb2",
+            "criterias": [
+              {
+                "operator": "is",
+                "page": "dc7454f9-4186-48d7-b055-684d57bbcdc7",
+                "component": "5ca01e56-94de-4c33-b5fc-74697e5b95cc",
+                "field": "bd14bf31-427e-4267-9926-a18c167fe604"
+              },
+              {
+                "operator": "is",
+                "page": "dc7454f9-4186-48d7-b055-684d57bbcdc7",
+                "component": "5ca01e56-94de-4c33-b5fc-74697e5b95cc",
+                "field": "eb720ef7-bcaf-4c73-8972-6fc80dca6245"
+              }
+            ]
+          },
+          {
+            "condition_type": "and",
+            "next": "f6c51f88-7be8-4cb7-bbfc-6c905727a051",
+            "criterias": [
+              {
+                "operator": "is",
+                "page": "68fbb180-9a2a-48f6-9da6-545e28b8d35a",
+                "component": "ac41be35-914e-4b22-8683-f5477716b7d4",
+                "field": "c5571937-9388-4411-b5fa-34ddf9bc4ca0"
+              },
+              {
+                "operator": "is",
+                "page": "dc7454f9-4186-48d7-b055-684d57bbcdc7",
+                "component": "5ca01e56-94de-4c33-b5fc-74697e5b95cc",
+                "field": "0c4192eb-1441-4f10-b00a-0f03b756269e"
+              }
+            ]
+          }
+        ]
+      }
+    },
+    "2cc66e51-2c14-4023-86bf-ded49887cdb2": {
+      "_type": "page",
+      "next": {
+        "default": "48357db5-7c06-4e85-94b1-5e1c9d8f39eb"
+      }
+    },
+    "f6c51f88-7be8-4cb7-bbfc-6c905727a051": {
+      "_type": "page",
+      "next": {
+        "default": "48357db5-7c06-4e85-94b1-5e1c9d8f39eb"
+      }
+    },
+    "48357db5-7c06-4e85-94b1-5e1c9d8f39eb": {
+      "_type": "page",
+      "next": {
+        "default": "1079b5b8-abd0-4bf6-aaac-1f01e69e3b39"
+      }
+    },
+    "1079b5b8-abd0-4bf6-aaac-1f01e69e3b39": {
+      "_type": "branch",
+      "next": {
+        "default": "941137d7-a1da-43fd-994a-98a4f9ea6d46",
+        "conditions": [
+          {
+            "condition_type": "and",
+            "next": "56e80942-d0a4-405a-85cd-bd1b100013d6",
+            "criterias": [
+              {
+                "operator": "is",
+                "page": "48357db5-7c06-4e85-94b1-5e1c9d8f39eb",
+                "component": "3a430712-a75f-4412-836d-4ec7b2cb1ac9",
+                "field": "30258b55-ec04-4278-86b7-8382cbd34bea"
+              },
+              {
+                "operator": "is",
+                "page": "48357db5-7c06-4e85-94b1-5e1c9d8f39eb",
+                "component": "3a430712-a75f-4412-836d-4ec7b2cb1ac9",
+                "field": "9339d86e-b53c-42c0-ab6e-1ab3e2340873"
+              },
+              {
+                "operator": "is",
+                "page": "48357db5-7c06-4e85-94b1-5e1c9d8f39eb",
+                "component": "3a430712-a75f-4412-836d-4ec7b2cb1ac9",
+                "field": "5d650e5d-57ac-42a1-9348-c1b93248753a"
+              }
+            ]
+          },
+          {
+            "condition_type": "or",
+            "next": "6324cca4-7770-4765-89b9-1cdc41f49c8b",
+            "criterias": [
+              {
+                "operator": "is",
+                "page": "48357db5-7c06-4e85-94b1-5e1c9d8f39eb",
+                "component": "3a430712-a75f-4412-836d-4ec7b2cb1ac9",
+                "field": "6b82b4e4-6dfd-4b3c-b6ed-2d71be0980bf"
+              },
+              {
+                "operator": "is",
+                "page": "48357db5-7c06-4e85-94b1-5e1c9d8f39eb",
+                "component": "3a430712-a75f-4412-836d-4ec7b2cb1ac9",
+                "field": "8c2c6161-7309-4e4f-9f3c-9fa629bcb459"
+              }
+            ]
+          }
+        ]
+      }
+    },
+    "941137d7-a1da-43fd-994a-98a4f9ea6d46": {
+      "_type": "page",
+      "next": {
+        "default": "e337070b-f636-49a3-a65c-f506675265f0"
+      }
+    },
+    "56e80942-d0a4-405a-85cd-bd1b100013d6": {
+      "_type": "page",
+      "next": {
+        "default": "e337070b-f636-49a3-a65c-f506675265f0"
+      }
+    },
+    "6324cca4-7770-4765-89b9-1cdc41f49c8b": {
       "_type": "page",
       "next": {
         "default": "e337070b-f636-49a3-a65c-f506675265f0"
@@ -420,6 +556,7 @@
       "url": "favourite-fruit",
       "_type": "page.singlequestion",
       "_uuid": "0b297048-aa4d-49b6-ac74-18e069118185",
+      "heading": "",
       "components": [
         {
           "_id": "favourite-fruit_radios_1",
@@ -463,6 +600,7 @@
       "url": "apple-juice",
       "_type": "page.singlequestion",
       "_uuid": "d4342dfd-0d09-4a91-a0ea-d7fd67e706cc",
+      "heading": "",
       "components": [
         {
           "_id": "apple-juice_radios_1",
@@ -499,6 +637,7 @@
       "url": "orange-juice",
       "_type": "page.singlequestion",
       "_uuid": "91e9f7c6-2f75-4b7d-9eb5-0cf352f7be66",
+      "heading": "",
       "components": [
         {
           "_id": "orange-juice_radios_1",
@@ -535,6 +674,7 @@
       "url": "favourite-band",
       "_type": "page.singlequestion",
       "_uuid": "05c3306c-0a39-42d2-9e0f-93fd49248f4e",
+      "heading": "",
       "components": [
         {
           "_id": "favourite-band_radios_1",
@@ -571,6 +711,7 @@
       "url": "music-app",
       "_type": "page.singlequestion",
       "_uuid": "8002df6e-29ab-4cdf-b520-1d7bb931a28f",
+      "heading": "",
       "components": [
         {
           "_id": "music-app_radios_1",
@@ -607,6 +748,7 @@
       "url": "best-formbuilder",
       "_type": "page.singlequestion",
       "_uuid": "ef2cafe3-37e2-4533-9b0c-09a970cd38d4",
+      "heading": "",
       "components": [
         {
           "_id": "best-formbuilder_radios_1",
@@ -773,6 +915,230 @@
       ],
       "section_heading": ""
     },
+    {
+      "_id": "page.marvel-series",
+      "url": "marvel-series",
+      "_type": "page.singlequestion",
+      "_uuid": "dc7454f9-4186-48d7-b055-684d57bbcdc7",
+      "heading": "",
+      "components": [
+        {
+          "_id": "marvel-series_radios_1",
+          "hint": "",
+          "name": "marvel-series_radios_1",
+          "_type": "radios",
+          "_uuid": "5ca01e56-94de-4c33-b5fc-74697e5b95cc",
+          "items": [
+            {
+              "_id": "marvel-series_radios_1_item_1",
+              "hint": "",
+              "_type": "radio",
+              "_uuid": "0c4192eb-1441-4f10-b00a-0f03b756269e",
+              "label": "WandaVision"
+            },
+            {
+              "_id": "marvel-series_radios_1_item_2",
+              "hint": "",
+              "_type": "radio",
+              "_uuid": "bd14bf31-427e-4267-9926-a18c167fe604",
+              "label": "The Falcon and the Winter Soldier"
+            },
+            {
+              "_id": "marvel-series_radios_1_item_2",
+              "hint": "",
+              "_type": "radio",
+              "_uuid": "eb720ef7-bcaf-4c73-8972-6fc80dca6245",
+              "label": "Loki"
+            },
+            {
+              "_id": "marvel-series_radios_1_item_3",
+              "hint": "",
+              "_type": "radio",
+              "_uuid": "d762e328-18dc-4861-bca8-d104609b8299",
+              "label": "Hawkeye"
+            }
+          ],
+          "errors": {},
+          "legend": "What is the best marvel series?",
+          "validation": {
+            "required": true
+          }
+        }
+      ]
+    },
+    {
+      "_id": "page.marvel-quotes",
+      "url": "marvel-quotes",
+      "body": "Marvel quotes",
+      "lede": "",
+      "_type": "page.content",
+      "_uuid": "2cc66e51-2c14-4023-86bf-ded49887cdb2",
+      "heading": "Loki",
+      "components": [
+        {
+          "_id": "marvel-quotes_content_1",
+          "name": "marvel-quotes_content_1",
+          "_type": "content",
+          "_uuid": "5cede2fa-5001-4d6a-965c-30addc3c4496",
+          "content": "I am Loki of Asgard, and I am burdened with glorious purpose."
+        },
+        {
+          "_id": "marvel-quotes_content_2",
+          "name": "marvel-quotes_content_2",
+          "_type": "content",
+          "_uuid": "816b6afd-4649-455a-b10d-62cb5acb4584",
+          "content": "So Who Are You Fighting Now ... Gandalf?"
+        }
+      ],
+      "section_heading": ""
+    },
+    {
+      "_id": "page.other-quotes",
+      "url": "other-quotes",
+      "body": "Other quotes",
+      "lede": "",
+      "_type": "page.content",
+      "_uuid": "f6c51f88-7be8-4cb7-bbfc-6c905727a051",
+      "heading": "Other quotes",
+      "components": [
+        {
+          "_id": "other-quotes_content_1",
+          "name": "other-quotes_content_1",
+          "_type": "content",
+          "_uuid": "2535a867-deab-457b-91aa-c006e3c73d63",
+          "content": "- How we doing? - Same as always... - That bad, huh?"
+        },
+        {
+          "_id": "other-quotes_content_2",
+          "name": "other-quotes_content_2",
+          "_type": "content",
+          "_uuid": "816b6afd-4649-455a-b10d-62cb5acb4584",
+          "content": "Are you using your night vision, Vision?"
+        }
+      ],
+      "section_heading": ""
+    },
+    {
+      "_id": "page.best-arnold-quote",
+      "url": "best-arnold-quote",
+      "body": "Body section",
+      "lede": "",
+      "_type": "page.singlequestion",
+      "_uuid": "48357db5-7c06-4e85-94b1-5e1c9d8f39eb",
+      "heading": "Question",
+      "components": [
+        {
+          "_id": "best-arnold-quote_checkboxes_1",
+          "hint": "",
+          "name": "best-arnold-quote_checkboxes_1",
+          "_type": "checkboxes",
+          "_uuid": "3a430712-a75f-4412-836d-4ec7b2cb1ac9",
+          "items": [
+            {
+              "_id": "best-arnold-quote_checkboxes_1_item_1",
+              "hint": "",
+              "name": "best-arnold-quote_checkboxes_1",
+              "_type": "checkbox",
+              "_uuid": "30258b55-ec04-4278-86b7-8382cbd34bea",
+              "label": "You are not you. You are me"
+            },
+            {
+              "_id": "best-arnold-quote_checkboxes_1_item_2",
+              "hint": "",
+              "name": "best-arnold-quote_checkboxes_1",
+              "_type": "checkbox",
+              "_uuid": "9339d86e-b53c-42c0-ab6e-1ab3e2340873",
+              "label": "Get to the chopper"
+            },
+            {
+              "_id": "best-arnold-quote_checkboxes_1_item_3",
+              "hint": "",
+              "name": "best-arnold-quote_checkboxes_1",
+              "_type": "checkbox",
+              "_uuid": "5d650e5d-57ac-42a1-9348-c1b93248753a",
+              "label": "You have been terminated"
+            },
+            {
+              "_id": "best-arnold-quote_checkboxes_1_item_4",
+              "hint": "",
+              "name": "best-arnold-quote_checkboxes_1",
+              "_type": "checkbox",
+              "_uuid": "6b82b4e4-6dfd-4b3c-b6ed-2d71be0980bf",
+              "label": "I am GROOT"
+            },
+            {
+              "_id": "best-arnold-quote_checkboxes_1_item_5",
+              "hint": "",
+              "name": "best-arnold-quote_checkboxes_1",
+              "_type": "checkbox",
+              "_uuid": "8c2c6161-7309-4e4f-9f3c-9fa629bcb459",
+              "label": "Dance Off, Bro."
+            }
+          ],
+          "legend": "Select all Arnold Schwarzenegger quotes",
+          "validation": {
+            "required": true
+          }
+        }
+      ]
+    },
+    {
+      "_id": "page.arnold-right-answers",
+      "url": "arnold-right-answers",
+      "body": "You are right! Now, talk to the hand!",
+      "lede": "",
+      "_type": "page.content",
+      "_uuid": "56e80942-d0a4-405a-85cd-bd1b100013d6",
+      "heading": "You are right",
+      "components": [
+        {
+          "_id": "arnold-right-answers_content_1",
+          "name": "arnold-right-answers_content_1",
+          "_type": "content",
+          "_uuid": "9a7948f1-9e9a-4273-b52e-e2917c79f37c",
+          "content": "You are right! Now, talk to the hand!"
+        }
+      ],
+      "section_heading": ""
+    },
+    {
+      "_id": "page.arnold-wrong-answers",
+      "url": "arnold-wrong-answers",
+      "body": "You are wrong! These are from the Guardians of the Galaxy!",
+      "lede": "",
+      "_type": "page.content",
+      "_uuid": "6324cca4-7770-4765-89b9-1cdc41f49c8b",
+      "heading": "You are wrong",
+      "components": [
+        {
+          "_id": "arnold-wrong-answers_content_1",
+          "name": "arnold-wrong-answers_content_1",
+          "_type": "content",
+          "_uuid": "3bd3ca1d-fed7-43b0-ab90-b4425b634203",
+          "content": "You need to master the ability of standing so incredibly still, that you become invisible to the eye."
+        }
+      ],
+      "section_heading": ""
+    },
+    {
+      "_id": "page.arnold-incomplete-answers",
+      "url": "arnold-incomplete-answers",
+      "body": "You are wrong! The answers are incomplete.",
+      "lede": "",
+      "_type": "page.content",
+      "_uuid": "941137d7-a1da-43fd-994a-98a4f9ea6d46",
+      "heading": "You are wrong",
+      "components": [
+        {
+          "_id": "arnold-incomplete-answers_content_1",
+          "name": "arnold-incomplete-answers_content_1",
+          "_type": "content",
+          "_uuid": "16252a29-8e00-4247-b47f-3e94c863a540",
+          "content": "The answers are incomplete. You need to remember Arnold saying 'I will be back'. So go back to answer correctly."
+        }
+      ],
+      "section_heading": ""
+    },
     {
       "_id": "page.check-answers",
       "url": "check-answers",

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.6.0'.freeze
+  VERSION = '1.7.3'.freeze
 end

data/lib/tasks/metadata_presenter_tasks.rake

@@ -5,6 +5,7 @@ namespace :metadata do
 
   desc 'Represent the flow objects in human readable form'
   task flow: :environment do
+    require 'ruby-graphviz'
     metadata = ENV['SERVICE_METADATA'] || metadata_fixture('branching')
     service = MetadataPresenter::Service.new(metadata)
 
@@ -16,8 +17,6 @@ namespace :metadata do
   end
 end
 
-require 'ruby-graphviz'
-
 module MetadataPresenter
   class Graph
     attr_reader :service, :filename, :nodes
@@ -46,17 +45,17 @@ 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 do |condition|
-            condition.criterias.map do |criteria|
+          full_description = flow_object.conditions.map.each_with_index do |condition, _index|
+            condition.criterias.map { |criteria|
               criteria.service = service
 
-              "if #{criteria.criteria_component.humanised_title} #{criteria.operator} #{criteria.field_label}"
-            end
+              "#{criteria.criteria_component.humanised_title} #{criteria.operator} #{criteria.field_label}"
+            }.join(" #{condition.condition_type} ")
           end
-          nodes[id] = @graphviz.add_nodes(full_description.flatten.join(' - '))
+          nodes[id] = @graphviz.add_nodes(full_description.flatten.join(' / '))
         else
           current_page = find_page_by_uuid(id)
           nodes[id] = @graphviz.add_nodes(current_page.url)
@@ -66,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]
 
@@ -84,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.6.0
+  version: 1.7.3
 platform: ruby
 authors:
 - MoJ Online
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-01 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