govuk_publishing_components 21.35.0 → 21.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c53e314e8f0deaf62d18bee2d0ac626c6013c53537f47b35df43878396e51c1c
-  data.tar.gz: 1ec7190995a08c1b178d43fbdc7a8b872de750557cee746dfdcdcb0dc1500608
+  metadata.gz: 72ef6e6f7e0ef3a11b274d2fb91b93c0c3d793869db14f62c40bdd3442b1d75a
+  data.tar.gz: 7e26ac63476c3d175219f7cb841008ededf58bb9671a6fc34b4e5e870406cafb
 SHA512:
-  metadata.gz: fee872f0ae59164b19a1b344b8011615607a03cfd14b70e96a421af0eb36f6889aca3fec2468f419b247080d36d449137ab13f0c4248318123798348073542dc
-  data.tar.gz: 58a469a52b1f85a5201958dd4810171bcb6014340a2ac4a84a317789845222cbdcf215fa9e123bbc55b2ae5e2420daf35587427463b5d26fd846799432cda2f3
+  metadata.gz: 16f44b2add40459adff96288055e71100ab28ac8ac1fcbba4ed59b50b9c80394c691db73e6eb88ff9e308c970e4d9557648f7a334b91a1f0f8fa0f9ea08c0779
+  data.tar.gz: 6b9424c82c0f4c040f8b23064e02d1c9293f1aec8c28e74a97f7f26ebb9268e5ea73f605063755aa4f9fcfd3c6f470e3b8f3b8826e3e25f2df894f8cc04b034b

data/app/assets/stylesheets/component_guide/application.scss

@@ -7,8 +7,6 @@
 @import "govuk/helpers/all";
 @import "govuk/core/all";
 
-@import "govuk_publishing_components/all_components";
-
 $gem-guide-border-width: 1px;
 
 .component-list {

data/app/controllers/govuk_publishing_components/component_guide_controller.rb

@@ -3,6 +3,8 @@ module GovukPublishingComponents
     append_view_path File.join(Rails.root, "app", "views", GovukPublishingComponents::Config.component_directory_name)
 
     def index
+      @application_path = Rails.root
+      @component_gem_path = Gem.loaded_specs["govuk_publishing_components"].full_gem_path
       @component_docs = component_docs.all
       @gem_component_docs = gem_component_docs.all
       @components_in_use_docs = components_in_use_docs.used_in_this_app
@@ -44,7 +46,7 @@ module GovukPublishingComponents
       additional_files = "@import 'govuk_publishing_components/govuk_frontend_support';\n"
       additional_files << "@import 'govuk_publishing_components/component_support';\n" unless print_styles
 
-      components = components_in_use
+      components = components_in_use("#{@application_path}/app/views/")
       extra_components = []
 
       components.each do |component|
@@ -53,11 +55,12 @@ module GovukPublishingComponents
       end
 
       components << extra_components.compact
+      components << components_used_by_component_guide.compact
       components = components.flatten.uniq.sort
 
       components.map { |component|
         "@import 'govuk_publishing_components/components/#{print_path}_#{component.gsub('_', '-')}';" if component_has_sass_file(component.gsub("_", "-"), print_styles)
-      }.join("\n").squeeze("\n").prepend(additional_files)
+      }.compact.uniq.sort.join("\n").squeeze("\n").prepend(additional_files)
     end
 
   private
@@ -71,13 +74,13 @@ module GovukPublishingComponents
     end
 
     def components_in_use_docs
-      @components_in_use_docs ||= ComponentDocs.new(gem_components: true, limit_to: components_in_use)
+      @components_in_use_docs ||= ComponentDocs.new(gem_components: true, limit_to: components_in_use("#{@application_path}/app/views/"))
     end
 
-    def components_in_use
+    def components_in_use(path)
       matches = []
 
-      files = Dir["#{Rails.root}/app/views/**/*.html.erb"]
+      files = Dir[path + "**/*.html.erb"]
       files.each do |file|
         data = File.read(file)
         matches << data.scan(/(govuk_publishing_components\/components\/[a-z_-]+)/)
@@ -88,11 +91,11 @@ module GovukPublishingComponents
 
     def component_has_sass_file(component, print_styles)
       print_path = "print/" if print_styles
