govuk_publishing_components 8.2.0 → 9.0.0

data/config/initializers/assets.rb

@@ -6,4 +6,7 @@ Rails.application.config.assets.precompile += %w(
   govuk_publishing_components/feed-icon-black.png
   govuk_publishing_components/mail-icon-x2.png
   govuk_publishing_components/mail-icon.png
+  govuk_publishing_components/icon-pointer.png
+  govuk_publishing_components/icon-pointer-2x.png
+  govuk_publishing_components/govuk-logo.png
 )

data/config/locales/en.yml

@@ -25,6 +25,8 @@ en:
   components:
     back_link:
       back: 'Back'
+    contents_list:
+      contents: Contents
     radio:
       or: 'or'
     related_navigation:

data/lib/govuk_publishing_components.rb

@@ -14,10 +14,11 @@ require "govuk_publishing_components/presenters/rummager_taxonomy_sidebar_links"
 require "govuk_publishing_components/presenters/curated_taxonomy_sidebar_links"
 require "govuk_publishing_components/presenters/content_item"
 require "govuk_publishing_components/presenters/translation_nav_helper"
-require "govuk_publishing_components/presenters/sanitisation"
 require "govuk_publishing_components/presenters/subscription_links_helper"
 require "govuk_publishing_components/presenters/schema_org"
 require "govuk_publishing_components/presenters/heading_helper"
+require "govuk_publishing_components/presenters/contents_list_helper"
+require "govuk_publishing_components/presenters/image_card_helper"
 
 require "govuk_publishing_components/app_helpers/taxon_breadcrumbs"
 require "govuk_publishing_components/app_helpers/brand_helper"

data/lib/govuk_publishing_components/presenters/contents_list_helper.rb

@@ -0,0 +1,27 @@
+require 'action_view'
+
+module GovukPublishingComponents
+  module Presenters
+    class ContentsListHelper
+      include ActionView::Helpers::SanitizeHelper
+
+      def wrap_numbers_with_spans(content_item_link)
+        content_item_text = strip_tags(content_item_link) #just the text of the link
+
+        # Must start with a number
+        # Number must be between 1 and 999 (ie not 2014)
+        # Must be followed by a space
+        # May contain a period `1.`
+        # May be a decimal `1.2`
+        number = /^\d{1,3}(\.?|\.\d{1,2})(?=\s)/.match(content_item_text)
+
+        if number
+          words = content_item_text.sub(number.to_s, '').strip #remove the number from the text
+          content_item_link.sub(content_item_text, "<span class=\"gem-c-contents-list__number\">#{number} </span><span class=\"gem-c-contents-list__numbered-text\">#{words}</span>").squish.html_safe
+        else
+          content_item_link
+        end
+      end
+    end
+  end
+end

data/lib/govuk_publishing_components/presenters/image_card_helper.rb

@@ -0,0 +1,55 @@
+module GovukPublishingComponents
+  module Presenters
+    class ImageCardHelper
+      include ActionView::Helpers
+      include ActionView::Context
+
+      attr_reader :href, :href_data_attributes, :extra_links, :large, :extra_links_no_indent, :heading_text
+
+      def initialize(local_assigns)
+        @href = local_assigns[:href]
+        @href_data_attributes = local_assigns[:href_data_attributes]
+        @extra_links = local_assigns[:extra_links]
+        @image_src = local_assigns[:image_src]
+        @image_alt = local_assigns[:image_alt] || ""
+        @context = local_assigns[:context]
+        @description = local_assigns[:description]
+        @large = local_assigns[:large]
+        @heading_text = local_assigns[:heading_text]
+        @heading_level = local_assigns[:heading_level]
+        @extra_links_no_indent = local_assigns[:extra_links_no_indent]
+      end
+
+      def is_tracking?
+        return true if @href_data_attributes
+        if @extra_links
+          @extra_links.each do |link|
+            return true if link[:data_attributes]
+          end
+        end
+        false
+      end
+
+      def image
+        if @image_src
+          content_tag(:figure, class: "gem-c-image-card__image-wrapper") do
+            image_tag(@image_src, class: "gem-c-image-card__image", alt: @image_alt)
+          end
+        end
+      end
+
+      def context
+        content_tag(:p, @context, class: "gem-c-image-card__context") if @context
+      end
+
+      def heading_tag
+        return "h#{@heading_level}" if [1, 2, 3, 4, 5, 6].include? @heading_level
+        "h2"
+      end
+
+      def description
+        content_tag(:p, @description, class: "gem-c-image-card__description") if @description
+      end
+    end
+  end
+end

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

