Improve validations

lib/referator.rb

@@ -17,4 +17,24 @@ require_relative 'referator/script'
 module Referator
   NAME_RE = /\A\w+(_\w+)*\z/
   SLUG_RE = /\A\w+(-\w+)*\z/
+
+  def self.validate_name!(name)
+    name.freeze
+    unless name.instance_of? Symbol
+      raise TypeError, "Expected #{Symbol}, got #{name.class}"
+    end
+    raise 'Invalid name' unless NAME_RE.match? name
+
+    name
+  end
+
+  def self.validate_slug!(slug)
+    slug.freeze
+    unless slug.instance_of? String
+      raise TypeError, "Expected #{String}, got #{slug.class}"
+    end
+    raise 'Invalid slug' unless SLUG_RE.match? slug
+
+    slug
+  end
 end

lib/referator/config/categories.rb

@@ -16,8 +16,8 @@ module Referator
       end
 
       def register(name)
-        validate_name! name
-        raise 'Already exists' if names.index(name)
+        Referator.validate_name! name
+        raise 'Already exists' if names.index name
 
         names << name
         nil
@@ -37,13 +37,6 @@ module Referator
 
         @config = config
       end
-
-      def validate_name!(name)
-        unless name.instance_of? Symbol
-          raise TypeError, "Expected #{Symbol}, got #{name.class}"
-        end
-        raise 'Invalid name' unless NAME_RE.match? name
-      end
     end
   end
 end

lib/referator/config/formats.rb

@@ -18,7 +18,7 @@ module Referator
       end
 
       def register(name, **kwargs)
-        validate_name! name
+        Referator.validate_name! name
         raise 'Already exists' if names.index(name) || scripts.key?(name)
 
         script = Script.new(**kwargs.merge(workdir: config.workdir,
@@ -55,13 +55,6 @@ module Referator
         @config = config
       end
 
-      def validate_name!(name)
-        unless name.instance_of? Symbol
-          raise TypeError, "Expected #{Symbol}, got #{name.class}"
-        end
-        raise 'Invalid name' unless NAME_RE.match? name
-      end
-
       def script_vars(template: nil, format: nil, notes: nil)
         { template:, format:, notes: }.freeze
       end

lib/referator/reference.rb

@@ -26,9 +26,7 @@ module Referator
   private
 
     def category=(category)
-      @category = String(category).to_sym.tap do |new_category|
-        raise 'Invalid category' unless NAME_RE.match? new_category
-      end
+      @category = Referator.validate_name! String(category).to_sym
     end
 
     def id=(id)
@@ -36,9 +34,7 @@ module Referator
     end
 
     def slug=(slug)
-      @slug = String(slug).freeze.tap do |new_slug|
-        raise 'Invalid slug' unless SLUG_RE.match? new_slug
-      end
+      @slug = Referator.validate_slug! String slug
     end
 
     def data=(data)