-      Pathname.new(__dir__ + "/../../assets/stylesheets/govuk_publishing_components/components/#{print_path}_#{component}.scss").exist?
+      Pathname.new(@component_gem_path + "/app/assets/stylesheets/govuk_publishing_components/components/#{print_path}_#{component}.scss").exist?
     end
 
     def components_within_component(component)
-      data = File.read(Pathname.new(__dir__ + "/../../views/govuk_publishing_components/components/_#{component}.html.erb"))
+      data = File.read(@component_gem_path + "/app/views/govuk_publishing_components/components/_#{component}.html.erb")
       match = data.scan(/(govuk_publishing_components\/components\/[a-z_-]+)/)
       match.flatten.uniq.map(&:to_s).sort.map { |m| m.gsub("govuk_publishing_components/components/", "") }
     end
@@ -110,5 +113,10 @@ module GovukPublishingComponents
         h[:url] = component_doc_path(component_doc.id) if component_example
       end
     end
+
+    def components_used_by_component_guide
+      components = components_in_use("#{@component_gem_path}/app/views/govuk_publishing_components/component_guide/")
+      components << components_in_use("#{@component_gem_path}/app/views/layouts/")
+    end
   end
 end

data/app/models/govuk_publishing_components/shared_accessibility_criteria.rb

@@ -13,6 +13,7 @@ Links in the component must:
 - be usable with touch
 - be usable with [voice commands](https://www.w3.org/WAI/perspectives/voice.html)
 - have visible text
+- have meaningful text
       "
     end
   end

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

@@ -6,12 +6,8 @@ body: |
   If the examples below are not showing the banner, make sure the `cookies_preferences_set` cookie is not present or is set to false.
 accessibility_criteria: |
   Text in the cookie banner must be clear and unambiguous and should provide a way to dismiss the message.
-
-  Links in the component must:
-
-  - accept focus
-  - be focusable with a keyboard
-  - indicate when they have focus
+shared_accessibility_criteria:
+  - link
 accessibility_excluded_rules:
   - 'duplicate-id' # a banner should have a unique id for a given page. However, this page contains multiple examples of the banner with the same id.
 examples:

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

@@ -7,16 +7,6 @@ accessibility_criteria: |
 
   - have a text contrast ratio higher than 4.5:1 against the background colour to meet [WCAG AA](https://www.w3.org/TR/WCAG20/#visual-audio-contrast-contrast)
 
-  Links in the Footer must:
-
-  - accept focus
-  - be focusable with a keyboard
-  - be usable with a keyboard
-  - indicate when they have focus
-  - change in appearance when touched (in the touch-down state)
-  - change in appearance when hovered
-  - have visible text
-
   Images in the Footer must:
 
   - be presentational when linked to from accompanying text "Open Government Licence (OGL) icon".
@@ -36,6 +26,8 @@ accessibility_criteria: |
     Assumption made is that is most predictable for users of assistive technologies.
     The spec indicates that `contentinfo` is useful for "Examples of information included in this region of the page are copyrights and links to privacy statements.", which may indicate that it might be better placed around the 'meta' section of this component.
     Should be challenged if user research indicates this is an issue.
+shared_accessibility_criteria:
+  - link
 accessibility_excluded_rules:
   - landmark-contentinfo-is-top-level # The footer element can not be top level in the examples
 examples:

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

@@ -48,16 +48,6 @@ accessibility_criteria: |
 
   - have a text contrast ratio higher than 4.5:1 against the background colour to meet [WCAG AA](https://www.w3.org/TR/WCAG20/#visual-audio-contrast-contrast)
 
-  Links in the Header must:
-
-  - accept focus
-  - be focusable with a keyboard
-  - be usable with a keyboard
-  - indicate when they have focus
-  - change in appearance when touched (in the touch-down state)
-  - change in appearance when hovered
-  - have visible text
-
   Images in the Header must:
 
   - be presentational when linked to from accompanying text (crown icon).
@@ -65,3 +55,5 @@ accessibility_criteria: |
   Landmarks and Roles in the Header should:
 
   - have a role of `banner` at the root of the component (<header>) ([ARIA 1.1](https://www.w3.org/TR/wai-aria-1.1/#banner))
+shared_accessibility_criteria:
+  - link

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "21.35.0".freeze
+  VERSION = "21.36.0".freeze
 end

metadata

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