govuk_publishing_components 21.36.1 → 21.37.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97f4e780c9b3f27f06d6aee281982ba45b61f4d5c33004f486eb1200c9bb5b0f
-  data.tar.gz: ef54a714d226943bbdb1aad4092991bdd772cd6a084ef77036c420d1a49b7123
+  metadata.gz: e7343e4fe7a73cac6e8c139f06e54a8691a15cc4f6964595c4dac999d3186106
+  data.tar.gz: 1fee051d18738e77725e74464527b67eb9e7a99e2eceae382aee64e0acdcfb46
 SHA512:
-  metadata.gz: 64e7a5809d24381576e81d8c508de4b16dc6186ce8ede46bd1905c1226a2622552e99e89aeec4a8af2fdffbb6dcc62b4eb19290cfc3db070754c0d25113fecc2
-  data.tar.gz: 8dd0576161ca46ef0b41c433ce8f17163eee5e12e5f3ba0ad35e366ae02b74e25260749d92d3788c37b66b6b18da09802fb3042674a4cb6fcca47f6289814613
+  metadata.gz: 34e961e66d8957202a7e8c89755f7959b53793ae2181ecb4de104080a7f5e6f92f06002ed296c2c774f47f9a2555be68dfc50362dac4022181467aae4b844f3b
+  data.tar.gz: d04a0d287874c62a7b3a9b4399155944715a21c6c695412a6b42384b29667067f7479d7fba2e538c9f3f84ef493606b3a691fb084d9403e552cfb6935af192a3

data/app/assets/stylesheets/govuk_publishing_components/components/_warning-text.scss

@@ -1,5 +1,9 @@
 @import "govuk/components/warning-text/warning-text";
 
+.gem-c-warning-text .govuk-warning-text__text {
+  margin: 0;
+}
+
 .gem-c-warning-text__text--no-indent {
   padding-left: 0;
   margin-left: 0;

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

@@ -4,6 +4,9 @@
   text_icon ||= '!'
   large_font ||= false
   highlight_text ||= false
+  heading_level ||= 0
+
+  shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
 
   text_classes = %w(govuk-warning-text__text)
   text_classes << "gem-c-warning-text__text--no-indent" if text_icon.empty?
@@ -15,8 +18,17 @@
   <% unless text_icon.empty? %>
     <%= tag.span text_icon, class: "govuk-warning-text__icon", "aria-hidden": "true" %>
   <% end %>
-  <%= tag.strong class: text_classes do %>
+  <% inner_text = capture do %>
     <%= tag.span text_assistive, class: "govuk-warning-text__assistive" %>
     <%= text %>
   <% end %>
+  <% if heading_level > 0 %>
+    <%= content_tag(shared_helper.get_heading_level, class: text_classes) do %>
+      <%= inner_text %>
+    <% end %>
+  <% else %>
+    <%= tag.strong class: text_classes do %>
+      <%= inner_text %>
+    <% end %>
+  <% end %>
 <% end %>

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

@@ -134,3 +134,24 @@ examples:
         base_path: "government/statistical-data-sets/hogwarts-data"
         details: {}
       schema: :dataset
+  dataset_schema_with_attachments:
+    data:
+      content_item:
+        title: "All the data about Hogwarts"
+        base_path: "government/statistical-data-sets/hogwarts-data"
+        details:
+          attachments:
+            - attachment_type: "file"
+              url: "https://assets.publishing.service.gov.uk/hogwarts-data/headmasters.csv"
+              title: "List of headmasters"
+              content_type: "text/csv"
+              id: "headmasters.csv"
+            - attachment_type: "html"
+              url: "https://www.gov.uk/government/statistical-data-sets/hogwarts-data/houses"
+              title: "Houses of Hogwarts"
+              id: "houses"
+            - attachment_type: "external"
+              url: "https://hogwarts.gov.uk/datasets/dungeon-cleaning-schedule"
+              title: "Dungeon cleaning shedule"
+              id: "dungeon-cleaning-schedule"
+      schema: :dataset

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

@@ -29,3 +29,7 @@ examples:
     data:
       text: "This content has changed"
       highlight_text: true
+  as_a_heading:
+    data:
+      text: "This is a heading 3"
+      heading_level: 3

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

@@ -10,6 +10,7 @@ module GovukPublishingComponents
       def structured_data
         # http://schema.org/Dataset
         data = CreativeWorkSchema.new(@page).structured_data
+          .merge(distribution)
           .merge(description)
           .merge(name)
         data["@type"] = "Dataset"
@@ -18,9 +19,20 @@ module GovukPublishingComponents
 
     private
 
+      def distribution
+        return {} unless page.attachments
+
+        {
+          "distribution" => page.attachments.map { |a| present_attachment(a.with_indifferent_access) }.compact,
+        }
+      end
+
       def description
+        descr = page.body || page.description
+        return {} unless descr
+
         {
-          "description" => (page.body || page.description).slice(0..4999),
+          "description" => descr.slice(0..4999),
         }
       end
 
@@ -29,6 +41,27 @@ module GovukPublishingComponents
           "name" => page.title,
         }
       end
+
+      def present_attachment(attachment)
+        title = attachment[:title]
+        url = attachment[:url]
+        return unless title
+        return unless url
+
+        case attachment[:attachment_type]
+        when "external", "html"
+          {
+            "name" => title,
+            "url" => url,
+          }
+        when "file"
+          {
+            "name" => title,
+            "contentUrl" => url,
+            "encodingFormat" => attachment[:content_type],
+          }.compact
+        end
+      end
     end
   end
 end

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

@@ -51,6 +51,10 @@ module GovukPublishingComponents
         content_item["base_path"]
       end
 
+      def attachments
+        content_item.dig("details", "attachments")
+      end
+
       def content_item
         local_assigns[:content_item]
       end

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "21.36.1".freeze
+  VERSION = "21.37.0".freeze
 end

metadata

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