Split off validating full paths

The first part of a full path needs to be validated as a `top_level`
while the rest need to be validated as `wildcard`

1 files changed, 8 insertions, 6 deletions

diff --git a/app/validators/namespace_validator.rb b/app/validators/namespace_validator.rb
index 4d99b09e98f..8a0e18612ec 100644
--- a/app/validators/namespace_validator.rb
+++ b/app/validators/namespace_validator.rb
@@ -77,12 +77,14 @@ class NamespaceValidator < ActiveModel::EachValidator
   STRICT_RESERVED = (TOP_LEVEL_ROUTES | WILDCARD_ROUTES)
 
   def self.valid_full_path?(full_path)
-    pieces = full_path.split('/')
-    first_part = pieces.first
-    pieces.all? do |namespace|
-      type = first_part == namespace ? :top_level : :wildcard
-      valid?(namespace, type: type)
-    end
+    path_segments = full_path.split('/')
+    root_segment = path_segments.shift
+
+    valid?(root_segment, type: :top_level) && valid_wildcard_segments?(path_segments)
+  end
+
+  def self.valid_wildcard_segments?(segments)
+    segments.all? { |segment| valid?(segment, type: :wildcard) }
   end
 
   def self.valid?(value, type: :strict)