govuk_schemas 6.1.0 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5588184b2f2aac015bf79217e0311d165ab849fea5ef83ba4d0ce683b300ad46
-  data.tar.gz: 16b97e02ee44db9130f44cc96ef7796a5e5eb087567a0f353cbbe3d33dad2938
+  metadata.gz: 232c587a32f3faa5b2a96754859d3ec61226f8e26c84035e1dd3e169292a9d18
+  data.tar.gz: 7d7debcd13ffaedc2170121769717c1a0b47e0e6eda8f2d3ac55f13b074f5219
 SHA512:
-  metadata.gz: 18dd2ba2f2fcd59f0b45c6583aa7a78c8ea2599303bff5c4d787aef5a4d22f3631dafaab75830564068317e777e15b96c0ad9d3b8e5ac2b92bed9cfd1cd2746a
-  data.tar.gz: 4d00b406e14eb8f044d13a27e8d1a120efca36d3e4e96df59869cf9666985cbd642a335239ab2a66ec7baba79077c19a425165f6476c547db1d4699155a8d560
+  metadata.gz: ca1478bb2431b30d4d37febb2010a9f22820b3118cf3ed40730afc48d2e28dcec85d7a18a75b18b08bdc45cb74bcb3204ddef22f21d2065ebb70fa039deae432
+  data.tar.gz: bf32b71b72196432e7a67caeeb8776435305fc2979b33f971edf176c7ca8c10d7143c6c344fd8c9e91100086735406494d17fe35a947b0842d69bdaf2452ba59

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 6.2.0
+
+* Remove Faker dependency [PR](https://github.com/alphagov/govuk_schemas/pull/172)
+
+## 6.1.1
+
+* Add a new regex generator for a content block order item [PR](https://github.com/alphagov/govuk_schemas/pull/170)
+
 ## 6.1.0
 
 * Introduce a "one of everything" strategy for RandomSchemaGenerator https://github.com/alphagov/govuk_schemas/pull/168

data/README.md

@@ -22,6 +22,13 @@ Make sure you have `publishing-api` cloned in a sibling directory:
 bundle exec rake
 ```
 
+## Development
+
+In order to run the tests successfully you also need [publishing-api](https://github.com/alphagov/publishing-api) checked
+out into the same parent directory as govuk_schemas.
+
+The tests can then be run with `bundle exec rspec`.
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](LICENCE).

data/govuk_schemas.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = %w[lib]
 
-  spec.add_dependency "faker", ">= 3.4.1", "< 3.6.0"
   # This should be kept in sync with the json-schema version of publishing-api.
   spec.add_dependency "json-schema", ">= 2.8", "< 6.1"
 

data/lib/govuk_schemas/random_content_generator.rb

@@ -1,13 +1,11 @@
-require "faker"
-
 module GovukSchemas
   # @private
   class RandomContentGenerator
-    WORDS = %w[Lorem ipsum dolor sit amet consectetur adipiscing elit. Ut suscipit at mauris non bibendum. Ut ac massa est. Aenean tempor imperdiet leo vel interdum. Nam sagittis cursus sem ultricies scelerisque. Quisque porttitor risus vel risus finibus eu sollicitudin nisl aliquet. Sed sed lectus ac dolor molestie interdum. Nam molestie pellentesque purus ac vestibulum. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Suspendisse non tempor eros. Mauris eu orci hendrerit volutpat lorem in tristique libero. Duis a nibh nibh.].freeze
+    WORDS = %w[Lorem ipsum dolor sit amet consectetur adipiscing elit Ut suscipit at mauris non bibendum Ut ac massa est Aenean tempor imperdiet leo vel interdum Nam sagittis cursus sem ultricies scelerisque Quisque porttitor risus vel risus finibus eu sollicitudin nisl aliquet Sed sed lectus ac dolor molestie interdum Nam molestie pellentesque purus ac vestibulum Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas Suspendisse non tempor eros Mauris eu orci hendrerit volutpat lorem in tristique libero Duis a nibh nibh].freeze
+    DOMAIN_SUFFIXES = %w[co.uk com].freeze
 
     def initialize(random: Random.new)
       @random = random
-      Faker::Config.random = @random
     end
 
     def string_for_type(type)
@@ -17,7 +15,7 @@ module GovukSchemas
       when "uri"
         uri
       when "email"
-        Faker::Internet.email
+        [username, domain_name].join("@")
       else
         raise <<~DOC
            Unsupported JSON schema type `#{type}`
@@ -38,9 +36,9 @@ module GovukSchemas
       (arbitrary_time + @random.rand(0..500_000_000)).iso8601
     end
 
-    # TODO: make this more random with query string, optional anchor.
-    def uri
-      "#{Faker::Internet.url(path: base_path)}#{anchor}"
+    # TODO: make this more random with query string
+    def uri(domain_suffix: nil, include_anchor: true)
+      "https://#{domain_name(domain_suffix:)}#{base_path}#{include_anchor ? anchor : nil}"
     end
 
     def base_path
@@ -48,8 +46,7 @@ module GovukSchemas
     end
 
     def govuk_subdomain_url
-      host = Faker::Internet.domain_name(subdomain: true, domain: "gov.uk")
-      Faker::Internet.url(host:, path: base_path)
+      uri(domain_suffix: "gov.uk", include_anchor: false)
     end
 
     def string(minimum_chars = nil, maximum_chars = nil)
@@ -66,11 +63,11 @@ module GovukSchemas
       "##{hex}"
     end
 
-    def random_identifier(separator:)
+    def random_identifier(separator: "-")
       WORDS.sample(@random.rand(1..10), random: @random)
-        .join("-")
-        .gsub(/[^a-z0-9\-_]+/i, "-")
-        .gsub("-", separator)
+        .join(separator)
+        .gsub(/[^a-z0-9\-_]+/i, separator)
+        .downcase
     end
 
     def uuid
@@ -113,6 +110,8 @@ module GovukSchemas
         govuk_subdomain_url
       when '[a-z0-9\-_]'
         "#{hex}-#{hex}"
+      when "^addresses|contact_links|email_addresses|telephones.[a-z0-9]+(?:-[a-z0-9]+)*$"
+        content_block_order_item
       else
         raise <<~DOC
           Don't know how to generate random string for pattern #{pattern.inspect}
@@ -130,6 +129,25 @@ module GovukSchemas
 
   private
 
+    def username
+      WORDS.sample(random: @random).downcase
+    end
+
+    def domain_name(domain_suffix: nil)
+      [
+        WORDS.sample(random: @random).downcase,
+        domain_suffix || DOMAIN_SUFFIXES.sample(random: @random),
+      ].join(".")
+    end
+
+    def content_block_order_item
+      [
+        %w[addresses contact_links email_addresses telephones].sample,
+        ".",
+        random_identifier,
+      ].join
+    end
+
     def random_letter
       letters = ("a".."f").to_a
       letters[@random.rand(0..letters.count - 1)]

data/lib/govuk_schemas/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_schemas
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.2.0
 platform: ruby
 authors:
 - GOV.UK Dev
@@ -9,26 +9,6 @@ bindir: exe
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: faker
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.4.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 3.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.4.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: json-schema
   requirement: !ruby/object:Gem::Requirement
@@ -126,7 +106,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/dependabot.yml"
 - ".github/workflows/actionlint.yml"
 - ".github/workflows/autorelease.yml"
 - ".github/workflows/ci.yml"
@@ -173,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.1
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Gem to generate test data based on GOV.UK content schemas
 test_files: []

data/.github/dependabot.yml

@@ -1,10 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: bundler
-    directory: /
-    schedule:
-      interval: daily
-  - package-ecosystem: "github-actions"
-    directory: /
-    schedule:
-      interval: daily