@@ -24,6 +24,10 @@ module GovukPublishingComponents
             "@type" => "Organization",
             "name" => "GOV.UK",
             "url" => "https://www.gov.uk",
+            "logo" => {
+              "@type" => "ImageObject",
+              "url" => page.logo_url,
+            }
           }
         }.merge(image_schema).merge(author_schema).merge(body)
       end
@@ -35,7 +39,7 @@ module GovukPublishingComponents
       # Not all formats have a `body` - some have their content split over
       # multiple fields. In this case we'll skip the `articleBody` field
       def body
-        return {} unless page.body
+        return {} unless page.body.present?
 
         {
           "articleBody" => page.body

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

@@ -24,7 +24,7 @@ module GovukPublishingComponents
       end
 
       def description
-        content_item["description"]
+        local_assigns[:description] || content_item["description"]
       end
 
       def has_image?
@@ -42,6 +42,10 @@ module GovukPublishingComponents
       def content_item
         local_assigns[:content_item]
       end
+
+      def logo_url
+        local_assigns[:logo_url]
+      end
     end
   end
 end

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

@@ -0,0 +1,39 @@
+module GovukPublishingComponents
+  module Presenters
+    class PersonSchema
+      attr_reader :page
+
+      def initialize(page)
+        @page = page
+      end
+
+      def structured_data
+        # http://schema.org/Person
+        {
+          "@context" => "http://schema.org",
+          "@type" => "Person",
+          "mainEntityOfPage" => {
+            "@type" => "WebPage",
+            "@id" => page.canonical_url,
+          },
+          "name" => page.title,
+          "description" => page.body
+        }.merge(image_schema)
+      end
+
+    private
+
+      attr_reader :presenter
+
+      def image_schema
+        return {} unless page.has_image?
+
+        {
+          "image" => [
+            page.image_url
+          ]
+        }
+      end
+    end
+  end
+end

data/lib/govuk_publishing_components/presenters/schema_org.rb

@@ -1,6 +1,7 @@
 require 'govuk_publishing_components/presenters/machine_readable/page'
 require 'govuk_publishing_components/presenters/machine_readable/article_schema'
 require 'govuk_publishing_components/presenters/machine_readable/news_article_schema'
+require 'govuk_publishing_components/presenters/machine_readable/person_schema'
 
 module GovukPublishingComponents
   module Presenters
@@ -16,6 +17,8 @@ module GovukPublishingComponents
           ArticleSchema.new(page).structured_data
         elsif page.schema == :news_article
           NewsArticleSchema.new(page).structured_data
+        elsif page.schema == :person
+          PersonSchema.new(page).structured_data
         else
           raise "#{page.schema} is not supported"
         end

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = '8.2.0'.freeze
+  VERSION = '9.0.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 8.2.0
+  version: 9.0.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-29 00:00:00.000000000 Z
+date: 2018-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_app_config
@@ -302,6 +302,9 @@ files:
 - Rakefile
 - app/assets/config/govuk_publishing_components_manifest.js
 - app/assets/images/govuk_publishing_components/feed-icon-black.png
+- app/assets/images/govuk_publishing_components/govuk-logo.png
+- app/assets/images/govuk_publishing_components/icon-pointer-2x.png
+- app/assets/images/govuk_publishing_components/icon-pointer.png
 - app/assets/images/govuk_publishing_components/mail-icon-x2.png
 - app/assets/images/govuk_publishing_components/mail-icon.png
 - app/assets/images/govuk_publishing_components/search-button.png
@@ -319,7 +322,6 @@ files:
 - app/assets/javascripts/govuk_publishing_components/lib/history-support.js
 - app/assets/javascripts/govuk_publishing_components/lib/toggle-input-class-on-focus.js
 - app/assets/javascripts/govuk_publishing_components/lib/toggle.js
-- app/assets/javascripts/govuk_publishing_components/lib/track-share-button-clicks.js
 - app/assets/stylesheets/component_guide/all_components.scss
 - app/assets/stylesheets/component_guide/all_components_print.scss
 - app/assets/stylesheets/component_guide/application.scss
@@ -328,15 +330,20 @@ files:
 - app/assets/stylesheets/govuk_publishing_components/components/_back-link.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_breadcrumbs.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_button.scss
+- app/assets/stylesheets/govuk_publishing_components/components/_contents-list.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_document-list.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_error-summary.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_feedback.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_fieldset.scss
+- app/assets/stylesheets/govuk_publishing_components/components/_govspeak-html-publication.scss
+- app/assets/stylesheets/govuk_publishing_components/components/_govspeak.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_heading.scss
+- app/assets/stylesheets/govuk_publishing_components/components/_image-card.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_input.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_inverse-header.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_label.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_lead-paragraph.scss
+- app/assets/stylesheets/govuk_publishing_components/components/_notice.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_phase-banner.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_previous-and-next-navigation.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_radio.scss
@@ -351,7 +358,30 @@ files:
 - app/assets/stylesheets/govuk_publishing_components/components/_taxonomy-navigation.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_title.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_translation-nav.scss
+- app/assets/stylesheets/govuk_publishing_components/components/govspeak/_advisory.scss
+- app/assets/stylesheets/govuk_publishing_components/components/govspeak/_attachment.scss
+- app/assets/stylesheets/govuk_publishing_components/components/govspeak/_button.scss
+- app/assets/stylesheets/govuk_publishing_components/components/govspeak/_call-to-action.scss
+- app/assets/stylesheets/govuk_publishing_components/components/govspeak/_charts.scss
+- app/assets/stylesheets/govuk_publishing_components/components/govspeak/_contact.scss
+- app/assets/stylesheets/govuk_publishing_components/components/govspeak/_example.scss
+- app/assets/stylesheets/govuk_publishing_components/components/govspeak/_footnotes.scss
+- app/assets/stylesheets/govuk_publishing_components/components/govspeak/_fraction.scss
+- app/assets/stylesheets/govuk_publishing_components/components/govspeak/_highlight-answer.scss
+- app/assets/stylesheets/govuk_publishing_components/components/govspeak/_images.scss
+- app/assets/stylesheets/govuk_publishing_components/components/govspeak/_information-callout.scss
+- app/assets/stylesheets/govuk_publishing_components/components/govspeak/_legislative-list.scss
+- app/assets/stylesheets/govuk_publishing_components/components/govspeak/_media-player.scss
+- app/assets/stylesheets/govuk_publishing_components/components/govspeak/_place.scss
+- app/assets/stylesheets/govuk_publishing_components/components/govspeak/_stat-headline.scss
+- app/assets/stylesheets/govuk_publishing_components/components/govspeak/_steps.scss
+- app/assets/stylesheets/govuk_publishing_components/components/govspeak/_summary.scss
+- app/assets/stylesheets/govuk_publishing_components/components/govspeak/_tables.scss
+- app/assets/stylesheets/govuk_publishing_components/components/govspeak/_typography.scss
+- app/assets/stylesheets/govuk_publishing_components/components/govspeak/_warning-callout.scss
+- app/assets/stylesheets/govuk_publishing_components/components/govspeak/form-download.scss
 - app/assets/stylesheets/govuk_publishing_components/components/helpers/_brand-colours.scss
+- app/assets/stylesheets/govuk_publishing_components/components/helpers/_contents-list-helper.scss
 - app/assets/stylesheets/govuk_publishing_components/components/helpers/_px-to-em.scss
 - app/assets/stylesheets/govuk_publishing_components/components/helpers/_variables.scss
 - app/assets/stylesheets/govuk_publishing_components/components/mixins/_back-arrow.scss
@@ -359,7 +389,10 @@ files:
 - app/assets/stylesheets/govuk_publishing_components/components/mixins/_margins.scss
 - app/assets/stylesheets/govuk_publishing_components/components/mixins/_media-down.scss
 - app/assets/stylesheets/govuk_publishing_components/components/mixins/_touch-friendly-links.scss
+- app/assets/stylesheets/govuk_publishing_components/components/print/_contents-list.scss
 - app/assets/stylesheets/govuk_publishing_components/components/print/_feedback.scss
+- app/assets/stylesheets/govuk_publishing_components/components/print/_govspeak-html-publication.scss
+- app/assets/stylesheets/govuk_publishing_components/components/print/_govspeak.scss
 - app/assets/stylesheets/govuk_publishing_components/components/print/_step-by-step-nav-header.scss
 - app/assets/stylesheets/govuk_publishing_components/components/print/_step-by-step-nav.scss
 - app/assets/stylesheets/govuk_publishing_components/components/print/_title.scss
@@ -381,6 +414,7 @@ files:
 - app/views/govuk_publishing_components/components/_back_link.html.erb
 - app/views/govuk_publishing_components/components/_breadcrumbs.html.erb
 - app/views/govuk_publishing_components/components/_button.html.erb
+- app/views/govuk_publishing_components/components/_contents_list.html.erb
 - app/views/govuk_publishing_components/components/_contextual_breadcrumbs.html.erb
 - app/views/govuk_publishing_components/components/_contextual_sidebar.html.erb
 - app/views/govuk_publishing_components/components/_document_list.html.erb
@@ -388,13 +422,17 @@ files:
 - app/views/govuk_publishing_components/components/_feedback.html.erb
 - app/views/govuk_publishing_components/components/_fieldset.html.erb
 - app/views/govuk_publishing_components/components/_government_navigation.html.erb
+- app/views/govuk_publishing_components/components/_govspeak.html.erb
+- app/views/govuk_publishing_components/components/_govspeak_html_publication.html.erb
 - app/views/govuk_publishing_components/components/_heading.html.erb
+- app/views/govuk_publishing_components/components/_image_card.html.erb
 - app/views/govuk_publishing_components/components/_input.html.erb
 - app/views/govuk_publishing_components/components/_inverse_header.html.erb
 - app/views/govuk_publishing_components/components/_label.html.erb
 - app/views/govuk_publishing_components/components/_lead_paragraph.html.erb
 - app/views/govuk_publishing_components/components/_machine_readable_metadata.html.erb
 - app/views/govuk_publishing_components/components/_meta_tags.html.erb
+- app/views/govuk_publishing_components/components/_notice.html.erb
 - app/views/govuk_publishing_components/components/_phase_banner.html.erb
 - app/views/govuk_publishing_components/components/_previous_and_next_navigation.html.erb
 - app/views/govuk_publishing_components/components/_radio.html.erb
@@ -412,6 +450,7 @@ files:
 - app/views/govuk_publishing_components/components/docs/back_link.yml
 - app/views/govuk_publishing_components/components/docs/breadcrumbs.yml
 - app/views/govuk_publishing_components/components/docs/button.yml
+- app/views/govuk_publishing_components/components/docs/contents_list.yml
 - app/views/govuk_publishing_components/components/docs/contextual_breadcrumbs.yml
 - app/views/govuk_publishing_components/components/docs/contextual_sidebar.yml
 - app/views/govuk_publishing_components/components/docs/document_list.yml
@@ -419,13 +458,17 @@ files:
 - app/views/govuk_publishing_components/components/docs/feedback.yml
 - app/views/govuk_publishing_components/components/docs/fieldset.yml
 - app/views/govuk_publishing_components/components/docs/government_navigation.yml
+- app/views/govuk_publishing_components/components/docs/govspeak.yml
+- app/views/govuk_publishing_components/components/docs/govspeak_html_publication.yml
 - app/views/govuk_publishing_components/components/docs/heading.yml
+- app/views/govuk_publishing_components/components/docs/image_card.yml
 - app/views/govuk_publishing_components/components/docs/input.yml
 - app/views/govuk_publishing_components/components/docs/inverse_header.yml
 - app/views/govuk_publishing_components/components/docs/label.yml
 - app/views/govuk_publishing_components/components/docs/lead_paragraph.yml
 - app/views/govuk_publishing_components/components/docs/machine_readable_metadata.yml
 - app/views/govuk_publishing_components/components/docs/meta_tags.yml
+- app/views/govuk_publishing_components/components/docs/notice.yml
 - app/views/govuk_publishing_components/components/docs/phase_banner.yml
 - app/views/govuk_publishing_components/components/docs/previous_and_next_navigation.yml
 - app/views/govuk_publishing_components/components/docs/radio.yml
@@ -461,17 +504,19 @@ files:
 - lib/govuk_publishing_components/presenters/content_breadcrumbs_based_on_parent.rb
 - lib/govuk_publishing_components/presenters/content_breadcrumbs_based_on_taxons.rb
 - lib/govuk_publishing_components/presenters/content_item.rb
+- lib/govuk_publishing_components/presenters/contents_list_helper.rb
 - lib/govuk_publishing_components/presenters/contextual_navigation.rb
 - lib/govuk_publishing_components/presenters/curated_taxonomy_sidebar_links.rb
 - lib/govuk_publishing_components/presenters/heading_helper.rb
+- lib/govuk_publishing_components/presenters/image_card_helper.rb
 - lib/govuk_publishing_components/presenters/machine_readable/article_schema.rb
 - lib/govuk_publishing_components/presenters/machine_readable/news_article_schema.rb
 - lib/govuk_publishing_components/presenters/machine_readable/page.rb
+- lib/govuk_publishing_components/presenters/machine_readable/person_schema.rb
 - lib/govuk_publishing_components/presenters/meta_tags.rb
 - lib/govuk_publishing_components/presenters/page_with_step_by_step_navigation.rb
 - lib/govuk_publishing_components/presenters/related_navigation_helper.rb
 - lib/govuk_publishing_components/presenters/rummager_taxonomy_sidebar_links.rb
-- lib/govuk_publishing_components/presenters/sanitisation.rb
 - lib/govuk_publishing_components/presenters/schema_org.rb
 - lib/govuk_publishing_components/presenters/services.rb
 - lib/govuk_publishing_components/presenters/step_by_step_nav_helper.rb

data/app/assets/javascripts/govuk_publishing_components/lib/track-share-button-clicks.js

@@ -1,26 +0,0 @@
-window.GOVUK.Modules = window.GOVUK.Modules || {};
-
-(function (Modules) {
-  'use strict'
-
-  Modules.GemTrackShareButtonClicks = function () {
-    this.start = function (element) {
-      element.on('click', '.js-share-facebook', trackFacebook)
-      element.on('click', '.js-share-twitter', trackTwitter)
-
-      function trackFacebook () {
-        trackShare('facebook')
-      }
-
-      function trackTwitter () {
-        trackShare('twitter')
-      }
-
-      function trackShare (network) {
-        if (GOVUK.analytics && GOVUK.analytics.trackShare) {
-          GOVUK.analytics.trackShare(network)
-        }
-      }
-    }
-  }
-})(window.GOVUK.Modules)

data/lib/govuk_publishing_components/presenters/sanitisation.rb

@@ -1,13 +0,0 @@
-module GovukPublishingComponents
-  module Presenters
-    # @private
-    class Sanitisation
-      # Use `sub` on a potentially unsafe string. This method will sanitize
-      # the method first, do the replacement, and mark the result as HTML safe.
-      def self.sub_safely(string, pattern, replacement)
-        escaped_text = ERB::Util.html_escape_once(string.strip)
-        escaped_text.sub(pattern, replacement).html_safe
-      end
-    end
-  end
-end