govuk_publishing_components 21.59.0 → 21.60.0

data/app/assets/stylesheets/govuk_publishing_components/components/_table.scss

@@ -37,28 +37,26 @@ $table-row-even-background-colour: govuk-colour("light-grey", $legacy: "grey-4")
       padding-right: $sort-link-arrow-size;
       color: $govuk-link-colour;
       text-decoration: none;
+    }
 
-      &:focus {
-        @include govuk-focused-text;
-      }
-
-      &::after {
-        content: "";
-        position: absolute;
-        top: 5px;
-        right: 0;
-
-        @include govuk-shape-arrow($direction: up, $base: $sort-link-arrow-size-small, $display: block);
-      }
+    .app-table__sort-link:focus {
+      @include govuk-focused-text;
+    }
 
-      &::before {
-        content: "";
-        position: absolute;
-        top: 13px;
-        right: 0;
+    .app-table__sort-link:after {
+      content: "";
+      position: absolute;
+      top: 5px;
+      right: 0;
+      @include govuk-shape-arrow($direction: up, $base: $sort-link-arrow-size-small, $display: block);
+    }
 
-        @include govuk-shape-arrow($direction: down, $base: $sort-link-arrow-size-small, $display: block);
-      }
+    .app-table__sort-link:before {
+      content: "";
+      position: absolute;
+      top: 13px;
+      right: 0;
+      @include govuk-shape-arrow($direction: down, $base: $sort-link-arrow-size-small, $display: block);
     }
   }
 
@@ -81,12 +79,12 @@ $table-row-even-background-colour: govuk-colour("light-grey", $legacy: "grey-4")
       }
     }
 
