govuk_publishing_components 21.41.1 → 21.41.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44c358a971112138fa21afe594e6f8ec097a2ae39db754ffb277ea28df23456a
-  data.tar.gz: 9bf94f62e7ceec5cceb760f43709a8fcd19253179cf8f4be6f5e34d34763b609
+  metadata.gz: a5c65e3a8bdade54b8a91ed68376eec0044c3d6d170f308e2b840033fc6869e8
+  data.tar.gz: adcfea00c085644145561da1186bbd6fe1b79377f4b88860de9ee4f5d509a0fe
 SHA512:
-  metadata.gz: 15cce849af88de4b406a751bc403b8251afbd4412ffae71dd35ff192cf12d2419c5ccd582040c41279c4b973739b760c610aad5611c50883df6946b590ec37f0
-  data.tar.gz: 9a24df4d9f7799416a33b7979c842a4555df2f23df9069f9f5a9477297bbfb4f525caecc1b7d62424035e806ba9f0e6d17b7766659f68c46eb2b4648cad264a2
+  metadata.gz: af40024d3f31625a02ab376c334f12b530b39b7103815f664032d16b88f06dba85ab59cb457a0b8f39e6512ec59af3a1d92fabd654dd446236a7fc8c19995ed4
+  data.tar.gz: 974e433acf0cf715994401e07ac0a2a2d861bea247b9f163caf30cb9ca1eae6eb524de4020c1457555719ffb28fbf1280ee04fef543413d8901d5f6c8ce458c5

data/lib/govuk_publishing_components/presenters/machine_readable/faq_page_schema.rb

@@ -57,22 +57,42 @@ module GovukPublishingComponents
 
         question = page.title
 
-        # rubocop:disable Style/IfInsideElse
         doc.xpath("html/body").children.each_with_object({}) do |element, q_and_as|
-          if question_element?(element)
-            question = element.text
-            q_and_as[question] = { anchor: element["id"] }
-          else
-            if question_hash_is_unset?(q_and_as, question)
-              q_and_as[question] = { answer: element.to_s }
-            elsif answer_is_unset?(q_and_as, question)
-              q_and_as[question][:answer] = element.to_s
-            else
-              q_and_as[question][:answer] << element.to_s
+          _q_and_as, question = recursive_question_and_answers(element, question, q_and_as)
+        end
+      end
+
+      def recursive_question_and_answers(element, question, q_and_as)
+        if is_a_question?(element)
+          question = element.text
+          q_and_as[question] = { anchor: element["id"] }
+        else
+          q_and_as = add_answer_to_question(q_and_as, element, question)
+          element.children.each do |child_element|
+            if child_element.element?
+              q_and_as, question = recursive_question_and_answers(child_element, question, q_and_as)
             end
           end
         end
-        # rubocop:enable Style/IfInsideElse
+
+        [q_and_as, question]
+      end
+
+      def add_answer_to_question(q_and_as, element, question)
+        if no_questions_in_subtree?(element)
+          if question_hash_is_unset?(q_and_as, question)
+            q_and_as[question] = { answer: element.to_s }
+          elsif answer_is_unset?(q_and_as, question)
+            q_and_as[question][:answer] = element.to_s
+          else
+            q_and_as[question][:answer] << element.to_s
+          end
+        end
+        q_and_as
+      end
+
+      def no_questions_in_subtree?(element)
+        element.search(QUESTION_TAG).none?
       end
 
       def question_hash_is_unset?(q_and_as, question)
@@ -86,7 +106,7 @@ module GovukPublishingComponents
       # we use H2 tags as the "question" and the html between them as the "answer"
       QUESTION_TAG = "h2".freeze
 
-      def question_element?(element)
+      def is_a_question?(element)
         element.name == QUESTION_TAG
       end
 

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "21.41.1".freeze
+  VERSION = "21.41.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 21.41.1
+  version: 21.41.2
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-10 00:00:00.000000000 Z
+date: 2020-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gds-api-adapters