govuk_publishing_components 21.6.1 → 21.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79be21f71f3a4b23d02315cbfcba46a68736e44e144d7b26bce1f0b62e38157e
-  data.tar.gz: 48f9513d068a851dd17b13e4f8233ce48a4a2ab03928c0d6d97decc5bca8003b
+  metadata.gz: a13af1fed7c83644cba1a6560410b377afc3b56c6f6052fb0bbeb415463606af
+  data.tar.gz: 9073f4bc6aecb731bd1feb06af7d644f6f58a7c4e415eb29514d42e86322d6e4
 SHA512:
-  metadata.gz: e052d46ec35f2385fcaa8b4461c841eda1920ec369d80f00d6230aeb017fe9efece15426aea9bf44bb7e755c395577ec6bad7036973d1e8c4267302b1beab69a
-  data.tar.gz: 2d4604bdd3758762a9516031cd09866b68c7cfe35f4d13c08724ff8b76f061fdd107fc4a151c870748026579b0669319ad43d087537d62c6bcfb073804859157
+  metadata.gz: 4e2198e7fd14f2db62e344f6afab74c9a7b95a498d7466dde50d46cb6b5419e95b7cef3cdbdced865f5caf4d46edf96e9a87f140908910100d85c2a412678fcb
+  data.tar.gz: b13e4685a7e3edb57402610401f98a862dd05c808ccb5f4c579fbab37d0d09520701f1980602e004bc6062a470b70b508e92a05e6cc355a18f5fb0d5eedfca42

data/app/views/govuk_publishing_components/components/_layout_for_admin.html.erb

@@ -10,7 +10,7 @@
     <%= csrf_meta_tags %>
     <%= favicon_link_tag "govuk_publishing_components/favicon-#{environment}.png" %>
     <%= stylesheet_link_tag "application" %>
-    <%= stylesheet_link_tag "print", media: print %>
+    <%= stylesheet_link_tag "print", media: "print" %>
     <%= javascript_include_tag "govuk_publishing_components/vendor/modernizr" %>
     <%= yield :head %>
   </head>

data/app/views/govuk_publishing_components/components/docs/machine_readable_metadata.yml

@@ -62,6 +62,14 @@ examples:
         <p>Your next of kin may need a strong stomach</p>
       schema: :faq
       canonical_url: https://www.gov.uk/how-to-train-your-dragon
+  government_service_schema:
+    data:
+      content_item:
+        title: "Apply for your first dragon"
+        base_path: "/apply-for-your-first-dragon"
+        description: "Apply for your first dragon from the Ministry of Dragons online"
+        details: {}
+      schema: :government_service
   person_schema:
     data:
       content_item:

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

@@ -0,0 +1,62 @@
+module GovukPublishingComponents
+  module Presenters
+    class GovernmentServiceSchema
+      attr_reader :page
+
+      def initialize(page)
+        @page = page
+      end
+
+      def structured_data
+        # http://schema.org/GovernmentService
+        {
+          "@context" => "http://schema.org",
+          "@type" => "GovernmentService",
+          "name" => page.title,
+          "description" => page.description,
+          "url" => page.canonical_url
+        }
+          .merge(provider)
+          .merge(related_services)
+      end
+
+    private
+
+      def related_services
+        related_links = page.content_item.dig('links', 'ordered_related_items')
+
+        return {} unless related_links.present?
+
+        {
+          "isRelatedTo" => related_links.each_with_object([]) do |link, items|
+            if link['schema_name'] == 'transaction'
+              items << {
+                "@type" => "GovernmentService",
+                "name" => link['title'],
+                "url" => link['web_url']
+              }
+            end
+          end
+        }
+      end
+
+      def provider
+        organisations = page.content_item.dig('links', 'organisations')
+
+        return {} unless organisations.present?
+
+        providers = organisations.map do |organisation|
+          {
+            "@type" => "GovernmentOrganization",
+            "name" => organisation['title'],
+            "url" => organisation['web_url']
+          }
+        end
+
+        {
+          "provider" => providers
+        }
+      end
+    end
+  end
+end

data/lib/govuk_publishing_components/presenters/schema_org.rb

@@ -2,6 +2,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/creative_work_schema'
 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/is_part_of_schema'
 require 'govuk_publishing_components/presenters/machine_readable/news_article_schema'
@@ -24,6 +25,8 @@ module GovukPublishingComponents
           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

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = '21.6.1'.freeze
+  VERSION = '21.7.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 21.6.1
+  version: 21.7.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-22 00:00:00.000000000 Z
+date: 2019-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gds-api-adapters
@@ -744,6 +744,7 @@ files:
 - lib/govuk_publishing_components/presenters/machine_readable/article_schema.rb
 - lib/govuk_publishing_components/presenters/machine_readable/creative_work_schema.rb
 - lib/govuk_publishing_components/presenters/machine_readable/faq_page_schema.rb
+- lib/govuk_publishing_components/presenters/machine_readable/government_service_schema.rb
 - lib/govuk_publishing_components/presenters/machine_readable/has_part_schema.rb
 - lib/govuk_publishing_components/presenters/machine_readable/is_part_of_schema.rb
 - lib/govuk_publishing_components/presenters/machine_readable/news_article_schema.rb