-    .app-table__sort-link--ascending::before,
-    .app-table__sort-link--descending::before {
+    .app-table__sort-link--ascending:before,
+    .app-table__sort-link--descending:before {
       content: none;
     }
 
-    .app-table__sort-link--ascending::after {
+    .app-table__sort-link--ascending:after {
       content: "";
       position: absolute;
       top: $sort-link-arrow-spacing;
@@ -96,7 +94,7 @@ $table-row-even-background-colour: govuk-colour("light-grey", $legacy: "grey-4")
       @include govuk-shape-arrow($direction: up, $base: $sort-link-arrow-size, $display: inline-block);
     }
 
-    .app-table__sort-link--descending::after {
+    .app-table__sort-link--descending:after {
       content: "";
       position: absolute;
       top: $sort-link-arrow-spacing;
@@ -105,7 +103,6 @@ $table-row-even-background-colour: govuk-colour("light-grey", $legacy: "grey-4")
 
       @include govuk-shape-arrow($direction: down, $base: $sort-link-arrow-size, $display: inline-block);
     }
-
   }
 
   .govuk-table__row {

data/app/assets/stylesheets/govuk_publishing_components/components/_tabs.scss

@@ -11,25 +11,21 @@
 // We have some styles within GOVUK (.content-block) which can leak into the list styles for this component.
 // These styles are defined in Static: https://github.com/alphagov/static/blob/a815620cada7ea1c65428c1c3b3ac4dbe28977bf/app/assets/stylesheets/helpers/_text.scss
 // This sets more specific selectors so those unwanted styles are overidden
-// scss-lint:disable QualifyingElement
-// sass-lint:disable no-qualifying-elements
-ul.govuk-tabs__list {
+ul.govuk-tabs__list { // stylelint-disable-line selector-no-qualifying-type
   margin: 0;
   padding: 0;
   list-style: none;
   @include govuk-responsive-margin(6, "bottom");
 }
 
-li.govuk-tabs__list-item {
+li.govuk-tabs__list-item { // stylelint-disable-line selector-no-qualifying-type
   margin-left: govuk-spacing(5);
 }
 
-.js-enabled {
+.js-enabled { // stylelint-disable-line no-duplicate-selectors
   @include govuk-media-query($from: tablet) {
-    ul.govuk-tabs__list {
+    ul.govuk-tabs__list { // stylelint-disable-line selector-no-qualifying-type
       margin-bottom: 0;
     }
   }
 }
-// scss-lint:enable QualifyingElement
-// sass-lint:enable no-qualifying-elements

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_attachment.scss

@@ -5,6 +5,8 @@
 // - alphagov/whitehall: ✔︎
 // - alphagov/govspeak: ✔︎
 
+// stylelint-disable max-nesting-depth
+
 .gem-c-govspeak {
 
   // Scope attachment and attachment-link component styles to gem-c-govspeak

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_button.scss

@@ -1,7 +1,6 @@
 @import "govuk/components/button/button";
 
-// scss-lint:disable PlaceholderInExtend
-// sass-lint:disable placeholder-in-extend
+// stylelint-disable scss/at-extend-no-missing-placeholder
 .gem-c-govspeak {
   .gem-c-button {
     @extend .govuk-button;
@@ -11,5 +10,3 @@
     @extend .govuk-button--start;
   }
 }
-// sass-lint:enable placeholder-in-extend
-// scss-lint:enable PlaceholderInExtend

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_charts.scss

@@ -9,6 +9,8 @@
 // adapted from magna-charta example stylesheet
 // https://github.com/alphagov/magna-charta/blob/master/demo/stylesheets/magna-charta.css
 
+// stylelint-disable max-nesting-depth
+
 .gem-c-govspeak {
   // DEFAULT CHART STYLES
 
@@ -266,10 +268,6 @@
     text-align: left;
   }
 
-  .mc-chart.mc-negative .mc-td.mc-key-cell {
-    padding-right: 25px;
-  }
-
   .mc-toggle-link {
     display: block;
     margin-top: 30px;

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_contact.scss

@@ -5,6 +5,8 @@
 // - alphagov/whitehall: ✔︎
 // - alphagov/govspeak: ✔︎
 
+// stylelint-disable max-nesting-depth
+
 .gem-c-govspeak {
   // .address is used by the `$A` markdown pattern
   .address,

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_footnotes.scss

@@ -9,6 +9,8 @@
 // - alphagov/whitehall: ✔︎
 // - alphagov/govspeak: ✔︎
 
+// stylelint-disable max-nesting-depth
+
 .gem-c-govspeak {
   .footnotes {
     border-top: 1px solid govuk-colour("mid-grey", $legacy: "grey-2");

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_highlight-answer.scss

@@ -1,3 +1,5 @@
+// stylelint-disable max-nesting-depth
+
 $highlight-answer-bg-color: govuk-colour("green");
 $highlight-answer-color: govuk-colour("white");
 

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_place.scss

@@ -1,4 +1,4 @@
-.gem-c-govspeak  .place {
+.gem-c-govspeak .place {
   margin: 1.5em 0;
   border-bottom: solid 1px govuk-colour("mid-grey", $legacy: "grey-2");
   padding-bottom: 1.5em;

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_typography.scss

@@ -9,6 +9,8 @@
 // - alphagov/whitehall: ✔︎
 // - alphagov/govspeak: ✔︎
 
+// stylelint-disable max-nesting-depth
+
 .gem-c-govspeak {
   @include markdown-typography;
 

data/app/assets/stylesheets/govuk_publishing_components/components/helpers/_markdown-typography.scss

@@ -105,7 +105,7 @@
   }
 
   li {
-    margin: 0 0 5px 0;
+    margin: 0 0 5px;
     padding: 0;
 
     p {

data/app/assets/stylesheets/govuk_publishing_components/components/print/_govspeak.scss

@@ -1,3 +1,5 @@
+// stylelint-disable max-nesting-depth
+
 .gem-c-govspeak {
   .media-player {
     display: none;

data/app/assets/stylesheets/govuk_publishing_components/components/print/_step-by-step-nav-header.scss

@@ -1,5 +1,3 @@
-// scss-lint:disable SelectorFormat
-
 .gem-c-step-nav-header__part-of {
   display: block;
 }
@@ -11,5 +9,3 @@
 .gem-c-step-nav-header__skip-link {
   display: none;
 }
-
-// scss-lint:enable SelectorFormat

data/app/assets/stylesheets/govuk_publishing_components/components/print/_step-by-step-nav.scss

@@ -1,5 +1,3 @@
-// scss-lint:disable SelectorFormat
-
 $grey-2: #bfc1c3;
 $white: #ffffff;
 $number-circle-size: 35px;
@@ -40,6 +38,7 @@ $stroke-width: 3px;
 }
 
 .gem-c-step-nav__step {
+  padding-left: 60px;
   position: relative;
 }
 
@@ -74,14 +73,9 @@ $stroke-width: 3px;
   padding-bottom: 1em;
 }
 
-.gem-c-step-nav__step {
-  position: relative;
-  padding-left: 60px;
-}
-
 .gem-c-step-nav__title {
   @include govuk-font(19, $weight: bold);
-  margin: 0 0 .5em 0;
+  margin: 0 0 .5em;
   padding: 0;
 }
 
@@ -120,5 +114,3 @@ $stroke-width: 3px;
 .gem-c-step-nav__circle-step-colon {
   display: none;
 }
-
-// scss-lint:enable SelectorFormat

data/app/controllers/govuk_publishing_components/audit_controller.rb

@@ -7,8 +7,8 @@ module GovukPublishingComponents
       applications = analyse_applications(File.expand_path("..", path))
       compared_data = AuditComparer.new(components.data, applications)
 
-      @applications = compared_data.data
-      @components = compared_data.gem_data
+      @applications = compared_data.applications_data || []
+      @components = compared_data.gem_data || []
     end
 
   private

data/app/controllers/govuk_publishing_components/component_guide_controller.rb

@@ -83,9 +83,9 @@ module GovukPublishingComponents
     def components_in_use
       matches = []
 
-      files = Dir["#{@application_path}/app/views/**/*.html.erb"]
+      files = Dir["#{@application_path}/app/views/**/*.erb"]
       files.concat Dir["#{@application_path}/app/**/*.rb"]
-      files.concat Dir["#{@application_path}/lib/**/*.rb"]
+      files.concat Dir["#{@application_path}/lib/**/*.{rb,erb}"]
 
       files.each do |file|
         data = File.read(file)

data/app/models/govuk_publishing_components/audit_applications.rb

@@ -3,14 +3,14 @@ module GovukPublishingComponents
     attr_reader :data
 
     def initialize(path, name)
-      templates = Dir["#{path}/app/views/**/*.html.erb"]
+      templates = Dir["#{path}/app/views/**/*.erb"]
       stylesheets = Dir["#{path}/app/assets/stylesheets/**/*.scss"]
       javascripts = Dir["#{path}/app/assets/javascripts/**/*.js"]
 
-      find_templates = /(?<=govuk_publishing_components\/components\/)[\/a-zA-Z_-]+(?=['"])/
+      find_components = /(?<=govuk_publishing_components\/components\/)[\/a-zA-Z_-]+(?=['"])/
 
       @find_all_stylesheets = /@import ["']{1}govuk_publishing_components\/all_components/
-      find_stylesheets = /(?<=@import ["']{1}govuk_publishing_components\/components\/)(?!print)+[a-zA-Z_-]+(?=['"])/
+      find_stylesheets = /(?<=@import ["']{1}govuk_publishing_components\/components\/)(?!print\/)+[a-zA-Z_-]+(?=['"])/
 
       @find_all_print_stylesheets = /@import ["']{1}govuk_publishing_components\/all_components_print/
       find_print_stylesheets = /(?<=@import ["']{1}govuk_publishing_components\/components\/print\/)[a-zA-Z_-]+(?=['"])/
@@ -18,25 +18,23 @@ module GovukPublishingComponents
       @find_all_javascripts = /\/\/[ ]*= require govuk_publishing_components\/all_components/
       find_javascripts = /(?<=require govuk_publishing_components\/components\/)[a-zA-Z_-]+/
 
-      components_in_templates = find_components(templates, find_templates, "templates") || []
+      components_in_templates = find_components(templates, find_components, "templates") || []
       components_in_stylesheets = find_components(stylesheets, find_stylesheets, "stylesheets") || []
       components_in_print_stylesheets = find_components(stylesheets, find_print_stylesheets, "print_stylesheets") || []
       components_in_javascripts = find_components(javascripts, find_javascripts, "javascripts") || []
 
-      find_ruby = /(?<=render\(["']{1}govuk_publishing_components\/components\/)[a-zA-Z_-]+/
       ruby_paths = %w[/app/helpers/ /app/presenters/ /lib/]
-
       components_in_ruby = []
       ruby_paths.each do |ruby_path|
-        components_in_ruby << find_components(Dir["#{path}#{ruby_path}**/*.rb"], find_ruby, "ruby") || []
+        components_in_ruby << find_components(Dir["#{path}#{ruby_path}**/*.{rb,erb}"], find_components, "ruby") || []
       end
-
       components_in_ruby = components_in_ruby.flatten.uniq
 
-      @data = {
-        name: name,
-        application_found: application_exists(path),
-        components_found: [
+      application_found = application_exists(path)
+      components_found = []
+
+      if application_found
+        components_found = [
           {
             location: "templates",
             components: components_in_templates,
@@ -57,7 +55,13 @@ module GovukPublishingComponents
             location: "ruby",
             components: components_in_ruby,
           },
-        ],
+        ]
+      end
+
+      @data = {
+        name: name,
+        application_found: application_found,
+        components_found: components_found,
       }
     end
 
@@ -69,6 +73,8 @@ module GovukPublishingComponents
       files.each do |file|
         src = File.read(file)
         components_found << find_match(find, src, type)
+      rescue StandardError
+        puts "File #{file} not found"
       end
 
       components_found.flatten.uniq.sort

data/app/models/govuk_publishing_components/audit_comparer.rb

@@ -1,11 +1,13 @@
 module GovukPublishingComponents
   class AuditComparer
-    attr_reader :data, :gem_data
+    attr_reader :applications_data, :gem_data
 
     def initialize(gem_data, results)
-      @gem_data = gem_data
-      @data = sort_results(results)
-      @gem_data[:components_by_application] = get_components_by_application
+      if gem_data[:gem_found]
+        @gem_data = gem_data
+        @applications_data = sort_results(results)
+        @gem_data[:components_by_application] = get_components_by_application || []
+      end
     end
 
   private
@@ -18,51 +20,58 @@ module GovukPublishingComponents
       data = []
 
       results.each do |result|
-        templates = result[:components_found].find { |c| c[:location] == "templates" }
-        stylesheets = result[:components_found].find { |c| c[:location] == "stylesheets" }
-        print_stylesheets = result[:components_found].find { |c| c[:location] == "print_stylesheets" }
-        javascripts = result[:components_found].find { |c| c[:location] == "javascripts" }
-        ruby = result[:components_found].find { |c| c[:location] == "ruby" }
-
-        @all_stylesheets = true if stylesheets[:components].include?("all")
-        @all_print_stylesheets = true if print_stylesheets[:components].include?("all")
-        @all_javascripts = true if javascripts[:components].include?("all")
-
-        templates[:components] = include_any_components_within_components(templates[:components])
-
-        warnings = []
-        warnings << warn_about_missing_components(result[:components_found])
-        warnings << warn_about_missing_assets(result[:components_found])
-        warnings = warnings.flatten
-
-        data << {
-          name: result[:name],
-          application_found: result[:application_found],
-          summary: [
-            {
-              name: "Components in templates",
-              value: templates[:components].flatten.uniq.sort.join(", "),
-            },
-            {
-              name: "Components in stylesheets",
-              value: stylesheets[:components].join(", "),
-            },
-            {
-              name: "Components in print stylesheets",
-              value: print_stylesheets[:components].join(", "),
-            },
-            {
-              name: "Components in javascripts",
-              value: javascripts[:components].join(", "),
-            },
-            {
-              name: "Components in ruby",
-              value: ruby[:components].join(", "),
-            },
-          ],
-          warnings: warnings,
-          warning_count: warnings.length,
-        }
+        if result[:application_found]
+          templates = result[:components_found].find { |c| c[:location] == "templates" }
+          stylesheets = result[:components_found].find { |c| c[:location] == "stylesheets" }
+          print_stylesheets = result[:components_found].find { |c| c[:location] == "print_stylesheets" }
+          javascripts = result[:components_found].find { |c| c[:location] == "javascripts" }
+          ruby = result[:components_found].find { |c| c[:location] == "ruby" }
+
+          @all_stylesheets = true if stylesheets[:components].include?("all")
+          @all_print_stylesheets = true if print_stylesheets[:components].include?("all")
+          @all_javascripts = true if javascripts[:components].include?("all")
+
+          templates[:components] = include_any_components_within_components(templates[:components])
+
+          warnings = []
+          warnings << warn_about_missing_components(result[:components_found])
+          warnings << warn_about_missing_assets(result[:components_found])
+          warnings = warnings.flatten
+
+          data << {
+            name: result[:name],
+            application_found: result[:application_found],
+            summary: [
+              {
+                name: "Components in templates",
+                value: templates[:components].flatten.uniq.sort.join(", "),
+              },
+              {
+                name: "Components in stylesheets",
+                value: stylesheets[:components].join(", "),
+              },
+              {
+                name: "Components in print stylesheets",
+                value: print_stylesheets[:components].join(", "),
+              },
+              {
+                name: "Components in javascripts",
+                value: javascripts[:components].join(", "),
+              },
+              {
+                name: "Components in ruby",
+                value: ruby[:components].join(", "),
+              },
+            ],
+            warnings: warnings,
+            warning_count: warnings.length,
+          }
+        else
+          data << {
+            name: result[:name],
+            application_found: result[:application_found],
+          }
+        end
       end
 
       data
@@ -147,12 +156,16 @@ module GovukPublishingComponents
 
     def get_components_by_application
       results = []
+      found_something = false
 
       @gem_data[:component_listing].each do |component|
         found_in_applications = []
 
-        @data.each do |application|
+        @applications_data.each do |application|
+          next unless application[:application_found]
+
           name = application[:name]
+          found_something = true
 
           application[:summary].each do |item|
             found_in_applications << name if item[:value].include?(component[:name])
@@ -166,7 +179,7 @@ module GovukPublishingComponents
         }
       end
 
-      results
+      results if found_something
     end
   end
 end