govuk_publishing_components 12.11.0 → 12.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5418d09427a87d2d13d40a2e6a16bf117077f662d10c345135b3b7e3e3446aa8
-  data.tar.gz: fd19c7eb53eaf6e21bba7b2e94b87c4a713c83b0bff26b0eb5b301fc7023fc9d
+  metadata.gz: ddd766aa58f3052e6cc3d7d543cd88c9e49dec9f975afce4bdcfc1fd180ccd9e
+  data.tar.gz: 9cc9bbcfa7f46cdeae8627286c005106c7ab59fd1eb779f624a9381d730ae77c
 SHA512:
-  metadata.gz: df60ea3c2ad2cf82d0e1ff60dd6ceecd5e8a1042a8e5350eb70bc84520a2c2da76b6daa7bf02d7d3e84986a140be228bc755dd432cb3a623e85d6be61257ee04
-  data.tar.gz: 351589a50ea516cee20dc23c235f8b57a5ff3ef96a6e421af1fb47e9948d840a8fc09022b22a649e767e69a39788ea6cbcce9ab423730b44dab5d45323980bdb
+  metadata.gz: 1e827b4944e1153162350748e54a11631985d82ca32e4e635de95a97bc263c14a56798d0c03b66f0f33956e6e5e37b876dfbd80c138f87944323b2ba828903d2
+  data.tar.gz: a35dd53726351613e24fee21cbf3e7e0c25814acc26d4e41c7dc1ce103b411a4d173a23a81d63d54f988c8e3229c61a77055fa80653b4869fc4e177bf375a9da

data/Rakefile

@@ -5,7 +5,7 @@ rescue LoadError
   puts "Running in production mode"
 end
 
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path('spec/dummy/Rakefile', __dir__)
 
 load 'rails/tasks/engine.rake'
 load 'rails/tasks/statistics.rake'

data/app/assets/javascripts/govuk_publishing_components/components/copy-to-clipboard.js

