metadata_presenter 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e53919bd4f689dd61ae84044e6cba77034053ddae502a61b7672310a917ea085
-  data.tar.gz: e6620c311a81a98f0a6fc6a40c5d1119449c54d56d79ff5b49f73a5855c8a4de
+  metadata.gz: 50e72c6d7db805dc3c408e5be910e7e8622984d6dafe879bdd488857f9ae4d44
+  data.tar.gz: 61a5d6f5430a9cf8ae6b5a0d9c6ae03f2869c59e96e70919541e031944d7b99f
 SHA512:
-  metadata.gz: 7a49928da6f79c16e42e25af5a95330f1a9069ca1b37846b3a412e1bf33f2fe44da3971869bc583b4965e655836a8af684d2c88794547c0da66b6aa8ba0837b2
-  data.tar.gz: a28440a4e40e61a9caf08f2e3b7ac7f744b628d295a83d2ef9ca51465fc502f7b590839a06fd5af8ef823dc4a07f8ff191561767fa90d49c51a9720c8ff6a45a
+  metadata.gz: 83993ca5083a0c54693f7c46d14561c897c881fe9461c5ccef1881726d9e46f9f5ca69abb8faf8d619fa5ca9fcef46dee8b096b1dda30468a86a8c9a876e1350
+  data.tar.gz: ac17522430316217e5bf6c430b326dae237d60f759d6e25125fa701a265e97082238492b47cb0948fe703da6ed35fc5e5da1f54a11bbc2abd17d535001172258

data/app/controllers/metadata_presenter/answers_controller.rb

@@ -25,10 +25,11 @@ module MetadataPresenter
     end
 
     def redirect_to_next_page
-      next_page = NextPage.new(service).find(
+      next_page = NextPage.new(
+        service: service,
         session: session,
         current_page_url: page_url
-      )
+      ).find
 
       if next_page.present?
         redirect_to_page next_page.url

data/app/models/metadata_presenter/component.rb

@@ -8,7 +8,7 @@ class MetadataPresenter::Component < MetadataPresenter::Metadata
   end
 
   def items
-    metadata.items.map do |item|
+    Array(metadata.items).map do |item|
       MetadataPresenter::Item.new(item, editor: editor?)
     end
   end
@@ -20,4 +20,8 @@ class MetadataPresenter::Component < MetadataPresenter::Metadata
   def upload?
     type == 'upload'
   end
+
+  def find_item_by_uuid(uuid)
+    items.find { |item| item.uuid == uuid }
+  end
 end

data/app/models/metadata_presenter/condition.rb

@@ -0,0 +1,13 @@
+module MetadataPresenter
+  class Condition < MetadataPresenter::Metadata
+    def ==(other)
+      metadata.to_h.deep_symbolize_keys == other.metadata.to_h.deep_symbolize_keys
+    end
+
+    def criterias
+      Array(metadata.criterias).map do |criteria|
+        MetadataPresenter::Criteria.new(criteria)
+      end
+    end
+  end
+end

data/app/models/metadata_presenter/criteria.rb

@@ -0,0 +1,25 @@
+module MetadataPresenter
+  class Criteria < MetadataPresenter::Metadata
+    attr_accessor :service
+
+    def ==(other)
+      metadata == other.metadata
+    end
+
+    def criteria_page
+      service.find_page_by_uuid(page)
+    end
+
+    def criteria_component
+      criteria_page.find_component_by_uuid(component)
+    end
+
+    def criteria_field
+      criteria_component.find_item_by_uuid(field)
+    end
+
+    def field_label
+      criteria_field['label'] if criteria_field
+    end
+  end
+end

data/app/models/metadata_presenter/evaluate_conditions.rb

@@ -0,0 +1,29 @@
+module MetadataPresenter
+  class EvaluateConditions
+    include ActiveModel::Model
+    attr_accessor :service, :flow, :user_data
+
+    def page
+      results = conditions.map do |condition|
+        condition.criterias.map do |criteria|
+          criteria.service = service
+
+          next unless Operator.new(
+            criteria.operator
+          ).evaluate(criteria.field_label, user_data[criteria.criteria_component.id])
+
+          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
+    end
+
+    delegate :conditions, to: :flow
+  end
+end

data/app/models/metadata_presenter/flow.rb

@@ -0,0 +1,17 @@
+module MetadataPresenter
+  class Flow < MetadataPresenter::Metadata
+    def branch?
+      type == 'branch'
+    end
+
+    def default_next
+      metadata['next']['default']
+    end
+
+    def conditions
+      Array(metadata['next']['conditions']).map do |condition_metadata|
+        Condition.new(condition_metadata)
+      end
+    end
+  end
+end

data/app/models/metadata_presenter/next_page.rb

@@ -1,18 +1,63 @@
 module MetadataPresenter
   class NextPage
-    attr_reader :service
+    include ActiveModel::Model
+    attr_accessor :service, :session, :current_page_url
 
-    def initialize(service)
-      @service = service
-    end
+    def find
+      return check_answers_page if return_to_check_you_answer?
 
-    def find(session:, current_page_url:)
-      if session[:return_to_check_you_answer].present?
-        session[:return_to_check_you_answer] = nil
-        service.pages.find { |page| page.type == 'page.checkanswers' }
+      if conditions?
+        evaluate_conditions
+      elsif current_page_flow.present?
+        service.find_page_by_uuid(current_page_flow.default_next)
       else
         service.next_page(from: current_page_url)
       end
     end
