Refactor registry

lib/grape/error_formatter/base.rb

@@ -60,9 +60,7 @@ def format_structured_message(_structured_message)
 
         def inherited(klass)
           super
-          return if klass.name.blank?
-
-          ErrorFormatter.register(klass.name.demodulize.underscore, klass)
+          ErrorFormatter.register(klass)
         end
       end
     end

lib/grape/formatter/base.rb

@@ -9,9 +9,7 @@ def self.call(_object, _env)
 
       def self.inherited(klass)
         super
-        return if klass.name.blank?
-
-        Formatter.register(klass.name.demodulize.underscore, klass)
+        Formatter.register(klass)
       end
     end
   end

lib/grape/middleware/versioner/base.rb

@@ -9,10 +9,7 @@ class Base < Grape::Middleware::Base
 
         def self.inherited(klass)
           super
-          return if klass.name.blank?
-
-          short_name = klass.name.demodulize.underscore
-          Versioner.register(short_name, klass)
+          Versioner.register(klass)
         end
 
         def default_options

lib/grape/parser/base.rb

@@ -9,10 +9,7 @@ def self.call(_object, _env)
 
       def self.inherited(klass)
         super
-        return if klass.name.blank?
-
-        short_name = klass.name.demodulize.underscore
-        Parser.register(short_name, klass)
+        Parser.register(klass)
       end
     end
   end

lib/grape/util/registry.rb

@@ -3,13 +3,22 @@
 module Grape
   module Util
     module Registry
-      def register(short_name, klass)
+      def register(klass)
+        short_name = build_short_name(klass)
+        return if short_name.nil?
+
         warn "#{short_name} is already registered with class #{klass}" if registry.key?(short_name)
         registry[short_name] = klass
       end
 
       private
 
+      def build_short_name(klass)
+        return if klass.name.blank?
+
+        klass.name.demodulize.underscore
+      end
+
       def registry
         @registry ||= {}.with_indifferent_access
       end

lib/grape/validations.rb

@@ -11,5 +11,11 @@ def require_validator(short_name)
 
       registry[short_name]
     end
+
+    def build_short_name(klass)
+      return if klass.name.blank?
+
+      klass.name.demodulize.underscore.delete_suffix('_validator')
+    end
   end
 end

lib/grape/validations/params_scope.rb

@@ -525,7 +525,7 @@ def derive_validator_options(validations)
       def validates_presence(validations, attrs, doc, opts)
         return unless validations.key?(:presence) && validations[:presence]
 
-        validate(:presence, validations.delete(:presence), attrs, doc, opts)
+        validate('presence', validations.delete(:presence), attrs, doc, opts)
         validations.delete(:message) if validations.key?(:message)
       end
     end

lib/grape/validations/validators/base.rb

@@ -59,10 +59,7 @@ def validate!(params)
 
         def self.inherited(klass)
           super
-          return if klass.name.blank?
-
-          short_validator_name = klass.name.demodulize.underscore.delete_suffix('_validator')
-          Validations.register(short_validator_name, klass)
+          Validations.register(klass)
         end
 
         def message(default_key = nil)

spec/grape/api/custom_validations_spec.rb

@@ -37,7 +37,7 @@ def validate_param!(attr_name, params)
 
     before do
       stub_const('DefaultLengthValidator', default_length_validator)
-      described_class.register(:default_length, DefaultLengthValidator)
+      described_class.register(DefaultLengthValidator)
     end
 
     after do
@@ -86,7 +86,7 @@ def validate(request)
 
     before do
       stub_const('InBodyValidator', in_body_validator)
-      described_class.register(:in_body, InBodyValidator)
+      described_class.register(InBodyValidator)
     end
 
     after do
@@ -129,7 +129,7 @@ def validate_param!(attr_name, _params)
 
     before do
       stub_const('WithMessageKeyValidator', message_key_validator)
-      described_class.register(:with_message_key, WithMessageKeyValidator)
+      described_class.register(WithMessageKeyValidator)
     end
 
     after do
@@ -182,7 +182,7 @@ def access_header
 
     before do
       stub_const('AdminValidator', admin_validator)
-      described_class.register(:admin, AdminValidator)
+      described_class.register(AdminValidator)
     end
 
     after do
@@ -248,7 +248,7 @@ def validate_param!(_attr_name, _params)
 
     before do
       stub_const('InstanceValidatorValidator', validator_type)
-      described_class.register(:instance_validator, InstanceValidatorValidator)
+      described_class.register(InstanceValidatorValidator)
     end
 
     after do

spec/grape/validations_spec.rb

@@ -495,7 +495,7 @@ def validate_param!(attr_name, params)
 
       before do
         stub_const('DateRangeValidator', date_range_validator)
-        described_class.register(:date_range, DateRangeValidator)
+        described_class.register(DateRangeValidator)
         subject.params do
           optional :date_range, date_range: true, type: Hash do
             requires :from, type: Integer
@@ -1193,7 +1193,7 @@ def validate_param!(attr_name, params)
 
       before do
         stub_const('CustomvalidatorValidator', custom_validator)
-        described_class.register(:customvalidator, CustomvalidatorValidator)
+        described_class.register(CustomvalidatorValidator)
       end
 
       after do
@@ -1351,7 +1351,7 @@ def validate_param!(attr_name, params)
 
         before do
           stub_const('CustomvalidatorWithOptionsValidator', custom_validator_with_options)
-          described_class.register(:customvalidator_with_options, CustomvalidatorWithOptionsValidator)
+          described_class.register(CustomvalidatorWithOptionsValidator)
           subject.params do
             optional :custom, customvalidator_with_options: { text: 'im custom with options', message: 'is not custom with options!' }
           end