govuk_admin_template 6.9.0 → 6.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e75f271807c94207f7e9842d7ac03a4f5fc857533a8d2aeee7be6f0645e8d07
-  data.tar.gz: 9e75c7162d072ed39a29ce90cd7037ca3aad8b3890a11f4ab93e9f28939cd480
+  metadata.gz: 31116fe6665d9390c1fcbcfd92d4553769020e0630928497506aaed67a733d6d
+  data.tar.gz: 989a96a1155ab43be812e34132dfee491c9f764bd5bf3281e00f5ae5bc238b52
 SHA512:
-  metadata.gz: a11f7e71d2ec53e1f704714a5996478153077c9282c41850ee6256faa6a776bec444436824027d50a9cb1a2b3bcfb3703d52ccd799ac58c80de6118638a65758
-  data.tar.gz: 748d12a8f4319a5cbfd4c716336141b315088add35e5ce8d57b9d9e710a0e0b80c48ae204a657997fcf4db2bf6b35edc0f17bccf71162399719c492dddf867ab
+  metadata.gz: c3309b4b10ae3325d88d9db6ab72588eeb06dfc811b8dbecf5e467d4a81c578501b7ad9268483572a3dab4fa0765ea6d30c7b9bd60b3c155b4789f20fbdf3c25
+  data.tar.gz: a20aa24bc3b1d3f3f9b0344a07185e3291c79dc1206f86c7f7d6eb8a22a4566f453b87c4b2693b59da6bd2fbd4422a7409f8bd4efdeb54a26314bb52f0eeeb50

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# 6.10.0
+
+* Remove Priority list from govspeak help example
+
+# 6.9.2
+
+* Fix providing gem internal Rake tasks to applications embedding this gem as an engine.
+
+# 6.9.1
+
+* Fix broken Rails 6 compatibility: use `Date#to_formatted_s` instead of `Date#to_fs`
+
 # 6.9.0
 
 * Rails 7 compatibility: use `Time#to_fs` instead of deprecated use of `Time#to_s`

data/README.md

