govuk_schemas 4.5.0 → 4.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7843ee3adf4523d3d0a0a8c722f5ae3175edaf3a4d1ee248a4fdafee9b596cf
-  data.tar.gz: b04e4942d146c69782e5b0e70f2d441e0f4aa6822afa054ad78d77cd40aaab7f
+  metadata.gz: b56e593e5917f8ddee82d27bb4e446b485cd42d7e8fdd1efb7490ffd2c644f70
+  data.tar.gz: 4f4af57bb338fdf2f28d17094c3d2c027eafc550a5dac0053754aa1026821d44
 SHA512:
-  metadata.gz: 14d5fb78761952ed355573bfd62c5cef13d2b723011a7bad969c5cf43926231e8a02af778aadcc514e73af3137703fa950b11264b90ac5111192c252f567f1f6
-  data.tar.gz: 6e13df6f72f725fc504fb4151ca849dd2faeeae26c7d0c3f16f923ce3eec218293d3f66642d9237634c9666c481731f018b47df739ec8719929c82c1429b47dc
+  metadata.gz: e1293b1587fca1140157c6d774b5d26fb1a1fdb6365ad47b5582ac8178fa3bcef85dfe97b2c64ca597cf2aa6f1a44b25fdc663ad39bf510072338edee8a1be02
+  data.tar.gz: d9d84be3bdeff138ba5424561b488bec0c5c722abd25e2463b5b3eca7ef90c53b8a89c14b8faacef3b07588a213bbbd4367a8dfe761829da9c7bf1ad4e2a4faa

data/.github/dependabot.yml

@@ -4,3 +4,7 @@ updates:
     directory: /
     schedule:
       interval: daily
+  - package-ecosystem: "github-actions"
+    directory: /
+    schedule:
+      interval: daily

data/.github/workflows/ci.yml

@@ -1,4 +1,14 @@
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+  workflow_dispatch:
+    inputs:
+      ref:
+        description: 'The branch, tag or SHA to checkout'
+        default: main
+        type: string
 
 jobs:
   # This matrix job runs the test suite against multiple Ruby versions
@@ -7,15 +17,17 @@ jobs:
       fail-fast: false
       matrix:
         # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
-        ruby: [ 2.7, '3.0', 3.1 ]
+        ruby: ['3.0', 3.1, 3.2]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ inputs.ref || github.ref }}
       - name: Clone content-schemas
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: alphagov/publishing-api
-          ref: deployed-to-production
+          ref: main
           path: tmp/publishing-api
       - uses: ruby/setup-ruby@v1
         with:
@@ -39,6 +51,6 @@ jobs:
     if: ${{ github.ref == 'refs/heads/main' }}
     permissions:
       contents: write
-    uses: alphagov/govuk-infrastructure/.github/workflows/publish-rubygem.yaml@main
+    uses: alphagov/govuk-infrastructure/.github/workflows/publish-rubygem.yml@main
     secrets:
       GEM_HOST_API_KEY: ${{ secrets.ALPHAGOV_RUBYGEMS_API_KEY }}

data/.gitignore

@@ -1,7 +1,5 @@
 /.bundle/
-/.yardoc
 /Gemfile.lock
-/_yardoc/
 /coverage/
 /doc/
 /pkg/

data/.rubocop.yml

@@ -1,6 +1,3 @@
 inherit_gem:
   rubocop-govuk:
     - config/default.yml
-
-AllCops:
-  TargetRubyVersion: 2.6

data/.ruby-version

@@ -1 +1 @@
-2.7.6
+3.0.5

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 4.6.0
+
+* Drop support for Ruby 2.7.
+* Fix guidance on fixing a regex issue to reference correct filename.
+* Add support for `^[1-9][0-9]{3}$` regex to resolve exceptions randomly generating specialist_documents.
+
 # 4.5.0
 
 General support for content schemas in publishing api:

data/README.md

