Refactor Service::NameValidator#valid_name?

openSUSE · Oct 19, 2020 · 3c26475 · 3c26475
1 parent 6ffda9d
commit 3c26475
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/src/api/app/models/service/name_validator.rb b/src/api/app/models/service/name_validator.rb
@@ -13,13 +13,17 @@ def valid?
     private
 
     def valid_name?
-      return false unless name.is_a?(String)
-      return false if name.length > 200 || name.blank?
-      return false if /^[_.]/.match?(name)
-      return false if /::/.match?(name)
-      return true if /\A\w[-+\w.:]*\z/.match?(name)
+      return false unless name.present? || name.is_a?(String)
+      return false if name.length > 200
 
-      false
+      case name
+      when /^[_.]/, /::/
+        false
+      when /\A\w[-+\w.:]*\z/
+        true
+      else
+        false
+      end
     end
   end
 end