@@ -6,11 +6,15 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
 
   GOVUK.Modules.CopyToClipboard = function () {
     this.start = function (element) {
+      var input = element[0].querySelector('.gem-c-input')
       var copyButton = element[0].querySelector('.gem-c-button')
 
+      input.addEventListener('click', function() {
+        input.select()
+      })
+
       copyButton.addEventListener('click', function (event) {
         event.preventDefault()
-        var input = element[0].querySelector('.gem-c-input')
         input.select()
         document.execCommand('copy')
       })

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

@@ -1,4 +1,7 @@
-<%= link_to t('components.back_link.back'),
+<%
+  text ||= t('components.back_link.back')
+%>
+<%= link_to text,
   href,
   class: %w(
     gem-c-back-link

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

@@ -1,14 +1,19 @@
+<%
+  button_data_attributes ||= nil
+%>
 <div class="gem-c-copy-to-clipboard" data-module="copy-to-clipboard">
   <%= render "govuk_publishing_components/components/input", {
     label: {
       text: label,
     },
     name: SecureRandom.hex,
-    value: copyable_content
+    value: copyable_content,
+    readonly: true,
   } %>
 
   <%= render "govuk_publishing_components/components/button", {
     text: button_text,
+    data_attributes: button_data_attributes,
     secondary_quiet: true,
   } %>
 </div>

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

@@ -11,6 +11,7 @@
   error_items ||= nil
   autofocus ||= nil
   tabindex ||= nil
+  readonly ||= nil
   has_error = error_message || error_items&.any?
   hint_id = "hint-#{SecureRandom.hex(4)}"
   error_id = "error-#{SecureRandom.hex(4)}"
@@ -65,6 +66,7 @@
       data: data,
       tabindex: tabindex,
       autofocus: autofocus,
+      readonly: readonly,
       aria: {
         describedby: aria_described_by
       }

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

@@ -5,9 +5,9 @@
   <h2 class="govuk-panel__title">
     <%= title %>
   </h2>
-  <div class="govuk-panel__body">
-    <% if description %>
-      <%= description %>
-    <% end %>
-  </div>
+  <% if description %>
+    <div class="govuk-panel__body">
+      <%= description %> 
+    </div>
+  <% end %>
 </div>

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

@@ -10,3 +10,7 @@ examples:
   default:
     data:
       href: '#'
+  custom_text:
+    data:
+      text: 'Back to document list'
+      href: '#'

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

@@ -6,5 +6,12 @@ examples:
       label: Copy and send this link to someone and they’ll be able to preview your draft on GOV.UK.
       copyable_content: http://www.example.org
       button_text: Copy link
+  with_button_data_attributes:
+    data:
+      label: Copy and send this link to someone and they’ll be able to preview your draft on GOV.UK.
+      copyable_content: http://www.example.org
+      button_text: Copy link
+      button_data_attributes:
+        "tracking-code": GA-123ABC
 accessibility_criteria: |
   - should be usable with keyboard

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

@@ -75,3 +75,10 @@ examples:
       name: "username"
       autofocus: true
       tabindex: 0
+  readonly:
+    data:
+      label:
+        text: "Readonly attribute"
+      name: "readonly"
+      value: "You can't change me"
+      readonly: true

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

@@ -11,3 +11,6 @@ examples:
       description: |
         Your reference number<br>
         <strong>HDJ2123F</strong>
+  no_description:
+    data:
+      title: Content has been published

data/lib/generators/govuk_publishing_components/component_generator.rb

@@ -3,7 +3,7 @@ require 'fileutils'
 
 module GovukPublishingComponents
   class ComponentGenerator < ::Rails::Generators::NamedBase
-    source_root File.expand_path('../templates', __FILE__)
+    source_root File.expand_path('templates', __dir__)
 
     def copy_component_files
       @public_name = file_name.dasherize

data/lib/govuk_publishing_components/app_helpers/environment.rb

@@ -12,6 +12,7 @@ module GovukPublishingComponents
       # Can be "production", "staging", "integration", or "development"
       def self.current_acceptance_environment
         return "example" if ENV["HEROKU"]
+
         GOVUK_ENVIRONMENTS.fetch(ENV["ERRBIT_ENVIRONMENT_NAME"], "development")
       end
     end

data/lib/govuk_publishing_components/app_helpers/table_helper.rb

@@ -52,7 +52,7 @@ module GovukPublishingComponents
           link_clases = %w(app-table__sort-link)
           link_clases << "app-table__sort-link--#{opt[:sort_direction]}" if opt[:sort_direction]
           str = link_to str, opt[:href], class: link_clases if opt[:href]
-          tag.th str, class: classes, scope: opt[:scope] ? opt[:scope] : "col"
+          tag.th str, class: classes, scope: opt[:scope] || "col"
         end
 
         def cell(str, opt = {})

data/lib/govuk_publishing_components/app_helpers/taxon_breadcrumbs.rb

@@ -52,7 +52,7 @@ module GovukPublishingComponents
         end
 
         def parent_taxon
-          @_parent_taxon ||= begin
+          @parent_taxon ||= begin
             parent_content_item = content_item.dig("links", "parent_taxons", 0)
 
             ContentItem.new(parent_content_item) unless parent_content_item.nil?

data/lib/govuk_publishing_components/presenters/content_item.rb

@@ -15,17 +15,18 @@ module GovukPublishingComponents
       def parent
         parent_item = content_store_response.dig("links", "parent", 0)
         return unless parent_item
+
         ContentItem.new(parent_item)
       end
 
       def parent_taxon
         # TODO: Determine what to do when there are multiple taxons/parents. For
         # now just display the first of each.
-        parent_taxons.sort_by(&:title).first
+        parent_taxons.min_by(&:title)
       end
 
       def parent_taxons
-        @_parent_taxons ||= begin
+        @parent_taxons ||= begin
           taxon_links
             .select { |t| phase_is_live?(t) }
             .map { |taxon| ContentItem.new(taxon) }.sort_by(&:title)

data/lib/govuk_publishing_components/presenters/curated_taxonomy_sidebar_links.rb

@@ -59,7 +59,7 @@ module GovukPublishingComponents
       end
 
       def related_content_by_taxon
-        @related_items_by_taxon ||= begin
+        @related_content_by_taxon ||= begin
           curated_related_items = @content_item.curated_taxonomy_sidebar_links.to_set
 
           @content_item.parent_taxons.each_with_object({}) do |taxon, items_by_taxon|

data/lib/govuk_publishing_components/presenters/image_card_helper.rb

@@ -23,6 +23,7 @@ module GovukPublishingComponents
 
       def is_tracking?
         return true if @href_data_attributes
+
         if @extra_links
           @extra_links.each do |link|
             return true if link[:data_attributes]

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

@@ -80,7 +80,7 @@ module GovukPublishingComponents
       def step_by_step_schemas
         # We could include `related_to_step_navs` eventually too, but initially
         # link to those that we render in the "step_by_step_nav_related" component
-        @step_by_steps ||= fetch_step_by_step_schemas
+        @step_by_step_schemas ||= fetch_step_by_step_schemas
       end
 
       def fetch_step_by_step_schemas
@@ -103,6 +103,7 @@ module GovukPublishingComponents
 
       def has_part
         return {} unless collection_pages("documents").any?
+
         {
             "hasPart" => collection_pages("documents").map { |document| HasPartSchema.new(document).structured_data }
         }
@@ -123,6 +124,7 @@ module GovukPublishingComponents
 
       def about
         return {} unless live_taxons.any?
+
         {
             "about" => linked_taxons
         }
@@ -131,6 +133,7 @@ module GovukPublishingComponents
       def live_taxons
         taxons = page.content_item.dig("links", "taxons")
         return [] unless taxons
+
         taxons.select { |taxon| taxon["phase"] == "live" }
       end
 

data/lib/govuk_publishing_components/presenters/page_with_step_by_step_navigation.rb

@@ -31,6 +31,7 @@ module GovukPublishingComponents
 
       def show_related_links?
         return true if active_step_by_step?
+
         step_navs.any? && step_navs.count < 5
       end
 
@@ -86,6 +87,7 @@ module GovukPublishingComponents
 
       def current_step_nav
         return active_step_by_step if active_step_by_step?
+
         step_navs.first
       end
 

data/lib/govuk_publishing_components/presenters/related_navigation_helper.rb

@@ -153,12 +153,14 @@ module GovukPublishingComponents
 
       def related_mainstream_content
         return [] unless @content_item["document_type"] == "detailed_guide"
+
         content = link_group("related_mainstream_content")
         build_links_for_sidebar(content)
       end
 
       def related_guides
         return [] unless @content_item["document_type"] == "detailed_guide"
+
         guides = link_group("related_guides")
         build_links_for_sidebar(guides)
       end

data/lib/govuk_publishing_components/presenters/step_by_step_nav_helper.rb

@@ -95,6 +95,7 @@ module GovukPublishingComponents
       def link_href(active, href)
         return "#content" if active
         return href if external_url?(href)
+
         link_with_step_nav_query_parameter(href)
       end
 
@@ -105,6 +106,7 @@ module GovukPublishingComponents
       def link_with_step_nav_query_parameter(href)
         step_nav_content_id = @options[:step_nav_content_id]
         return href if step_nav_content_id.blank?
+
         uri = URI.parse(href)
         exisiting_query_params = uri.query.present? ? CGI.parse(uri.query) : {}
         new_query_params = exisiting_query_params.merge("step-by-step-nav" => step_nav_content_id)

data/lib/govuk_publishing_components/presenters/subscription_links_helper.rb

@@ -13,11 +13,13 @@ module GovukPublishingComponents
 
       def email_signup_link_text
         return @local_assigns[:email_signup_link_text] if @local_assigns[:email_signup_link_text]
+
         I18n.t("govuk_component.subscription_links.email_signup_link_text", default: "Get email alerts")
       end
 
       def feed_link_text
         return @local_assigns[:feed_link_text] if @local_assigns[:feed_link_text]
+
         I18n.t("govuk_component.subscription_links.feed_link_text", default: "Subscribe to feed")
       end
 
@@ -31,6 +33,7 @@ module GovukPublishingComponents
 
       def feed_link
         return "#" if feed_link_box_value
+
         @local_assigns[:feed_link]
       end
 

data/lib/govuk_publishing_components/presenters/taxonomy_list_helper.rb

@@ -14,7 +14,7 @@ module GovukPublishingComponents
             image_src: image_card[:image][:url],
             image_alt: image_card[:image][:alt],
             heading_level: image_card[:link][:heading_level],
-            href_data_attributes: (image_card[:link][:data_attributes] if image_card[:link][:data_attributes])
+            href_data_attributes: image_card[:link][:data_attributes]
           }
         end
       end

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = '12.11.0'.freeze
+  VERSION = '12.12.0'.freeze
 end

data/lib/tasks/govuk_publishing_components_tasks.rake

@@ -1,4 +1,3 @@
-
 namespace :component do
   desc 'warns if component view files exist without corresponding documentation'
   task :validate_documentation_exists do

metadata

@@ -1,85 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 12.11.0
+  version: 12.12.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-21 00:00:00.000000000 Z
+date: 2018-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: govuk_app_config
+  name: govspeak
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.3
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: govuk_app_config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: sass-rails
+  name: govuk_frontend_toolkit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.4
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.4
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: govuk_frontend_toolkit
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.0.1
 - !ruby/object:Gem::Dependency
-  name: govspeak
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rouge
   requirement: !ruby/object:Gem::Requirement
@@ -95,75 +95,89 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.4
 - !ruby/object:Gem::Dependency
-  name: govuk-lint
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: 2.14.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: 2.14.4
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: foreman
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '0.64'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '0.64'
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: gds-api-adapters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: govuk-lint
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.4
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.4
+        version: '3.3'
 - !ruby/object:Gem::Dependency
-  name: poltergeist
+  name: govuk_schemas
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: jasmine
   requirement: !ruby/object:Gem::Requirement
@@ -179,61 +193,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.4.0
 - !ruby/object:Gem::Dependency
-  name: uglifier
+  name: poltergeist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.16.0
 - !ruby/object:Gem::Dependency
-  name: foreman
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.64'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.64'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
-  name: gds-api-adapters
+  name: uglifier
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: govuk_schemas
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -248,20 +262,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.1
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement