metadata_presenter 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50e72c6d7db805dc3c408e5be910e7e8622984d6dafe879bdd488857f9ae4d44
-  data.tar.gz: 61a5d6f5430a9cf8ae6b5a0d9c6ae03f2869c59e96e70919541e031944d7b99f
+  metadata.gz: aaea9e08a797416b551fd731c80db49d05f02f75f4ac61ecf68c5861d55af9a3
+  data.tar.gz: e3938447849a5197cc3567c55caacdf0eea2e80e1e4eb05b42e175850d9b34cd
 SHA512:
-  metadata.gz: 83993ca5083a0c54693f7c46d14561c897c881fe9461c5ccef1881726d9e46f9f5ca69abb8faf8d619fa5ca9fcef46dee8b096b1dda30468a86a8c9a876e1350
-  data.tar.gz: ac17522430316217e5bf6c430b326dae237d60f759d6e25125fa701a265e97082238492b47cb0948fe703da6ed35fc5e5da1f54a11bbc2abd17d535001172258
+  metadata.gz: 4f9ac675b0c24ca6ea9a1a9556b13a1151d499750e8aa16d3fbfc5981ac2a93cb99acc03939a188886eaf1254930bcdc1634fd44461b4345ec029a0243bd4d73
+  data.tar.gz: bf12bf7eefe0f0376fe67801fa74507d0a8267c08106b8c0198023f09999a093090127d4f6b3e8360d2e570cc90a49a36f4263ed77b63dc2e56587ad605a95fd

data/app/models/metadata_presenter/page_answers.rb

@@ -27,6 +27,8 @@ module MetadataPresenter
         date_answer(component.id)
       elsif component && component.type == 'upload'
         upload_answer(component.id)
+      elsif component && component.type == 'checkboxes'
+        answers[method_name.to_s].to_a
       else
         answers[method_name.to_s]
       end

data/app/operators/metadata_presenter/base_operator.rb

@@ -6,5 +6,15 @@ module MetadataPresenter
       @actual = actual
       @expected = expected
     end
+
+    def evaluate?
+      raise NotImplementedError
+    end
+
+    # Method signature for collection components (a.k.a checkboxes)
+    #
+    def evaluate_collection?
+      evaluate?
+    end
   end
 end

data/app/operators/metadata_presenter/is_not_operator.rb

@@ -3,5 +3,9 @@ module MetadataPresenter
     def evaluate?
       @actual != @expected
     end
+
+    def evaluate_collection?
+      Array(@expected).exclude?(@actual)
+    end
   end
 end

data/app/operators/metadata_presenter/is_operator.rb

@@ -3,5 +3,9 @@ module MetadataPresenter
     def evaluate?
       @actual == @expected
     end
+
+    def evaluate_collection?
+      Array(@expected).include?(@actual)
+    end
   end
 end

data/app/operators/metadata_presenter/operator.rb

@@ -10,10 +10,13 @@ module MetadataPresenter
     end
 
     def evaluate(actual, expected)
-      klass
-        .constantize
-        .new(actual, expected)
-        .evaluate?
+      operator = klass.constantize.new(actual, expected)
+
+      if expected.is_a?(Array)
+        operator.evaluate_collection?
+      else
+        operator.evaluate?
+      end
     rescue NameError
       raise NoOperator,
             "Operator '#{operator}' is not implemented. You need to create the class #{klass}"

data/fixtures/branching.json

@@ -137,7 +137,7 @@
     "cf8b3e18-dacf-4e91-92e1-018035961003": {
       "_type": "branch",
       "next": {
-        "default": "e337070b-f636-49a3-a65c-f506675265f0",
+        "default": "0c022e95-0748-4dda-8ba5-12fd1d2f596b",
         "conditions": [
           {
             "condition_type": "if",
@@ -154,6 +154,62 @@
         ]
       }
     },
+    "b5efc09c-ece7-45ae-b0b3-8a7905e25040": {
+      "_type": "page",
+      "next": {
+        "default": "0c022e95-0748-4dda-8ba5-12fd1d2f596b"
+      }
+    },
+    "0c022e95-0748-4dda-8ba5-12fd1d2f596b": {
+      "_type": "page",
+      "next": {
+        "default": "618b7537-b42b-4551-ae7d-053afa4d9ca9"
+      }
+    },
+    "618b7537-b42b-4551-ae7d-053afa4d9ca9": {
+      "_type": "branch",
+      "next": {
+        "default": "e337070b-f636-49a3-a65c-f506675265f0",
+        "conditions": [
+          {
+            "condition_type": "if",
+            "next": "bc666714-c0a2-4674-afe5-faff2e20d847",
+            "criterias": [
+              {
+                "operator": "is",
+                "page": "0c022e95-0748-4dda-8ba5-12fd1d2f596b",
+                "component": "4c409737-80bb-48c7-afa7-6e9360b65004",
+                "field": "3251098f-c8e0-4ac5-a637-95fd2e1c4dc4"
+              }
+            ]
+          },
+          {
+            "condition_type": "if",
+            "next": "e2887f44-5e8d-4dc0-b1de-496ab6039430",
+            "criterias": [
+              {
+                "operator": "is_not",
+                "page": "0c022e95-0748-4dda-8ba5-12fd1d2f596b",
+                "component": "4c409737-80bb-48c7-afa7-6e9360b65004",
+                "field": "3251098f-c8e0-4ac5-a637-95fd2e1c4dc4"
+              }
+            ]
+          }
+        ]
+      }
+    },
+    "bc666714-c0a2-4674-afe5-faff2e20d847": {
+      "_type": "page",
+      "next": {
+        "default": "e337070b-f636-49a3-a65c-f506675265f0"
+      }
+    },
+    "e2887f44-5e8d-4dc0-b1de-496ab6039430": {
+      "_type": "page",
+      "next": {
+        "default": "e337070b-f636-49a3-a65c-f506675265f0"
+      }
+    },
     "e337070b-f636-49a3-a65c-f506675265f0": {
       "_type": "page",
       "next": {
@@ -608,6 +664,115 @@
         }
       ]
     },
+    {
+      "_id": "page.burgers",
+      "url": "burgers",
+      "body": "Body section",
+      "lede": "",
+      "_type": "page.singlequestion",
+      "_uuid": "0c022e95-0748-4dda-8ba5-12fd1d2f596b",
+      "heading": "Question",
+      "components": [
+        {
+          "_id": "burgers_checkboxes_1",
+          "hint": "",
+          "name": "burgers_checkboxes_1",
+          "_type": "checkboxes",
+          "_uuid": "4c409737-80bb-48c7-afa7-6e9360b65004",
+          "items": [
+            {
+              "_id": "burgers_checkboxes_1_item_1",
+              "hint": "",
+              "name": "burgers_checkboxes_1",
+              "_type": "checkbox",
+              "_uuid": "3251098f-c8e0-4ac5-a637-95fd2e1c4dc4",
+              "label": "Beef, cheese, tomato",
+              "value": "value-1",
+              "errors": {},
+              "legend": "Question",
+              "collection": "components",
+              "validation": {
+                "required": true
+              }
+            },
+            {
+              "_id": "burgers_checkboxes_1_item_2",
+              "hint": "",
+              "name": "burgers_checkboxes_1",
+              "_type": "checkbox",
+              "_uuid": "a0717bbd-0b9f-47a0-bf2b-2a9d208e1168",
+              "label": "Chicken, cheese, tomato",
+              "value": "value-2",
+              "errors": {},
+              "legend": "Question",
+              "collection": "components",
+              "validation": {
+                "required": true
+              }
+            },
+            {
+              "_id": "burgers_checkboxes_1_item_3",
+              "hint": "",
+              "name": "burgers_checkboxes_1",
+              "_type": "checkbox",
+              "_uuid": "4c409737-80bb-48c7-afa7-6e9360b65004",
+              "label": "Mozzarella, cheddar, feta",
+              "value": "value-3",
+              "errors": {},
+              "legend": "Question",
+              "collection": "components",
+              "validation": {
+                "required": true
+              }
+            }
+          ],
+          "errors": {},
+          "legend": "What would you like on your burger?",
+          "collection": "components",
+          "validation": {
+            "required": false
+          }
+        }
+      ]
+    },
+    {
+      "_id": "page.global-warming",
+      "url": "global-warming",
+      "body": "What about the trees?",
+      "lede": "",
+      "_type": "page.content",
+      "_uuid": "bc666714-c0a2-4674-afe5-faff2e20d847",
+      "heading": "Global warming",
+      "components": [
+        {
+          "_id": "global-warming_content_1",
+          "name": "global-warming_content_1",
+          "_type": "content",
+          "_uuid": "957917c3-7473-4c30-b713-5aae77a1c22f",
+          "content": "They will come for you"
+        }
+      ],
+      "section_heading": ""
+    },
+    {
+      "_id": "page.we-love-chickens",
+      "url": "we-love-chickens",
+      "body": "Cluck cluck",
+      "lede": "",
+      "_type": "page.content",
+      "_uuid": "e2887f44-5e8d-4dc0-b1de-496ab6039430",
+      "heading": "We love chickens",
+      "components": [
+        {
+          "_id": "global-warming_content_1",
+          "name": "global-warming_content_1",
+          "_type": "content",
+          "_uuid": "49ff5c79-2e63-45fe-bbf7-de0bd061b909",
+          "content": "Cruella ain't got nothing on Cluckeralla"
+        }
+      ],
+      "section_heading": ""
+    },
     {
       "_id": "page.check-answers",
       "url": "check-answers",

data/lib/metadata_presenter/version.rb

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

data/lib/tasks/metadata_presenter_tasks.rake

@@ -1,4 +1,52 @@
-# desc "Explaining what the task does"
-# task :metadata_presenter do
-#   # Task goes here
-# end
+require 'metadata_presenter/test_helpers'
+
+namespace :metadata do
+  include MetadataPresenter::TestHelpers
+
+  desc 'Represent the flow objects in human readable form'
+  task flow: :environment do
+    service = MetadataPresenter::Service.new(metadata_fixture('branching'))
+
+    start_page = service.start_page
+    flow = service.flow(start_page.uuid)
+    first_page = service.find_page_by_uuid(flow.default_next)
+
+    humanized_flow = {}
+
+    humanized_flow[start_page.url] = {
+      next: first_page.url
+    }
+
+    service.metadata['flow'].each do |id, _metadata|
+      flow = service.flow(id)
+
+      if flow.branch?
+        page = service.find_page_by_uuid(flow.default_next)
+        humanized_flow[page.url] = {
+          conditions: flow.conditions.map do |condition|
+            {
+              condition_type: condition.condition_type,
+              criterias: condition.criterias.map do |criteria|
+                criteria.service = service
+                {
+                  operator: criteria.operator,
+                  page: criteria.criteria_page.url,
+                  component: criteria.criteria_component.humanised_title,
+                  field: criteria.field_label
+                }
+              end
+            }
+          end
+        }
+      else
+        page = service.find_page_by_uuid(id)
+        next_page = service.find_page_by_uuid(flow.default_next)
+        if next_page
+          humanized_flow[page.url] = { next: next_page.url }
+        end
+      end
+    end
+
+    pp humanized_flow
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - MoJ Online
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-25 00:00:00.000000000 Z
+date: 2021-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_design_system_formbuilder