+
+    private
+
+    def check_answers_page
+      session[:return_to_check_you_answer] = nil
+      service.pages.find { |page| page.type == 'page.checkanswers' }
+    end
+
+    def return_to_check_you_answer?
+      session[:return_to_check_you_answer].present?
+    end
+
+    def conditions?
+      current_page_flow.present? &&
+        next_flow.present? &&
+        next_flow_branch_object?
+    end
+
+    def evaluate_conditions
+      EvaluateConditions.new(
+        service: service,
+        flow: next_flow,
+        user_data: session[:user_data]
+      ).page
+    end
+
+    def current_page
+      service.find_page_by_url(current_page_url)
+    end
+
+    def current_page_uuid
+      current_page.uuid
+    end
+
+    def current_page_flow
+      service.flow(current_page_uuid)
+    end
+
+    def next_flow
+      service.flow(current_page_flow.default_next)
+    end
+
+    def next_flow_branch_object?
+      next_flow.branch?
+    end
   end
 end

data/app/models/metadata_presenter/page.rb

@@ -18,6 +18,10 @@ module MetadataPresenter
       to_h.reject { |k, _| k.in?(NOT_EDITABLE) }
     end
 
+    def find_component_by_uuid(uuid)
+      all_components.find { |component| component.uuid == uuid }
+    end
+
     def all_components
       [components, extra_components].flatten.compact
     end

data/app/models/metadata_presenter/service.rb

@@ -5,6 +5,12 @@ class MetadataPresenter::Service < MetadataPresenter::Metadata
     end
   end
 
+  def flow(page_uuid)
+    MetadataPresenter::Flow.new(metadata.flow[page_uuid])
+  rescue StandardError
+    nil
+  end
+
   def standalone_pages
     @standalone_pages ||= metadata.standalone_pages.map do |page|
       MetadataPresenter::Page.new(page, editor: editor?)

data/app/operators/metadata_presenter/base_operator.rb

@@ -0,0 +1,10 @@
+module MetadataPresenter
+  class BaseOperator
+    attr_reader :actual, :expected
+
+    def initialize(actual, expected)
+      @actual = actual
+      @expected = expected
+    end
+  end
+end

data/app/operators/metadata_presenter/is_answered_operator.rb

@@ -0,0 +1,7 @@
+module MetadataPresenter
+  class IsAnsweredOperator < BaseOperator
+    def evaluate?
+      expected.present?
+    end
+  end
+end

data/app/operators/metadata_presenter/is_not_answered_operator.rb

@@ -0,0 +1,7 @@
+module MetadataPresenter
+  class IsNotAnsweredOperator < BaseOperator
+    def evaluate?
+      expected.blank?
+    end
+  end
+end

data/app/operators/metadata_presenter/is_not_operator.rb

@@ -0,0 +1,7 @@
+module MetadataPresenter
+  class IsNotOperator < BaseOperator
+    def evaluate?
+      @actual != @expected
+    end
+  end
+end

data/app/operators/metadata_presenter/is_operator.rb

@@ -0,0 +1,7 @@
+module MetadataPresenter
+  class IsOperator < BaseOperator
+    def evaluate?
+      @actual == @expected
+    end
+  end
+end

data/app/operators/metadata_presenter/operator.rb

@@ -0,0 +1,26 @@
+module MetadataPresenter
+  class NoOperator < StandardError
+  end
+
+  class Operator
+    attr_reader :operator
+
+    def initialize(operator)
+      @operator = operator
+    end
+
+    def evaluate(actual, expected)
+      klass
+        .constantize
+        .new(actual, expected)
+        .evaluate?
+    rescue NameError
+      raise NoOperator,
+            "Operator '#{operator}' is not implemented. You need to create the class #{klass}"
+    end
+
+    def klass
+      "MetadataPresenter::#{@operator.capitalize.classify}Operator"
+    end
+  end
+end

data/config/initializers/inflections.rb

@@ -0,0 +1,3 @@
+ActiveSupport::Inflector.inflections(:en) do |inflect|
+  inflect.irregular 'is', 'is'
+end

data/fixtures/branching.json