@@ -22,12 +22,6 @@ Make sure you have `publishing-api` cloned in a sibling directory:
 bundle exec rake
 ```
 
-### Documentation
-
-To run a Yard server locally to preview documentation, run:
-
-    $ bundle exec yard server --reload
-
 ## License
 
-The gem is available as open source under the terms of the [MIT License](LICENSE.md).
+The gem is available as open source under the terms of the [MIT License](LICENCE).

data/govuk_schemas.gemspec

@@ -19,14 +19,13 @@ Gem::Specification.new do |spec|
   spec.require_paths = %w[lib]
 
   # This should be kept in sync with the json-schema version of publishing-api.
-  spec.add_dependency "json-schema", ">= 2.8", "< 3.1"
+  spec.add_dependency "json-schema", ">= 2.8", "< 4.1"
 
   spec.add_development_dependency "climate_control"
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.4"
-  spec.add_development_dependency "rubocop-govuk", "~> 4.0"
-  spec.add_development_dependency "yard", "~> 0.8"
+  spec.add_development_dependency "rubocop-govuk", "4.10.0"
 
-  spec.required_ruby_version = ">= 2.6"
+  spec.required_ruby_version = ">= 3.0"
 end

data/lib/govuk_schemas/random_content_generator.rb

@@ -84,6 +84,8 @@ module GovukSchemas
         Date.today.iso8601
       when "^(0[0-9]|1[0-9]|2[0-3]):[0-5][0-9]$"
         Time.now.strftime("%H:%m")
+      when "^[1-9][0-9]{3}$"
+        rand(1000...9999).to_s
       when "^#.+$"
         anchor
       when "[a-z-]"
@@ -99,17 +101,16 @@ module GovukSchemas
       when '[a-z0-9\-_]'
         "#{hex}-#{hex}"
       else
-        raise <<-DOC
+        raise <<~DOC
           Don't know how to generate random string for pattern #{pattern.inspect}
 
-          This propably means you've introduced a new regex in  publishing api.
-          Because it's very hard to generate a valid string from a regex alone,
-          we have to specify a method to generate random data for each regex in
-          the schemas.
+          This probably means you've introduced a new regex in to a content
+          schema in Publishing API. Because it's very hard to generate a valid
+          string from a regex alone, we have to specify a method to generate
+          random data for each regex in the schemas.
 
-          To fix this:
-
-          - Add your regex to `lib/govuk_schemas/random.rb`
+          This can be fixed by adding your regex to `lib/govuk_schemas/random_content_generator.rb`
+          in https://github.com/alphagov/govuk_schemas
         DOC
       end
     end

data/lib/govuk_schemas/validator.rb

@@ -38,7 +38,7 @@ module GovukSchemas
 
     def humanized_error(message)
       message.gsub("The property '#/'", "The item")
-             .gsub(/in schema [0-9a-f\-]+/, "")
+             .gsub(/in schema [0-9a-f-]+/, "")
              .strip
     end
 

data/lib/govuk_schemas/version.rb

@@ -1,4 +1,4 @@
 module GovukSchemas
   # @private
-  VERSION = "4.5.0".freeze
+  VERSION = "4.6.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_schemas
 version: !ruby/object:Gem::Version
-  version: 4.5.0
+  version: 4.6.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-23 00:00:00.000000000 Z
+date: 2023-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema
@@ -19,7 +19,7 @@ dependencies:
         version: '2.8'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '2.8'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: climate_control
   requirement: !ruby/object:Gem::Requirement
@@ -90,30 +90,16 @@ dependencies:
   name: rubocop-govuk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 4.10.0
 description: Gem to generate test data based on GOV.UK content schemas
 email:
 - govuk-dev@digital.cabinet-office.gov.uk
@@ -130,7 +116,7 @@ files:
 - ".yardopts"
 - CHANGELOG.md
 - Gemfile
-- LICENSE.md
+- LICENCE
 - README.md
 - Rakefile
 - bin/console
@@ -158,14 +144,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.13
 signing_key: 
 specification_version: 4
 summary: Gem to generate test data based on GOV.UK content schemas