govuk_publishing_components 21.54.0 → 21.55.4

data/lib/govuk_publishing_components/presenters/breadcrumb_selector.rb

@@ -46,7 +46,7 @@ module GovukPublishingComponents
       end
 
       def output
-        return content_item_options unless content_item_navigation.html_document_with_parent?
+        return content_item_options unless content_item_navigation.html_publication_with_parent?
         return parent_item_options if parent_item_navigation.priority_breadcrumbs
 
         step_by_step_header = parent_item_options[:step_by_step]
@@ -58,20 +58,20 @@ module GovukPublishingComponents
       end
 
       def options(navigation)
-        if navigation.priority_breadcrumbs
+        if navigation.content_tagged_to_a_finder?
           {
-            step_by_step: true,
-            breadcrumbs: navigation.priority_breadcrumbs,
+            step_by_step: false,
+            breadcrumbs: navigation.breadcrumbs,
           }
         elsif navigation.content_tagged_to_current_step_by_step?
           {
             step_by_step: true,
             breadcrumbs: navigation.step_nav_helper.header,
           }
-        elsif navigation.content_tagged_to_a_finder?
+        elsif navigation.priority_breadcrumbs
           {
-            step_by_step: false,
-            breadcrumbs: navigation.breadcrumbs,
+            step_by_step: true,
+            breadcrumbs: navigation.priority_breadcrumbs,
           }
         elsif navigation.content_is_tagged_to_a_live_taxon? && prioritise_taxon_breadcrumbs
           {

data/lib/govuk_publishing_components/presenters/contextual_navigation.rb

@@ -16,7 +16,7 @@ module GovukPublishingComponents
         content_item["document_type"] == "simple_smart_answer"
       end
 
-      def html_document_with_parent?
+      def html_publication_with_parent?
         (content_item["document_type"] == "html_publication") && parent_api_path
       end
 

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

@@ -24,9 +24,8 @@ module GovukPublishingComponents
       end
 
       def questions_and_answers_markup
-        question_and_answers(page.body)
-          .select { |_, value| value[:answer].present? }
-          .map do |question, value|
+        question_and_answers.select { |_, value| value[:answer].present? }
+                            .map do |question, value|
           q_and_a_url = section_url(value[:anchor])
 
           {
@@ -52,9 +51,7 @@ module GovukPublishingComponents
       #
       # - :anchor: the id of the h2 (autogenerated by the markdown converter).
       #            This is used to build links directly to the section in question
-      def question_and_answers(html)
-        doc = Nokogiri::HTML(html)
-
+      def question_and_answers
         question = page.title
 
         doc.xpath("html/body").children.each_with_object({}) do |element, q_and_as|
@@ -71,6 +68,10 @@ module GovukPublishingComponents
         end
       end
 
+      def doc
+        @doc ||= Nokogiri::HTML(page.body)
+      end
+
       def question_hash_is_unset?(q_and_as, question)
         q_and_as[question].nil?
       end

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

@@ -0,0 +1,77 @@
+module GovukPublishingComponents
+  module Presenters
+    class HtmlPublicationSchema < FaqPageSchema
+      attr_reader :page
+
+      def initialize(page)
+        @page = page
+      end
+
+      def structured_data
+        return ArticleSchema.new(page).structured_data if less_than_two_headings_of_any_one_type?
+
+        super
+      end
+
+      def heading_counts
+        @heading_counts ||= (1..5).each_with_object({}) do |n, hash|
+          heading = "h#{n}"
+          hash[heading] = doc.xpath("//*[@class=\"govspeak\"]//#{heading}").count
+        end
+      end
+
+      def less_than_two_headings_of_any_one_type?
+        heading_counts.values.max < 2
+      end
+
+      def question_and_answers
+        headings.each_with_object({}) do |heading, hash|
+          question = heading.text
+
+          next_heading = heading_pairs[heading]
+          next_heading_path = next_heading && next_heading.path
+          answer = content_between(heading.path, next_heading_path)
+
+          hash[question] = {
+            answer: answer.map(&:to_s).join,
+            anchor: heading.attr(:id),
+          }
+        end
+      end
+
+      def headings
+        @headings ||= doc.xpath("//*[@class=\"govspeak\"]//#{first_heading_type_with_more_than_one_occurance}")
+      end
+
+      def first_heading_type_with_more_than_one_occurance
+        heading_counts.detect { |_k, v| v > 1 }.first
+      end
+
+      def heading_pairs
+        @heading_pairs ||= pairs_hash(headings)
+      end
+
+      # Converts [:a, :b, :c] into
+      # {:a => :b, :b => :c}
+      def pairs_hash(array)
+        all_but_last = array[0..-2]
+        all_but_first = array[1..-1]
+        pairs = [all_but_last, all_but_first].transpose
+        Hash[pairs]
+      end
+
+      # From: https://stackoverflow.com/a/7816046/1014251
+      # If `stop_xpath` is `nil` gets text to end of content
+      def content_between(start_xpath, stop_xpath = nil)
+        node = doc.at_xpath(start_xpath).next_element
+        stop = stop_xpath && doc.at_xpath(stop_xpath)
+        [].tap do |content|
+          while node && node != stop
+            content << node
+            node = node.next_element
+          end
+        end
+      end
+    end
+  end
+end

data/lib/govuk_publishing_components/presenters/schema_org.rb

@@ -4,6 +4,7 @@ require "govuk_publishing_components/presenters/machine_readable/creative_work_s
 require "govuk_publishing_components/presenters/machine_readable/faq_page_schema"
 require "govuk_publishing_components/presenters/machine_readable/government_service_schema"
 require "govuk_publishing_components/presenters/machine_readable/has_part_schema"
+require "govuk_publishing_components/presenters/machine_readable/html_publication_schema"
 require "govuk_publishing_components/presenters/machine_readable/is_part_of_schema"
 require "govuk_publishing_components/presenters/machine_readable/news_article_schema"
 require "govuk_publishing_components/presenters/machine_readable/organisation_schema"
@@ -22,22 +23,29 @@ module GovukPublishingComponents
       end
 
       def structured_data
-        if page.schema == :faq
-          FaqPageSchema.new(page).structured_data
-        elsif page.schema == :article
-          ArticleSchema.new(page).structured_data
-        elsif page.schema == :government_service
-          GovernmentServiceSchema.new(page).structured_data
-        elsif page.schema == :news_article
-          NewsArticleSchema.new(page).structured_data
-        elsif page.schema == :person
-          PersonSchema.new(page).structured_data
-        elsif page.schema == :organisation
-          OrganisationSchema.new(page).structured_data
-        elsif page.schema == :search_results_page
-          SearchResultsPageSchema.new(page).structured_data
-        elsif page.schema == :dataset
-          DatasetSchema.new(page).structured_data
+        schema_for_page.new(page).structured_data
+      end
+
+      def schema_for_page
+        case page.schema
+        when :faq
+          FaqPageSchema
+        when :article
+          ArticleSchema
+        when :government_service
+          GovernmentServiceSchema
+        when :news_article
+          NewsArticleSchema
+        when :person
+          PersonSchema
+        when :organisation
+          OrganisationSchema
+        when :search_results_page
+          SearchResultsPageSchema
+        when :dataset
+          DatasetSchema
+        when :html_publication
+          HtmlPublicationSchema
         else
           raise "#{page.schema} is not supported"
         end

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "21.54.0".freeze
+  VERSION = "21.55.4".freeze
 end

data/node_modules/govuk-frontend/README.md

@@ -21,12 +21,12 @@ Once installed, you will be able to use the code from the examples in the
 ### 1. Install with npm (recommended)
 
 We recommend [installing GOV.UK Frontend using node package manager
-(npm)](https://github.com/alphagov/govuk-frontend/blob/master/docs/installation/installing-with-npm.md).
+(npm)](https://frontend.design-system.service.gov.uk/installing-with-npm/).
 
 ### 2. Install by using compiled files
 
 You can also [download the compiled and minified assets (CSS, JavaScript) from
-GitHub](https://github.com/alphagov/govuk-frontend/blob/master/docs/installation/installing-from-dist.md).
+GitHub](https://frontend.design-system.service.gov.uk/installing-from-dist/).
 
 ## Importing styles
 
@@ -40,7 +40,7 @@ To import add the below to your Sass file:
   @import "node_modules/govuk-frontend/govuk/all";
   ```
 
-[More details on importing styles](https://github.com/alphagov/govuk-frontend/blob/master/docs/installation/installing-with-npm.md#importing-styles)
+[More details on importing styles](https://frontend.design-system.service.gov.uk/importing-css-assets-and-javascript/#css)
 
 ## Importing JavaScript
 
@@ -59,14 +59,14 @@ Next you need to initialise the script by adding:
 <script>window.GOVUKFrontend.initAll()</script>
 ```
 
-[More details on importing Javascript and advanced options](https://github.com/alphagov/govuk-frontend/blob/master/docs/installation/installing-with-npm.md#importing-javascript)
+[More details on importing Javascript and advanced options](https://frontend.design-system.service.gov.uk/importing-css-assets-and-javascript/#javascript)
 
 
 ## Importing assets
 
 In order to import GOV.UK Frontend images and fonts to your project, you should configure your application to reference or copy the relevant GOV.UK Frontend assets.
 
-[More details on importing assets](https://github.com/alphagov/govuk-frontend/blob/master/docs/installation/installing-with-npm.md#import-assets)
+[More details on importing assets](https://frontend.design-system.service.gov.uk/importing-css-assets-and-javascript/#font-and-image-assets)
 
 
 ## Getting updates
@@ -76,7 +76,7 @@ To be notified when there’s a new release, you can either:
 - [watch the govuk-frontend Github repository](https://help.github.com/en/articles/watching-and-unwatching-repositories)
 - join the [#govuk-design-system channel on cross-government Slack](https://ukgovernmentdigital.slack.com/app_redirect?channel=govuk-design-system)
 
-Find out how to [update with npm](https://github.com/alphagov/govuk-frontend/blob/master/docs/installation/updating-with-npm.md).
+Find out how to [update with npm](https://frontend.design-system.service.gov.uk/updating-with-npm/).
 
 ## Licence
 

data/node_modules/govuk-frontend/govuk/_base.scss

@@ -0,0 +1,3 @@
+@import "settings/all";
+@import "tools/all";
+@import "helpers/all";

data/node_modules/govuk-frontend/govuk/all.js

@@ -891,7 +891,7 @@ Accordion.prototype.initHeaderAttributes = function ($headerWrapper, index) {
   icon.className = this.iconClass;
   icon.setAttribute('aria-hidden', 'true');
 
-  $heading.appendChild(icon);
+  $button.appendChild(icon);
 };
 
 // When section toggled, set and store state

data/node_modules/govuk-frontend/govuk/all.scss

@@ -1,6 +1,4 @@
-@import "settings/all";
-@import "tools/all";
-@import "helpers/all";
+@import "base";
 
 @import "core/all";
 @import "objects/all";

data/node_modules/govuk-frontend/govuk/components/_all.scss

@@ -1,29 +1,31 @@
-@import "accordion/accordion";
-@import "back-link/back-link";
-@import "breadcrumbs/breadcrumbs";
-@import "button/button";
-@import "checkboxes/checkboxes";
-@import "character-count/character-count";
-@import "summary-list/summary-list";
-@import "date-input/date-input";
-@import "details/details";
-@import "error-message/error-message";
-@import "error-summary/error-summary";
-@import "fieldset/fieldset";
-@import "file-upload/file-upload";
-@import "footer/footer";
-@import "hint/hint";
-@import "header/header";
-@import "input/input";
-@import "inset-text/inset-text";
-@import "label/label";
-@import "panel/panel";
-@import "phase-banner/phase-banner";
-@import "tabs/tabs";
-@import "tag/tag";
-@import "radios/radios";
-@import "select/select";
-@import "skip-link/skip-link";
-@import "table/table";
-@import "textarea/textarea";
-@import "warning-text/warning-text";
+@import "../base";
+
+@import "accordion/index";
+@import "back-link/index";
+@import "breadcrumbs/index";
+@import "button/index";
+@import "checkboxes/index";
+@import "character-count/index";
+@import "summary-list/index";
+@import "date-input/index";
+@import "details/index";
+@import "error-message/index";
+@import "error-summary/index";
+@import "fieldset/index";
+@import "file-upload/index";
+@import "footer/index";
+@import "hint/index";
+@import "header/index";
+@import "input/index";
+@import "inset-text/index";
+@import "label/index";
+@import "panel/index";
+@import "phase-banner/index";
+@import "tabs/index";
+@import "tag/index";
+@import "radios/index";
+@import "select/index";
+@import "skip-link/index";
+@import "table/index";
+@import "textarea/index";
+@import "warning-text/index";

data/node_modules/govuk-frontend/govuk/components/accordion/_accordion.scss

@@ -1,208 +1,2 @@
-@import "../../settings/all";
-@import "../../tools/all";
-@import "../../helpers/all";
-
-
-@include govuk-exports("govuk/component/accordion") {
-
-  $govuk-accordion-link-colour: $govuk-link-colour;
-  $govuk-accordion-link-hover-colour: govuk-colour("light-blue");
-  $govuk-accordion-border-width: 3px;
-
-  .govuk-accordion {
-    @include govuk-responsive-margin(6, "bottom");
-  }
-
-  // Borders between accordion sections
-  .govuk-accordion__section {
-    padding-top: govuk-spacing(3);
-  }
-
-  .govuk-accordion__section-header {
-    padding-top: govuk-spacing(3);
-    padding-bottom: govuk-spacing(3);
-  }
-
-  .govuk-accordion__section-heading {
-    margin-top: 0; // Override browser default
-    margin-bottom: 0; // Override browser default
-  }
-
-  // Buttons within the sections don’t need default styling
-  .govuk-accordion__section-button {
-    @include govuk-font($size: 24, $weight: bold);
-    display: inline-block;
-    margin-bottom: 0;
-    padding-top: govuk-spacing(3);
-  }
-
-  .govuk-accordion__section-summary {
-    margin-top: govuk-spacing(2);
-    margin-bottom: 0;
-  }
-
-  // Remove the bottom margin from the last item inside the content
-  .govuk-accordion__section-content > :last-child {
-    margin-bottom: 0;
-  }
-
-  // JavaScript enabled
-  .js-enabled {
-
-    .govuk-accordion {
-      // Border at the bottom of the whole accordion
-      border-bottom: 1px solid $govuk-border-colour;
-    }
-
-    // Borders between accordion sections
-    .govuk-accordion__section {
-      padding-top: 0;
-    }
-
-    // Hide the body of collapsed sections
-    .govuk-accordion__section-content {
-      display: none;
-      @include govuk-responsive-padding(3, "top");
-      @include govuk-responsive-padding(3, "bottom");
-    }
-
-    // Show the body of expanded sections
-    .govuk-accordion__section--expanded .govuk-accordion__section-content {
-      display: block;
-    }
-
-    // This is styled to look like a link not a button
-    .govuk-accordion__open-all {
-      @include govuk-font($size: 16);
-      position: relative;
-      z-index: 1;
-      margin: 0;
-      padding: 0;
-      border-width: 0;
-      color: $govuk-link-colour;
-      background: none;
-      cursor: pointer;
-      -webkit-appearance: none;
-
-      @include govuk-link-common;
-      @include govuk-link-style-default;
-
-      // Remove default button focus outline in Firefox
-      &::-moz-focus-inner {
-        padding: 0;
-        border: 0;
-      }
-    }
-
-    // Section headers have a pointer cursor as an additional affordance
-    .govuk-accordion__section-header {
-      position: relative;
-      // Safe area on the right to avoid clashing with icon
-      padding-right: 40px;
-      border-top: 1px solid $govuk-border-colour;
-      color: $govuk-accordion-link-colour;
-      cursor: pointer;
-    }
-
-    // For devices that can't hover such as touch devices,
-    // remove hover state as it can be stuck in that state (iOS).
-    @media (hover: none) {
-      .govuk-accordion__section-header:hover {
-        border-top-color: $govuk-accordion-link-colour;
-        box-shadow: inset 0 $govuk-accordion-border-width 0 0 $govuk-accordion-link-colour;
-      }
-    }
-
-    // Buttons within the headers don’t need default styling
-    .govuk-accordion__section-button {
-      @include govuk-typography-common;
-      margin-top: 0;
-      margin-bottom: 0;
-      margin-left: 0;
-      padding: 0;
-      border-width: 0;
-      color: inherit;
-      background: none;
-      text-align: left;
-      cursor: pointer;
-      -webkit-appearance: none;
-
-      &:focus {
-        @include govuk-focused-text;
-      }
-
-      // Remove default button focus outline in Firefox
-      &::-moz-focus-inner {
-        padding: 0;
-        border: 0;
-      }
-    }
-
-    // Extend the touch area of the button to span the section header
-    .govuk-accordion__section-button:after {
-      content: "";
-      position: absolute;
-      top: 0;
-      right: 0;
-      bottom: 0;
-      left: 0;
-    }
-
-    .govuk-accordion__section-button:hover:not(:focus) {
-      text-decoration: underline;
-    }
-
-    // For devices that can't hover such as touch devices,
-    // remove hover state as it can be stuck in that state (iOS).
-    @media (hover: none) {
-      .govuk-accordion__section-button:hover {
-        text-decoration: none;
-      }
-    }
-
-    .govuk-accordion__controls {
-      text-align: right;
-    }
-
-    // Display an icon to the right of each header to indicate open/closed status,
-    // and as an additional affordance.
-    .govuk-accordion__icon {
-      position: absolute;
-      top: 50%;
-      right: 15px;
-      width: 16px;
-      height: 16px;
-      margin-top: -8px;
-    }
-
-    .govuk-accordion__icon:after,
-    .govuk-accordion__icon:before {
-      content: "";
-      box-sizing: border-box;
-      position: absolute;
-      top: 0;
-      right: 0;
-      bottom: 0;
-      left: 0;
-      width: 25%;
-      height: 25%;
-      margin: auto;
-      border: 2px solid transparent;
-      background-color: govuk-colour("black");
-    }
-
-    .govuk-accordion__icon:before {
-      width: 100%;
-    }
-
-    .govuk-accordion__icon:after {
-      height: 100%;
-    }
-
-    // Vertical bar should be hidden when section is open, to display a '-' icon
-    .govuk-accordion__section--expanded .govuk-accordion__icon:after {
-      content: " ";
-      display: none;
-    }
-  }
-}
+@import "../../base";
+@import "./index";