govuk_publishing_components 15.2.0 → 15.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13bcbcd43bdcda0ae27e167ccddbb2e460dc6533f0a2c3e29a6729862ad5a9bb
-  data.tar.gz: e0a1273c2b30f23724bb009fd212df6fe558655f6f21791d292ec02fe2214ff2
+  metadata.gz: c8684d7e01c2e01dfbb03bf69bb6aaeeadc8137f0eaa4691de731bc90c101c25
+  data.tar.gz: 8e7ddb8c6c6eeb1b2ad98b2c9c1601c1c5af8f3b35a33e62b7c8eb642b02f8de
 SHA512:
-  metadata.gz: 4d4f8c2b467bcff8b0fd6cf94f63743ccfc93216bec8d8362f086ea31b2ad8ed17e7ca969b4c93a5cd8fe4e25cea87d2508d7713feeb66803a1a5356fc068c27
-  data.tar.gz: 7e1888f1b3a3db750b356eb1560f952421f9a1eba47c4c79c8e853d1a9a6fe423e411b142e56091a1b0c17823570977019e5ba5d2c625fe75f4331f459567ad6
+  metadata.gz: 2398ddae0a45b6770c797348043821fe27201eeb37a034c626b2006f45b9daaa1b6f07cb0d88ecd1d28e7e767e90caf14e03c1e41d1e691292983ff9149a91b2
+  data.tar.gz: aa30213e3ce4771e7ec04d69835a653a6324d5e1e860c66ce74c13637b6e0eccfc851404524f89ee9dd3bd5bf1c1375c3240acae618a900b11055afbfd1cd1d6

data/app/models/govuk_publishing_components/component_doc.rb

@@ -6,7 +6,8 @@ module GovukPublishingComponents
                 :body,
                 :component,
                 :accessibility_excluded_rules,
-                :source
+                :source,
+                :embed
 
     def initialize(component)
       @component = component
@@ -16,6 +17,7 @@ module GovukPublishingComponents
       @body = component[:body]
       @accessibility_excluded_rules = component[:accessibility_excluded_rules]
       @source = component[:source]
+      @embed = component[:embed]
     end
 
     def accessibility_criteria
@@ -74,6 +76,7 @@ module GovukPublishingComponents
     def examples
       @examples ||= component[:examples].map do |id, example_data|
         example_data = example_data || {}
+        example_data["embed"] ||= embed
         ComponentExample.new(id.to_s, example_data)
       end
     end

data/app/models/govuk_publishing_components/component_example.rb

@@ -6,7 +6,8 @@ module GovukPublishingComponents
                 :data,
                 :context,
                 :description,
-                :block
+                :block,
+                :embed
 
     def initialize(id, example)
       @id = id
@@ -14,6 +15,7 @@ module GovukPublishingComponents
       @context = example["context"] || {}
       @description = example["description"] || false
       @block = @data.delete(:block) || false
+      @embed = example["embed"]
     end
 
     def name
@@ -73,6 +75,10 @@ module GovukPublishingComponents
       !!block
     end
 
+    def has_embed?
+      !!embed
+    end
+
   private
 
     def govspeak_to_html(govspeak)

data/app/views/govuk_publishing_components/component_guide/component_doc/_call.html.erb

@@ -1,12 +1,20 @@
+<%
+component_code =
+  if example.has_block?
+    "<%= render \"#{@component_doc.partial_path}\", #{example.pretty_data} do %\>\n" +
+    "  #{example.block.html_safe}" +
+    "<% end %\>"
+  else
+    "<%= render \"#{@component_doc.partial_path}\", #{example.pretty_data} %\>"
+  end
+
+code =
+  if example.has_embed?
+    example.embed.sub("<%= component %\>", component_code)
+  else
+    component_code
+  end
+%>
 <div class="component-call component-highlight" contenteditable>
-  <% if example.has_block? %>
-    <%
-      code = "<%= render \"#{@component_doc.partial_path}\", #{example.pretty_data} do %\>\n"
-      code += "  #{example.block.html_safe}"
-      code += "<% end %\>"
-    -%>
-    <pre><code><%= example.highlight_code(code) %></code></pre>
-  <% else %>
-    <pre><code><%= example.highlight_code("\<%= render \"#{@component_doc.partial_path}\", #{example.pretty_data} %\>") %></code></pre>
-  <% end %>
+  <pre><code><%= example.highlight_code(code) %></code></pre>
 </div>

data/app/views/govuk_publishing_components/component_guide/component_doc/_component_output.html.erb

@@ -1,7 +1,15 @@
-<% if example.has_block? %>
-  <%= render component_doc.partial_path, example.html_safe_data do %>
-    <%= example.block.html_safe %>
+<% component = capture do %>
+  <% if example.has_block? %>
+    <%= render component_doc.partial_path, example.html_safe_data do %>
+      <%= example.block.html_safe %>
+    <% end %>
+  <% else %>
+    <%= render component_doc.partial_path, example.html_safe_data %>
   <% end %>
+<% end %>
+
+<% if example.has_embed? %>
+  <%= ERB.new(example.embed).result(binding).html_safe %>
 <% else %>
-  <%= render component_doc.partial_path, example.html_safe_data %>
+  <%= component %>
 <% end %>

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

@@ -1,4 +1,5 @@
 <%
   href ||= '#main-content'
+  text ||= t('components.skip_link.text')
 %>
-<%= link_to("Skip to main content", href, class: "gem-c-skip-link govuk-skip-link") %>
+<%= link_to(text, href, class: "gem-c-skip-link govuk-skip-link") %>

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

@@ -12,4 +12,13 @@ accessibility_criteria: |
 examples:
   default:
     data:
-      href: '#content'
+  with_different_text:
+    data:
+      text: 'Skip to results'
+  with_different_href:
+    data:
+      href: '#somewhere-on-the-page'
+  custom_title_and_href:
+    data:
+      text: 'Skip to my content'
+      href: '#my-content'

data/config/locales/en.yml

@@ -49,6 +49,8 @@ en:
       policies: "Policies"
       statistical_data_sets: "Statistical data sets"
       topical_events: "Topical events"
+    skip_link:
+      text: "Skip to main content"
     step_by_step_nav:
       show: "Show"
       hide: "Hide"

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = '15.2.0'.freeze
+  VERSION = '15.3.0'.freeze
 end

data/node_modules/accessible-autocomplete/package.json

@@ -49,7 +49,7 @@
     "/"
   ],
   "_resolved": "git://github.com/alphagov/accessible-autocomplete.git#0c518b4fa79b9a95b544410858486ed9e6403c84",
-  "_shasum": "13aa3d1cdc2e88f8d67b6974cc5f76c06e6aed45",
+  "_shasum": "2a23fb1556e095fb6cdf1a602bf8a237de5122db",
   "_shrinkwrap": null,
   "_spec": "accessible-autocomplete@git://github.com/alphagov/accessible-autocomplete.git#add-multiselect-support",
   "_where": "/var/lib/jenkins/workspace/ublishing_components_master-N4FWJIUY4CIFHKGZOAAEVVXODRY3YBORQOPIBBXWX72VUPSGJRRQ",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 15.2.0
+  version: 15.3.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-14 00:00:00.000000000 Z
+date: 2019-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govspeak
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.11'
 - !ruby/object:Gem::Dependency
   name: govuk_schemas
   requirement: !ruby/object:Gem::Requirement
@@ -254,14 +254,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement