Rebase master

CHANGELOG.md

@@ -6,7 +6,7 @@
 
 #### Fixes
 
-* [#2222](/~https://github.com/ruby-grape/grape/pull/2222): Fix autoload types and validators - [@ericproulx](/~https://github.com/ericproulx).
+* [#2222](/~https://github.com/ruby-grape/grape/pull/2222): autoload types and validators - [@ericproulx](/~https://github.com/ericproulx).
 * Your contribution here.
 
 ### 1.6.2 (2021/12/30)

lib/grape.rb

@@ -10,16 +10,16 @@
 require 'active_support'
 require 'active_support/version'
 require 'active_support/isolated_execution_state' if ActiveSupport::VERSION::MAJOR > 6
-require 'active_support/core_ext/hash/indifferent_access'
-require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/array/conversions'
 require 'active_support/core_ext/array/extract_options'
 require 'active_support/core_ext/array/wrap'
-require 'active_support/core_ext/array/conversions'
+require 'active_support/core_ext/hash/conversions'
 require 'active_support/core_ext/hash/deep_merge'
-require 'active_support/core_ext/hash/reverse_merge'
 require 'active_support/core_ext/hash/except'
+require 'active_support/core_ext/hash/indifferent_access'
+require 'active_support/core_ext/hash/reverse_merge'
 require 'active_support/core_ext/hash/slice'
-require 'active_support/core_ext/hash/conversions'
+require 'active_support/core_ext/object/blank'
 require 'active_support/dependencies/autoload'
 require 'active_support/notifications'
 require 'i18n'
@@ -237,8 +237,6 @@ module Types
 
       eager_autoload do
         autoload :InvalidValue
-        autoload :File
-        autoload :Json
         autoload :DryTypeCoercer
         autoload :ArrayCoercer
         autoload :SetCoercer

lib/grape/validations.rb

@@ -1,11 +1,5 @@
 # frozen_string_literal: true
 
-require 'grape/validations/attributes_iterator'
-require 'grape/validations/single_attribute_iterator'
-require 'grape/validations/multiple_attributes_iterator'
-require 'grape/validations/params_scope'
-require 'grape/validations/types'
-
 module Grape
   # Registry to store and locate known Validators.
   module Validations
@@ -28,10 +22,10 @@ def deregister_validator(short_name)
     end
 
     # Find a validator and if not found will try to load it
-    def lazy_find_validator(short_name)
+    def require_validator(short_name)
       str_name = short_name.to_s
       validators.fetch(str_name) do
-        register_validator(str_name, "Grape::Validations::Validators::#{str_name.camelize}Validator".constantize)
+        Grape::Validations::Validators.const_get("#{str_name.camelize}Validator")
       end
     rescue NameError
       raise Grape::Exceptions::UnknownValidator.new(short_name)

lib/grape/validations/params_scope.rb

@@ -437,7 +437,7 @@ def validate(type, options, attrs, doc_attrs, opts)
           required: doc_attrs[:required],
           params_scope: self,
           opts: opts,
-          validator_class: Validations.lazy_find_validator(type)
+          validator_class: Validations.require_validator(type)
         }
         @api.namespace_stackable(:validations, validator_options)
       end

lib/grape/validations/types.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'grape/validations/types/json'
+require 'grape/validations/types/file'
+
 module Grape
   module Validations
     # Module for code related to grape's system for
@@ -14,18 +17,18 @@ module Validations
     # entry point for this process is {Types.build_coercer}.
     module Types
       module_function
-      # Types representing a single value, which are coerced.
+
       PRIMITIVES = [
         # Numerical
         Integer,
         Float,
         BigDecimal,
         Numeric,
 
-        # Date/time
-        Date,
-        DateTime,
-        Time,
+          # Date/time
+          Date,
+          DateTime,
+          Time,
 
         # Misc
         Grape::API::Boolean,
@@ -36,33 +39,23 @@ module Types
       ].freeze
 
       # Types representing data structures.
-      STRUCTURES = [
-        Hash,
-        Array,
-        Set
-      ].freeze
+      STRUCTURES = [Hash, Array, Set].freeze
 
-      # Special custom types provided by Grape.
       SPECIAL = {
-        JSON => Json,
+        ::JSON => Json,
         Array[JSON] => JsonArray,
         ::File => File,
         Rack::Multipart::UploadedFile => File
       }.freeze
 
-      GROUPS = [
-        Array,
-        Hash,
-        JSON,
-        Array[JSON]
-      ].freeze
+      GROUPS = [Array, Hash, JSON, Array[JSON]].freeze
 
       # Is the given class a primitive type as recognized by Grape?
       #
       # @param type [Class] type to check
       # @return [Boolean] whether or not the type is known by Grape as a valid
       #   type for a single value
-      def self.primitive?(type)
+      def primitive?(type)
         PRIMITIVES.include?(type)
       end
 
@@ -133,7 +126,7 @@ def collection_of_custom?(type)
       end
 
       def map_special(type)
-        specials.fetch(type, type)
+        SPECIAL.fetch(type, type)
       end
 
       # Chooses the best coercer for the given type. For example, if the type

lib/grape/validations/types/dry_type_coercer.rb

@@ -25,7 +25,7 @@ class << self
           #    #=> Grape::Validations::Types::ArrayCoercer
           def collection_coercer_for(type)
             collection_coercers.fetch(type) do
-              DryTypeCoercer.collection_coercers[type] = "Grape::Validations::Types::#{type.name.camelize}Coercer".constantize
+              DryTypeCoercer.collection_coercers[type] = Grape::Validations::Types.const_get("#{type.name.camelize}Coercer")
             end
           end
 

spec/grape/validations/types_spec.rb

@@ -48,6 +48,34 @@ def self.parse; end
     end
   end
 
+  describe 'special types' do
+    subject { described_class::SPECIAL[type] }
+
+    context 'when JSON' do
+      let(:type) { JSON }
+
+      it { is_expected.to eq(Grape::Validations::Types::Json) }
+    end
+
+    context 'when Array[JSON]' do
+      let(:type) { Array[JSON] }
+
+      it { is_expected.to eq(Grape::Validations::Types::JsonArray) }
+    end
+
+    context 'when File' do
+      let(:type) { File }
+
+      it { is_expected.to eq(Grape::Validations::Types::File) }
+    end
+
+    context 'when Rack::Multipart::UploadedFile' do
+      let(:type) { Rack::Multipart::UploadedFile }
+
+      it { is_expected.to eq(Grape::Validations::Types::File) }
+    end
+  end
+
   describe '::custom?' do
     it 'returns false if the type does not respond to :parse' do
       expect(described_class).not_to be_custom(Object)

spec/grape/validations/validators/coerce_spec.rb

@@ -454,7 +454,7 @@ def self.parse(_val)
 
       context 'nil values' do
         context 'primitive types' do
-          Grape::Validations::Types.primitives.each do |type|
+          Grape::Validations::Types::PRIMITIVES.each do |type|
             it 'respects the nil value' do
               subject.params do
                 requires :param, type: type
@@ -471,7 +471,7 @@ def self.parse(_val)
         end
 
         context 'structures types' do
-          Grape::Validations::Types.structures.each do |type|
+          Grape::Validations::Types::STRUCTURES.each do |type|
             it 'respects the nil value' do
               subject.params do
                 requires :param, type: type
@@ -488,7 +488,7 @@ def self.parse(_val)
         end
 
         context 'special types' do
-          Grape::Validations::Types.specials.each_key do |type|
+          Grape::Validations::Types::SPECIAL.each_key do |type|
             it 'respects the nil value' do
               subject.params do
                 requires :param, type: type
@@ -527,7 +527,7 @@ def self.parse(_val)
 
       context 'empty string' do
         context 'primitive types' do
-          (Grape::Validations::Types.primitives - [String]).each do |type|
+          (Grape::Validations::Types::PRIMITIVES - [String]).each do |type|
             it "is coerced to nil for type #{type}" do
               subject.params do
                 requires :param, type: type
@@ -557,7 +557,7 @@ def self.parse(_val)
         end
 
         context 'structures types' do
-          (Grape::Validations::Types.structures - [Hash]).each do |type|
+          (Grape::Validations::Types::STRUCTURES - [Hash]).each do |type|
             it "is coerced to nil for type #{type}" do
               subject.params do
                 requires :param, type: type
@@ -574,7 +574,7 @@ def self.parse(_val)
         end
 
         context 'special types' do
-          (Grape::Validations::Types.specials.keys - [File, Rack::Multipart::UploadedFile]).each do |type|
+          (Grape::Validations::Types::SPECIAL.keys - [File, Rack::Multipart::UploadedFile]).each do |type|
             it "is coerced to nil for type #{type}" do
               subject.params do
                 requires :param, type: type

spec/grape/validations_spec.rb

@@ -1974,8 +1974,8 @@ def validate_param!(attr_name, params)
     end
   end
 
-  describe 'lazy_find_validator' do
-    subject { described_class.lazy_find_validator(short_name) }
+  describe 'require_validator' do
+    subject { described_class.require_validator(short_name) }
 
     context 'when found' do
       let(:short_name) { :presence }