@@ -0,0 +1,718 @@
+{
+  "_id": "service.base",
+  "_type": "service.base",
+  "flow": {
+    "cf6dc32f-502c-4215-8c27-1151a45735bb": {
+      "_type": "page",
+      "next": {
+        "default": "9e1ba77f-f1e5-42f4-b090-437aa9af7f73"
+      }
+    },
+    "9e1ba77f-f1e5-42f4-b090-437aa9af7f73": {
+      "_type": "page",
+      "next": {
+        "default": "68fbb180-9a2a-48f6-9da6-545e28b8d35a"
+      }
+    },
+    "68fbb180-9a2a-48f6-9da6-545e28b8d35a": {
+      "_type": "page",
+      "next": {
+        "default": "09e91fd9-7a46-4840-adbc-244d545cfef7"
+      }
+    },
+    "09e91fd9-7a46-4840-adbc-244d545cfef7": {
+      "_type": "branch",
+      "next": {
+        "default": "0b297048-aa4d-49b6-ac74-18e069118185",
+        "conditions": [
+          {
+            "condition_type": "if",
+            "next": "e8708909-922e-4eaf-87a5-096f7a713fcb",
+            "criterias": [
+              {
+                "operator": "is",
+                "page": "68fbb180-9a2a-48f6-9da6-545e28b8d35a",
+                "component": "ac41be35-914e-4b22-8683-f5477716b7d4",
+                "field": "c5571937-9388-4411-b5fa-34ddf9bc4ca0"
+              }
+            ]
+          }
+        ]
+      }
+    },
+    "e8708909-922e-4eaf-87a5-096f7a713fcb": {
+      "_type": "page",
+      "next": {
+        "default": "0b297048-aa4d-49b6-ac74-18e069118185"
+      }
+    },
+    "0b297048-aa4d-49b6-ac74-18e069118185": {
+      "_type": "page",
+      "next": {
+        "default": "ffadeb22-063b-4e4f-9502-bd753c706b1d"
+      }
+    },
+    "ffadeb22-063b-4e4f-9502-bd753c706b1d": {
+      "_type": "branch",
+      "next": {
+        "default": "05c3306c-0a39-42d2-9e0f-93fd49248f4e",
+        "conditions": [
+          {
+            "condition_type": "if",
+            "next": "d4342dfd-0d09-4a91-a0ea-d7fd67e706cc",
+            "criterias": [
+              {
+                "operator": "is",
+                "page": "0b297048-aa4d-49b6-ac74-18e069118185",
+                "component": "43ef37a0-8a9d-4dcd-9f76-42b145a50261",
+                "field": "0de360a9-f0f3-44dd-a9b9-8bc4ff694aa3"
+              }
+            ]
+          },
+          {
+            "condition_type": "if",
+            "next": "91e9f7c6-2f75-4b7d-9eb5-0cf352f7be66",
+            "criterias": [
+              {
+                "operator": "is",
+                "page": "0b297048-aa4d-49b6-ac74-18e069118185",
+                "component": "43ef37a0-8a9d-4dcd-9f76-42b145a50261",
+                "field": "f5ee4c8f-be21-4f1e-9bd1-6519e964c126"
+              }
+            ]
+          }
+        ]
+      }
+    },
+    "d4342dfd-0d09-4a91-a0ea-d7fd67e706cc": {
+      "_type": "page",
+      "next": {
+        "default": "05c3306c-0a39-42d2-9e0f-93fd49248f4e"
+      }
+    },
+    "91e9f7c6-2f75-4b7d-9eb5-0cf352f7be66": {
+      "_type": "page",
+      "next": {
+        "default": "05c3306c-0a39-42d2-9e0f-93fd49248f4e"
+      }
+    },
+    "05c3306c-0a39-42d2-9e0f-93fd49248f4e": {
+      "_type": "page",
+      "next": {
+        "default": "1d02e508-5953-4eca-af2f-9d67511c8648"
+      }
+    },
+    "1d02e508-5953-4eca-af2f-9d67511c8648": {
+      "_type": "branch",
+      "next": {
+        "default": "ef2cafe3-37e2-4533-9b0c-09a970cd38d4",
+        "conditions": [
+          {
+            "condition_type": "if",
+            "next": "8002df6e-29ab-4cdf-b520-1d7bb931a28f",
+            "criterias": [
+              {
+                "operator": "is_answered",
+                "page": "05c3306c-0a39-42d2-9e0f-93fd49248f4e",
+                "component": "c0cc9cba-b53f-4ab5-80a2-bfa6311882ae",
+                "field": ""
+              }
+            ]
+          }
+        ]
+      }
+    },
+    "8002df6e-29ab-4cdf-b520-1d7bb931a28f": {
+      "_type": "page",
+      "next": {
+        "default": "ef2cafe3-37e2-4533-9b0c-09a970cd38d4"
+      }
+    },
+    "ef2cafe3-37e2-4533-9b0c-09a970cd38d4": {
+      "_type": "page",
+      "next": {
+        "default": "cf8b3e18-dacf-4e91-92e1-018035961003"
+      }
+    },
+    "cf8b3e18-dacf-4e91-92e1-018035961003": {
+      "_type": "branch",
+      "next": {
+        "default": "e337070b-f636-49a3-a65c-f506675265f0",
+        "conditions": [
+          {
+            "condition_type": "if",
+            "next": "b5efc09c-ece7-45ae-b0b3-8a7905e25040",
+            "criterias": [
+              {
+                "operator": "is_not",
+                "page": "ef2cafe3-37e2-4533-9b0c-09a970cd38d4",
+                "component": "4477bbd6-ce23-4c38-8f17-bd5b75386557",
+                "field": "7c795f17-288b-430a-86f8-05d5ae63a3a1"
+              }
+            ]
+          }
+        ]
+      }
+    },
+    "e337070b-f636-49a3-a65c-f506675265f0": {
+      "_type": "page",
+      "next": {
+        "default": "778e364b-9a7f-4829-8eb2-510e08f156a3"
+      }
+    },
+    "778e364b-9a7f-4829-8eb2-510e08f156a3": {
+      "_type": "page",
+      "next": {
+        "default": ""
+      }
+    }
+  },
+  "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.do-you-like-star-wars",
+        "page.star-wars-knowledge",
+        "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": 20,
+            "min_length": 2
+          }
+        }
+      ]
+    },
+    {
+      "_id": "page.do-you-like-star-wars",
+      "url": "do-you-like-star-wars",
+      "body": "Body section",
+      "lede": "",
+      "_type": "page.singlequestion",
+      "_uuid": "68fbb180-9a2a-48f6-9da6-545e28b8d35a",
+      "heading": "Question",
+      "components": [
+        {
+          "_id": "do-you-like-star-wars_radios_1",
+          "hint": "",
+          "name": "do-you-like-star-wars_radios_1",
+          "_type": "radios",
+          "_uuid": "ac41be35-914e-4b22-8683-f5477716b7d4",
+          "items": [
+            {
+              "_id": "do-you-like-star-wars_radios_1_item_1",
+              "hint": "",
+              "name": "do-you-like-star-wars_radios_1",
+              "_type": "radio",
+              "_uuid": "c5571937-9388-4411-b5fa-34ddf9bc4ca0",
+              "label": "Only on weekends",
+              "value": "value-1",
+              "errors": {},
+              "legend": "Question",
+              "collection": "components",
+              "validation": {
+                "required": true
+              }
+            },
+            {
+              "_id": "do-you-like-star-wars_radios_1_item_2",
+              "hint": "",
+              "name": "do-you-like-star-wars_radios_1",
+              "_type": "radio",
+              "_uuid": "67160ff1-6f7c-43a8-8bf6-49b3d5f450f6",
+              "label": "Hell no!",
+              "value": "value-2",
+              "errors": {},
+              "legend": "Question",
+              "collection": "components",
+              "validation": {
+                "required": true
+              }
+            }
+          ],
+          "errors": {},
+          "legend": "Do you like Star Wars?",
+          "collection": "components",
+          "validation": {
+            "required": true
+          }
+        }
+      ]
+    },
+    {
+      "_id": "page.star-wars-knowledge",
+      "url": "star-wars-knowledge",
+      "_type": "page.multiplequestions",
+      "_uuid": "e8708909-922e-4eaf-87a5-096f7a713fcb",
+      "heading": "How well do you know Star Wars?",
+      "components": [
+        {
+          "_id": "star-wars-knowledge_text_1",
+          "hint": "",
+          "name": "star-wars-knowledge_text_1",
+          "_type": "text",
+          "_uuid": "fda1e5a1-ed5f-49c9-a943-dc930a520984",
+          "label": "What was the name of the band playing in Jabba's palace?",
+          "errors": {},
+          "collection": "components",
+          "validation": {
+            "required": true
+          }
+        },
+        {
+          "_id": "star-wars-knowledge_content_1",
+          "name": "star-wars-knowledge_content_1",
+          "_type": "content",
+          "_uuid": "82444d3d-dab6-44c4-a147-e2650326c9eb",
+          "content": "Stay on target",
+          "collection": "components"
+        },
+        {
+          "_id": "star-wars-knowledge_radios_1",
+          "hint": "",
+          "name": "star-wars-knowledge_radios_1",
+          "_type": "radios",
+          "_uuid": "51efe2ca-fc47-4584-8129-e91589a46b9e",
+          "items": [
+            {
+              "_id": "star-wars-knowledge_radios_1_item_1",
+              "hint": "",
+              "name": "star-wars-knowledge_radios_1",
+              "_type": "radio",
+              "_uuid": "1b6c5734-04bf-49fa-928a-2e9bbbb09f8c",
+              "label": "Harry Potter",
+              "value": "value-1",
+              "errors": {},
+              "legend": "Question",
+              "collection": "components",
+              "validation": {
+                "required": true
+              }
+            },
+            {
+              "_id": "star-wars-knowledge_radios_1_item_2",
+              "hint": "",
+              "name": "star-wars-knowledge_radios_1",
+              "_type": "radio",
+              "_uuid": "693edfd9-883b-4a6f-95b4-202849395d3d",
+              "label": "Din Jarrin",
+              "value": "value-2",
+              "errors": {},
+              "legend": "Question",
+              "collection": "components",
+              "validation": {
+                "required": true
+              }
+            },
+            {
+              "_id": "star-wars-knowledge_radios_1_item_3",
+              "hint": "",
+              "name": "star-wars-knowledge_radios_1",
+              "_type": "radio",
+              "_uuid": "7bbd84ab-b7c9-49ec-be76-a94c460acac4",
+              "label": "Tony Stark",
+              "value": "value-3",
+              "errors": {},
+              "legend": "Question",
+              "collection": "components",
+              "validation": {
+                "required": true
+              }
+            }
+          ],
+          "errors": {},
+          "legend": "What is The Mandalorian's real name?",
+          "collection": "components",
+          "validation": {
+            "required": true
+          }
+        }
+      ],
+      "add_component": "radios",
+      "section_heading": "That's no moon"
+    },
+    {
+      "_id": "page.favourite-fruit",
+      "url": "favourite-fruit",
+      "_type": "page.singlequestion",
+      "_uuid": "0b297048-aa4d-49b6-ac74-18e069118185",
+      "components": [
+        {
+          "_id": "favourite-fruit_radios_1",
+          "hint": "",
+          "name": "favourite-fruit_radios_1",
+          "_type": "radios",
+          "_uuid": "43ef37a0-8a9d-4dcd-9f76-42b145a50261",
+          "items": [
+            {
+              "_id": "favourite-fruit_radios_1_item_1",
+              "hint": "",
+              "_type": "radio",
+              "_uuid": "0de360a9-f0f3-44dd-a9b9-8bc4ff694aa3",
+              "label": "Apples"
+            },
+            {
+              "_id": "favourite-fruit_radios_1_item_2",
+              "hint": "",
+              "_type": "radio",
+              "_uuid": "f5ee4c8f-be21-4f1e-9bd1-6519e964c126",
+              "label": "Oranges"
+            },
+            {
+              "_id": "favourite-fruit_radios_1_item_3",
+              "hint": "",
+              "_type": "radio",
+              "_uuid": "8060028a-d8af-497a-83ab-22850fada6fb",
+              "label": "Pears"
+            }
+          ],
+          "errors": {},
+          "legend": "What is your favourite fruit?",
+          "validation": {
+            "required": false
+          }
+        }
+      ]
+    },
+    {
+      "_id": "page.apple-juice",
+      "url": "apple-juice",
+      "_type": "page.singlequestion",
+      "_uuid": "d4342dfd-0d09-4a91-a0ea-d7fd67e706cc",
+      "components": [
+        {
+          "_id": "apple-juice_radios_1",
+          "hint": "",
+          "name": "apple-juice_radios_1",
+          "_type": "radios",
+          "_uuid": "05ca2a98-6259-426a-adb4-ad9eb5c33501",
+          "items": [
+            {
+              "_id": "apple-juice_radios_1_item_1",
+              "hint": "",
+              "_type": "radio",
+              "_uuid": "8c4a9988-f5ca-4478-888c-9edd48b0cb03",
+              "label": "Yes"
+            },
+            {
+              "_id": "apple-juice_radios_1_item_2",
+              "hint": "",
+              "_type": "radio",
+              "_uuid": "6c0c6ab8-cbc2-475e-9f5f-38df4b5a53e8",
+              "label": "No"
+            }
+          ],
+          "errors": {},
+          "legend": "Do you like apple juice?",
+          "validation": {
+            "required": true
+          }
+        }
+      ]
+    },
+    {
+      "_id": "page.orange-juice",
+      "url": "orange-juice",
+      "_type": "page.singlequestion",
+      "_uuid": "91e9f7c6-2f75-4b7d-9eb5-0cf352f7be66",
+      "components": [
+        {
+          "_id": "orange-juice_radios_1",
+          "hint": "",
+          "name": "orange-juice_radios_1",
+          "_type": "radios",
+          "_uuid": "ce623afd-4a3b-4e5d-a668-819821780107",
+          "items": [
+            {
+              "_id": "orange-juice_radios_1_item_1",
+              "hint": "",
+              "_type": "radio",
+              "_uuid": "5e147348-1bed-4f92-9312-dc95e174f7cf",
+              "label": "Yes"
+            },
+            {
+              "_id": "orange-juice_radios_1_item_2",
+              "hint": "",
+              "_type": "radio",
+              "_uuid": "2b23b405-60df-4e71-bee8-bf3f9216ee0c",
+              "label": "No"
+            }
+          ],
+          "errors": {},
+          "legend": "Do you like orange juice?",
+          "validation": {
+            "required": true
+          }
+        }
+      ]
+    },
+    {
+      "_id": "page.favourite-band",
+      "url": "favourite-band",
+      "_type": "page.singlequestion",
+      "_uuid": "05c3306c-0a39-42d2-9e0f-93fd49248f4e",
+      "components": [
+        {
+          "_id": "favourite-band_radios_1",
+          "hint": "",
+          "name": "favourite-band_radios_1",
+          "_type": "radios",
+          "_uuid": "c0cc9cba-b53f-4ab5-80a2-bfa6311882ae",
+          "items": [
+            {
+              "_id": "favourite-band_radios_1_item_1",
+              "hint": "",
+              "_type": "radio",
+              "_uuid": "aa1e5688-e062-4cd6-8088-018fddd6eb10",
+              "label": "Beatles"
+            },
+            {
+              "_id": "favourite-band_radios_1_item_2",
+              "hint": "",
+              "_type": "radio",
+              "_uuid": "78541e4b-abaa-48d7-a48f-5648cf2165d6",
+              "label": "Rolling Stones"
+            }
+          ],
+          "errors": {},
+          "legend": "What is your favourite band?",
+          "validation": {
+            "required": false
+          }
+        }
+      ]
+    },
+    {
+      "_id": "page.music-app",
+      "url": "music-app",
+      "_type": "page.singlequestion",
+      "_uuid": "8002df6e-29ab-4cdf-b520-1d7bb931a28f",
+      "components": [
+        {
+          "_id": "music-app_radios_1",
+          "hint": "",
+          "name": "music-app_radios_1",
+          "_type": "radios",
+          "_uuid": "79822f1a-42bd-4f02-b3f2-270e8aee487f",
+          "items": [
+            {
+              "_id": "music-app_radios_1_item_1",
+              "hint": "",
+              "_type": "radio",
+              "_uuid": "881dcc5f-845f-480a-b813-1b66e3ffe759",
+              "label": "iTunes"
+            },
+            {
+              "_id": "music-app_radios_1_item_2",
+              "hint": "",
+              "_type": "radio",
+              "_uuid": "90b8863c-a247-4d28-bd8f-b6c1cbd27d37",
+              "label": "Spotify"
+            }
+          ],
+          "errors": {},
+          "legend": "Which app do you use to listen music?",
+          "validation": {
+            "required": true
+          }
+        }
+      ]
+    },
+    {
+      "_id": "page.best-formbuilder",
+      "url": "best-formbuilder",
+      "_type": "page.singlequestion",
+      "_uuid": "ef2cafe3-37e2-4533-9b0c-09a970cd38d4",
+      "components": [
+        {
+          "_id": "best-formbuilder_radios_1",
+          "hint": "",
+          "name": "best-formbuilder_radios_1",
+          "_type": "radios",
+          "_uuid": "4477bbd6-ce23-4c38-8f17-bd5b75386557",
+          "items": [
+            {
+              "_id": "best-formbuilder_radios_1_item_1",
+              "hint": "",
+              "_type": "radio",
+              "_uuid": "7c795f17-288b-430a-86f8-05d5ae63a3a1",
+              "label": "MoJ"
+            },
+            {
+              "_id": "best-formbuilder_radios_1_item_2",
+              "hint": "",
+              "_type": "radio",
+              "_uuid": "022c4ba1-5963-46a5-8813-2eafbe2d1934",
+              "label": "Others"
+            }
+          ],
+          "errors": {},
+          "legend": "What is the best form builder?",
+          "validation": {
+            "required": false
+          }
+        }
+      ]
+    },
+    {
+      "_id": "page.which-formbuilder",
+      "url": "which-formbuilder",
+      "body": "Body section",
+      "lede": "",
+      "_type": "page.singlequestion",
+      "_uuid": "b5efc09c-ece7-45ae-b0b3-8a7905e25040",
+      "heading": "Question",
+      "components": [
+        {
+          "_id": "which-formbuilder_text_1",
+          "hint": "",
+          "name": "which-formbuilder_text_1",
+          "_type": "text",
+          "_uuid": "dd2ae259-dd91-4689-b7d5-d6efd91bf58a",
+          "label": "Which Formbuilder is the best?",
+          "errors": {},
+          "collection": "components",
+          "validation": {
+            "required": true,
+            "max_length": 20,
+            "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"
+    }
+  },
+  "standalone_pages": [
+    {
+      "_id": "page.cookies",
+      "url": "cookies",
+      "body": "This online form puts a small file (known as ‘cookies’) onto your computer to collect information about how you browse the site.\r\n\r\nCookies are used to:\r\n\r\n- remember your progress\r\n- measure how you use the website so it can be updated and improved based on your needs\r\n\r\nThis online form's cookie isn't used to identify you personally.\r\n\r\nYou'll normally see a message on the site before we store a cookie on your computer.\r\n\r\nFind out more about [how to manage cookies](https://www.aboutcookies.org/).\r\n\r\n##How cookies are used on this online form\r\n\r\nWe will store a cookie to remember your progress on this computer and to expire your session after 30 minutes of inactivity or when you close your browser.\r\n\r\n- name: _fb_runner_session\r\n- purpose: saves your current progress in this computer and tracks inactivity periods\r\n- expires: after 30 minutes of inactivity or when you close your browser",
+      "_type": "page.standalone",
+      "_uuid": "fd52e7c0-03f7-4001-ae7e-f2e4142b0ccc",
+      "heading": "Cookies",
+      "components": []
+    },
+    {
+      "_id": "page.privacy",
+      "url": "privacy",
+      "body": "This privacy notice explains what [insert your organisation name] means when we talk about personal data, why we ask for this information about you and what we do with it when you use this form.\r\n\r\nIt also explains how we store your data, how you can get a copy of the information we’ve collected about you and how you can complain if you think we’ve done something wrong.\r\n\r\n###Who manages this service\r\n\r\nThis form is managed by [your organisation].\r\n\r\nThe information you submit will be processed by [insert who will be processing the information and, if it’s a separate organisation, what their relationship is to you].\r\n\r\n[Insert name of organisation that acts as data controller for your form] is the data controller for the personal data collected by this form.\r\n\r\n###When we ask for personal data\r\n\r\nWhenever we ask for information about you, we promise to:\r\n\r\n- always let you know why we need it\r\n- ask for relevant personal information only\r\n- make sure we do not keep it longer than needed\r\n- keep your information safe and make sure nobody can access it unless authorised to do so\r\n- only share your data with other organisations for legitimate purposes\r\n- consider any request you make to correct or delete your personal data\r\n\r\nWe also promise to make it easy for you to:\r\n\r\n- tell us at any time if you want us to stop storing your personal data\r\n- make a complaint to the supervisory authority\r\n\r\n###The personal data we collect\r\n\r\nWe only collect personal data that you directly provide with your application.\r\n\r\nWe only collect the information we need to deliver this service to you. The personal data collected includes:\r\n\r\n- [summarise the types of personal information requested by your form]\r\n\r\nWe [use cookies](http://www.aboutcookies.org.uk/managing-cookies) to collect data that tells us about how the service is used, including:\r\n\r\n- your computer, phone or tablet’s IP address\r\n\r\n- the region or town where you are using your computer, phone or tablet\r\n\r\n- the operating system and web browser you use\r\n\r\nThis information is not used to identify you personally.\r\n\r\n###Why we collect your personal data\r\n\r\nWe collect data to [describe why you are collecting personal information]. The processing of your personal data is necessary for [explain why you require the personal information].\r\n\r\nThe legal basis for collecting and processing your personal data is [enter and explain your legal basis here, for example, that it is necessary to perform a task in the public interest or\nin the exercise of your functions as a government department].\r\n\r\nUse of the online form is voluntary. If you do not provide all the information we ask for, we may not be able to process your [insert the purpose of your form, such as claim, application or request].\r\n\r\nPlease note that transmitting information over the internet is generally not completely secure, and [your organisation] can’t guarantee the security of your data. Any data you transmit is at your own risk. [your organisation, and any other organisations involved in processing the data] have procedures and security features in place to keep your data secure once we receive it.\r\n\r\n###Sharing your personal data\r\n\r\nThe information you provide will be shared with… [name any organisations that you might share the data with and provide an explanation of why the information may be shared and what it will be used for]\r\n\r\nWe may also use your contact information to ask for feedback on using the service, but only when you have given your consent for us to do so. [delete this paragraph if not applicable]\r\n\r\nWe’ll never share your information with other organisations for marketing, market research or commercial purposes.\r\n\r\n###Keeping your personal data\r\n\r\nTo protect your personal information, any data you enter as you progress through the online form is held temporarily and securely until you submit your application, after which your application cannot be viewed or modified further online.\r\n\r\n[your organisation, and any other organisations involved in processing the data] will keep your data for [specify how long you will keep the information for and why].\r\n\r\nAll deleted data will be destroyed securely and confidentially.\r\n\r\n###How we use your personal data\r\n\r\nYour online submission will be sent from the online form to [your organisation or whichever other organisation will receive the information for processing] via encrypted email. The system does not retain a copy of your information.\r\n\r\n[select one of the following 3 paragraphs which most closely fits your circumstances and delete the other 2]\r\n\r\nYour personal data is not used in any automated decision making (a decision made solely by automated means without any human involvement) or profiling (automated processing of personal data to evaluate certain conditions about an individual).\r\n\r\nAutomated decision making (a decision made solely by automated means without any human involvement) is used for the purpose of [insert why ADM is used] and is carried out [include when in the process this is carried out]. The personal data used for this purpose includes [insert personal data types].\r\n\r\nProfiling (automated processing of personal data to evaluate certain conditions about an individual) is carried out for the purpose of [insert reason why profiling exists]. The personal data used for this purpose includes [insert personal data types].\r\n\r\n###How we store your personal data\r\n\r\n[your organisation or whichever other organisation will receive the information for processing] take data security very seriously and take every step to ensure that your data remains private and secure. All data collected by this service is stored in a secure database [kept entirely within the UK/kept outside of the UK but within the European Economic Area (EEA). - delete as appropriate]\r\n\r\nIt may sometimes be necessary to transfer personal information overseas, outside of the UK and the European Economic Area (EEA). When this is needed information may be transferred to [insert names of countries]. Any transfers made will be in full compliance with all aspects of the data protection law. [delete this paragraph if not applicable or contact your data protection team for guidance on required safeguards] \r\n\r\nYour application will only be accessible to [your organisation, and any other organisations involved in processing the data] staff who require access to process applications.\r\n\r\n###Your rights\r\n\r\nYou have a number of rights, depending on the reason for processing your information. These include:\r\n\r\n- the right to request a copy of your personal data and information about how your personal data is processed (this is known as a subject access request)\r\n- the right to have inaccuracies in your personal data corrected\r\n- the right to fill in any gaps in your personal data, including by means of a supplementary statement\r\n- the right to ask for the processing of your personal data to be restricted\r\n- the right to ask for your personal data to be deleted if there is no longer a justification for it\r\n- the right to object to automated decision making, including profiling, that has a legal or significant effect on you as an individual\r\n\r\nIf you want to see the personal data that we hold on you, you can make a subject access request. Send your request by post to:\r\n\r\nDisclosure Team  \r\nPost point 10.25  \r\n102 Petty France  \r\nLondon  \r\nSW1H 9AJ\r\n\r\nor email: data.access@justice.gov.uk\r\n\r\nFor all other rights, please write to us at:\r\n\r\n[insert your postal and email addresses]\r\n\r\n###Getting more information\r\n\r\nYou can get more details on:\r\n\r\n- agreements we have with other organisations for sharing information\r\n- when we can pass on personal information without telling you, for example, to help with the prevention or detection of crime or to produce anonymised statistics\r\n- instructions we give to staff on how to collect, use or delete your personal information\r\n- how we check that the information we have is accurate and up-to-date\r\n- how to make a complaint\r\n\r\nFor more information, please contact the [your organisation] data protection officer at:\r\n\r\n[insert the postal and email addresses of your data protection officer - for the MoJ, this is:\r\n\r\nThe Data Protection Officer  \r\nMinistry of Justice  \r\n10 South Colonnade\nCanary Wharf  \r\nLondon  \r\nE14 4PU\r\n\r\nEmail: DPO@justice.gov.uk]\r\n\r\n###Making a complaint\r\n\r\nWhen we ask you for information, we will keep to the law. If you think that your information has not been handled correctly, you can contact the [Information Commissioner](https://ico.org.uk/) for independent advice about data protection on the address below:\r\n\r\nInformation Commissioner's Office  \r\nWycliffe House  \r\nWater Lane  \r\nWilmslow  \r\nCheshire  \r\nSK9 5AF\r\n\r\nTelephone: 0303 123 1113",
+      "_type": "page.standalone",
+      "_uuid": "4b86fe8c-7723-4cce-9378-7b2510279e04",
+      "heading": "Privacy notice",
+      "components": []
+    },
+    {
+      "_id": "page.accessibility",
+      "url": "accessibility",
+      "body": "This accessibility statement applies to [describe your form here - for example, the general enquiries form for the CICA]. There is a separate [accessibility statement for the main GOV.UK website](https://www.gov.uk/help/accessibility-statement).\r\n\r\n###Using this online form\r\n\r\nThis form was built using MoJ Forms, a tool developed by the Ministry of Justice, and uses components from the [GOV.UK Design System](https://design-system.service.gov.uk/).\r\n\r\n[insert your organisation here] is responsible for the content of this online form. The Ministry of Justice is responsible for its technical aspects.\r\n\r\nWe want as many people as possible to be able to use this online form. For example, that means you should be able to:\r\n\r\n- change colours, contrast levels and fonts\r\n- zoom in up to 300% without the text spilling off the screen\r\n- navigate the form using just a keyboard\r\n- navigate the form using speech recognition software\r\n- listen to the form using a screen reader (including recent versions of JAWS, NVDA and VoiceOver)\r\n\r\nWe’ve also made the text as simple as possible to understand.\r\n\r\n[AbilityNet](https://mcmw.abilitynet.org.uk/) has advice on making your device easier to use if you have a disability.\r\n\r\n###Feedback and contact information\r\n\r\nIf you need information on this website in a different format:\r\n\r\n[insert your contact details for user requests here - add other channels, such as text phones or Relay UK, as required]\r\n\r\n- email: [your email address]\r\n- call: [your telephone number]\r\n- [Hours - e.g. Monday to Friday, 9am to 5pm]\r\n\r\nWe'll consider your request and get back to you in [add your SLA - e.g. a week or 5 working days].\r\n\r\n###Reporting accessibility problems with this form\r\n\r\nWe’re always looking to improve the accessibility of this form. If you find any problems not listed on this page or think we’re not meeting accessibility requirements, contact:\r\n\r\n[insert your contact details for user feedback here - add other channels, such as text phones or Relay UK, as required]\r\n\r\n- email: [your email address]\r\n- call: [your telephone number]\r\n- [Hours - e.g. Monday to Friday, 9am to 5pm]\r\n\r\n###Enforcement procedure\r\n\r\nThe Equality and Human Rights Commission (EHRC) is responsible for enforcing the Public Sector Bodies (Websites and Mobile Applications) (No. 2) Accessibility Regulations 2018 (the ‘accessibility regulations’). If you’re not happy with how we respond to your complaint, contact the [Equality Advisory and Support Service (EASS)](https://www.equalityadvisoryservice.com/).\r\n\r\n###Technical information about this online form’s accessibility\r\n\r\nWe are committed to making our online forms and services accessible, in accordance with the Public Sector Bodies (Websites and Mobile Applications) (No. 2) Accessibility Regulations 2018.\r\n\r\n####Compliance status\r\n\r\nThis online form is fully compliant with the [Web Content Accessibility Guidelines version 2.1 AA standard](https://www.w3.org/TR/WCAG21/)\r\n\r\n###Preparation of this accessibility statement\r\n\r\nThis statement was prepared on [date when it was first published]. It was last reviewed on [date when it was last reviewed].\r\n\r\nThis form was last tested on [date when you performed your basic accessibility check].\r\n\r\nIn order to test the compliance of all forms built using the MoJ Forms tool, the Ministry of Justice commissioned The Digital Accessibility Centre (DAC) to carry out a WCAG 2.1 AA level audit of a sample form. This included extensive testing by users with a wide range of disabilities. The audit was performed on 8 April 2021. The audit highlighted a number of non-compliance issues which were fixed on 11 May 2021.\r\n\r\nIn addition, this form was tested by [insert team or organisation here]. It was tested using the [WAVE Web Accessibility Evaluation Tool](https://wave.webaim.org/) following guidance from the Ministry of Justice and the Government Digital Service (GDS).\r\n\r\n###What we’re doing to improve accessibility\r\n\r\nWe will monitor the accessibility of this website on an ongoing basis and fix any accessibility issues reported to us.",
+      "_type": "page.standalone",
+      "_uuid": "c439c7fd-f411-4e11-8598-4023934bac93",
+      "heading": "Accessibility statement",
+      "components": []
+    }
+  ]
+}

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '1.3.2'.freeze
+  VERSION = '1.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - MoJ Online
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-11 00:00:00.000000000 Z
+date: 2021-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_design_system_formbuilder
@@ -263,8 +263,12 @@ files:
 - app/helpers/metadata_presenter/default_text.rb
 - app/jobs/metadata_presenter/application_job.rb
 - app/models/metadata_presenter/component.rb
+- app/models/metadata_presenter/condition.rb
+- app/models/metadata_presenter/criteria.rb
 - app/models/metadata_presenter/date_field.rb
+- app/models/metadata_presenter/evaluate_conditions.rb
 - app/models/metadata_presenter/file_uploader.rb
+- app/models/metadata_presenter/flow.rb
 - app/models/metadata_presenter/item.rb
 - app/models/metadata_presenter/meta.rb
 - app/models/metadata_presenter/meta_item.rb
@@ -275,6 +279,12 @@ files:
 - app/models/metadata_presenter/page_answers.rb
 - app/models/metadata_presenter/service.rb
 - app/models/metadata_presenter/uploaded_file.rb
+- app/operators/metadata_presenter/base_operator.rb
+- app/operators/metadata_presenter/is_answered_operator.rb
+- app/operators/metadata_presenter/is_not_answered_operator.rb
+- app/operators/metadata_presenter/is_not_operator.rb
+- app/operators/metadata_presenter/is_operator.rb
+- app/operators/metadata_presenter/operator.rb
 - app/presenters/metadata_presenter/page_answers_presenter.rb
 - app/validators/metadata_presenter/accept_validator.rb
 - app/validators/metadata_presenter/base_validator.rb
@@ -316,6 +326,7 @@ files:
 - app/views/metadata_presenter/page/start.html.erb
 - config/initializers/default_metadata.rb
 - config/initializers/default_text.rb
+- config/initializers/inflections.rb
 - config/initializers/page_components.rb
 - config/initializers/schemas.rb
 - config/routes.rb
@@ -348,6 +359,7 @@ files:
 - default_metadata/string/error.required.json
 - default_metadata/string/error.virus_scan.json
 - default_text/content.json
+- fixtures/branching.json
 - fixtures/invalid_content_page.json
 - fixtures/no_component_page.json
 - fixtures/non_finished_service.json