@@ -274,6 +274,18 @@ yarn run jasmine:browser
 yarn run jasmine:ci
 ```
 
+### Testing against different Rails versions
+
+The CI pipeline is configured to test this gem against multiple versions of Rails.
+
+Each Rails version has a corresponding Gemfile located in the [gemfiles](gemfiles/) directory. And the CI pipeline defines a [matrix of Gemfiles](https://github.com/alphagov/govuk_admin_template/blob/8f53865fa3d33f741642783f9bfcaefc201c3751/.github/workflows/ci.yml#L13) to test against.
+
+It's also possible to run tests against multiple Rails versions locally.
+
+1. Run `export BUNDLE_GEMFILE="gemfiles/rails_X.gemfile"` where `X` is the version to test against.
+  This tells Bundler which Gemfile to use.
+2. Run `bundle install` and then `bundle exec rake` as usual.
+
 ## Publishing
 
 Version bumps will automatically update RubyGems.org.

data/app/views/govuk_admin_template/_govspeak_help.html.erb

@@ -80,23 +80,6 @@
   (to indent, add 2 spaces)</pre>
   </div>
 
-  <h3>
-    <a data-toggle="collapse" href="#govspeak-priority-list">
-      Priority list
-    </a>
-  </h3>
-  <div class="collapse" id="govspeak-priority-list">
-    <p>
-      You can create a list which shows only the first n items (including attachments),
-      with a link to open the others, eg to show the first item:
-    </p>
-
-    <pre>$PriorityList:1
-  * item 1
-  * item 2
-  * item 3</pre>
-  </div>
-
   <h3>
     <a data-toggle="collapse" href="#govspeak-legislative-list">
       Legislative list

data/app/views/govuk_admin_template/style_guide/index.html.erb

@@ -192,13 +192,13 @@
     <blockquote>
       <dl class="remove-bottom-margin">
         <dt class="add-label-margin"><code>:govuk_date</code></dt>
-        <dd><%= halloween.to_fs(:govuk_date) %><br />
-          <%= halloween.to_time.to_fs(:govuk_date) %></dd>
+        <dd><%= halloween.to_formatted_s(:govuk_date) %><br />
+          <%= halloween.to_time.to_formatted_s(:govuk_date) %></dd>
         <dt class="add-top-margin add-label-margin"><code>:govuk_date_short</code></dt>
-        <dd><%= halloween.to_fs(:govuk_date_short) %><br />
-          <%= halloween.to_time.to_fs(:govuk_date_short) %></dd>
+        <dd><%= halloween.to_formatted_s(:govuk_date_short) %><br />
+          <%= halloween.to_time.to_formatted_s(:govuk_date_short) %></dd>
         <dt class="add-top-margin add-label-margin"><code>:govuk_time</code></dt>
-        <dd><%= halloween.to_time.to_fs(:govuk_time) %></dd>
+        <dd><%= halloween.to_time.to_formatted_s(:govuk_time) %></dd>
       </dl>
     </blockquote>
   </section>

data/lib/govuk_admin_template/version.rb

@@ -1,3 +1,3 @@
 module GovukAdminTemplate
-  VERSION = "6.9.0".freeze
+  VERSION = "6.10.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_admin_template
 version: !ruby/object:Gem::Version
-  version: 6.9.0
+  version: 6.10.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-21 00:00:00.000000000 Z
+date: 2022-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
@@ -86,28 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: rubocop-govuk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: 4.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: 4.6.0
 - !ruby/object:Gem::Dependency
   name: sassc-rails
   requirement: !ruby/object:Gem::Requirement
@@ -184,9 +184,6 @@ files:
 - lib/govuk_admin_template/simple_form.rb
 - lib/govuk_admin_template/version.rb
 - lib/govuk_admin_template/view_helpers.rb
-- lib/tasks/jasmine.rake
-- lib/tasks/lint.rake
-- lib/tasks/sass/check.rake
 homepage: https://github.com/alphagov/govuk_admin_template
 licenses: []
 metadata: {}
@@ -205,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.9
+rubygems_version: 3.3.19
 signing_key: 
 specification_version: 4
 summary: Styles, scripts and templates for GOV.UK admin applications

data/lib/tasks/jasmine.rake

@@ -1,4 +0,0 @@
-desc "Run Jasmine tests"
-task jasmine: :environment do
-  sh "yarn run jasmine:ci"
-end

data/lib/tasks/lint.rake

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-desc "Lint files"
-task "lint" => :environment do
-  sh "rubocop --format clang"
-end

data/lib/tasks/sass/check.rake

@@ -1,52 +0,0 @@
-UNGUARDED_URL_USAGE  = /\surl\(/.freeze
-ABSOLUTE_ASSET_USAGE = /(?:image-path|image-url|asset-path|asset-url)\(["']\/assets/.freeze
-
-namespace :sass do
-  desc "Check all SCSS for 404-creating problems, takes place of govuk-lint"
-  task check: :environment do
-    scss_files = File.expand_path(
-      "../../app/assets/stylesheets/**/*.scss", __dir__
-    )
-
-    matching_lines = Dir[scss_files].each_with_object([]) do |scss_file, matching|
-      File.readlines(scss_file).each_with_index do |line, number|
-        matching << "Unguarded url usage: #{scss_file}:#{number + 1}"    if line =~ UNGUARDED_URL_USAGE
-        matching << "Absolute /assets usage: #{scss_file}:#{number + 1}" if line =~ ABSOLUTE_ASSET_USAGE
-      end
-    end
-
-    if matching_lines.any?
-      raise <<~MSG
-
-        One or more problems exist:
-
-        Unguarded url usage
-        -------------------
-
-          Do not use instances of url(...) to refer to images within this gem.
-          Prefer the SASS function image-url. Unguarded url references won't work in
-          Rails 4 and up due to MD5 hashes in asset filenames. Your asset will 404 in
-          production Rails 4 apps.
-
-        Absolute /assets usage
-        ----------------------
-
-          When using any of the image/asset helpers, don't refer to /assets absolutely.
-          For example,
-
-            image-url('/assets/govuk_admin_template/header-crown.png')
-
-          should instead be
-
-            image-url('govuk_admin_template/header-crown.png')
-
-          If Sprockets can't find the image on precompilation, it won't rewrite the
-          URL and will pass it through unaltered. This usually means it will 404.
-
-        Problems:
-              #{matching_lines.join("\n  ")}
-
-      MSG
-    end
-  end
-end