Remove Utils lib

This only had one (untested) method, called in one place. I've now moved its contents directly to where it was being used. It's not great having both 'helpers' and 'utils' in the same directory, so this is a tidier solution.
alphagov · Jul 23, 2020 · ce681b0 · ce681b0
1 parent 39513c1
commit ce681b0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/lib/govuk_schemas.rb b/lib/govuk_schemas.rb
@@ -1,6 +1,5 @@
 require "govuk_schemas/version"
 require "govuk_schemas/schema"
-require "govuk_schemas/utils"
 require "govuk_schemas/random_example"
 require "govuk_schemas/document_types"
 require "govuk_schemas/example"

diff --git a/lib/govuk_schemas/random_helpers.rb b/lib/govuk_schemas/random_helpers.rb
@@ -53,7 +53,10 @@ def anchor
     end
 
     def random_identifier(separator:)
-      Utils.parameterize(WORDS.sample(@random.rand(1..10), random: @random).join("-")).gsub("-", separator)
+      WORDS.sample(@random.rand(1..10), random: @random)
+        .join("-")
+        .gsub(/[^a-z0-9\-_]+/i, "-")
+        .gsub("-", separator)
     end
 
     def uuid

diff --git a/lib/govuk_schemas/utils.rb b/lib/govuk_schemas/utils.rb