action_spec 1.4.0 → 1.6.0

data/lib/action_spec/validation_result.rb

@@ -30,7 +30,19 @@ module ActionSpec
       Array(scopes).each { |scope_name| scope_bucket(scope_name)[key] = value }
     end
 
-    def add_error(attribute, type, **options)
+    def apply_scope_options!(options_by_scope)
+      options_by_scope.each do |scope_name, options|
+        bucket = px.scope[scope_name]
+        next unless bucket
+
+        bucket.compact! if options[:compact]
+        bucket.delete_if { |_key, value| value.blank? } if options[:compact_blank]
+      end
+    end
+
+    def add_error(attribute, type, message: nil, **options)
+      return errors.add(attribute, message) if message
+
       if (message = ActionSpec.config.message_for(attribute, type, options))
         errors.add(attribute, message)
       else

data/lib/action_spec/validator/runner.rb

@@ -16,6 +16,8 @@ module ActionSpec
         merge_body!(result)
         merge_group!(result, endpoint.request.header, source: header_source, location: :headers)
         merge_group!(result, endpoint.request.cookie, source: cookie_source, location: :cookies)
+        result.apply_scope_options!(endpoint.request.scope_options)
+        apply_custom_validations!(result)
         result
       end
 
@@ -23,6 +25,14 @@ module ActionSpec
 
         attr_reader :endpoint, :controller, :coerce
 
+        BUILT_IN_GROUPS = {
+          path: ->(request) { request.path },
+          query: ->(request) { request.query },
+          body: ->(request) { request.body },
+          headers: ->(request) { request.header },
+          cookies: ->(request) { request.cookie }
+        }.freeze
+
         def merge_body!(result)
           if endpoint.request.body_required? && body_source.blank?
             result.add_error("body", :required)
@@ -90,6 +100,100 @@ module ActionSpec
 
           field.name
         end
+
+      def apply_custom_validations!(result)
+        return unless endpoint.request.custom_validation?
+
+        with_controller_px(result.px) do
+          BUILT_IN_GROUPS.each do |location, group_reader|
+            validate_group!(
+                result,
+                group_reader.call(endpoint.request),
+                values: result.px.scope.fetch(location),
+                location:
+              )
+            end
+          end
+        end
+
+        def validate_group!(result, group, values:, location:)
+          return unless group.custom_validation?
+
+          group.fields.each do |field|
+            next unless field.custom_validation?
+
+            key = storage_key(field, location)
+            next unless values.key?(key)
+
+            validate_field!(field, values[key], result:, path: [field.name])
+          end
+        end
+
+        def validate_field!(field, value, result:, path:)
+          validate_nested_schema!(field.schema, value, result:, path:)
+          return if field.validate_value(value, context: controller)
+
+          field.add_error(result, path:, type: :invalid, value:, context: controller)
+        end
+
+        def validate_nested_schema!(schema, value, result:, path:)
+          return unless schema.custom_validation?
+
+          case schema
+          when ActionSpec::Schema::ObjectOf
+            return unless value.is_a?(Hash)
+
+            source = value.with_indifferent_access
+            schema.fields.each_value do |field|
+              next unless field.custom_validation?
+              next unless source.key?(field.output_name)
+
+              validate_field!(field, source[field.output_name], result:, path: [*path, field.name])
+            end
+          when ActionSpec::Schema::ArrayOf
+            return unless value.is_a?(Array)
+
+            value.each_with_index do |entry, index|
+              validate_array_item!(schema.item, entry, result:, path: [*path, index])
+            end
+          end
+        end
+
+        def validate_array_item!(schema, value, result:, path:)
+          return unless schema.custom_validation?
+
+          case schema
+          when ActionSpec::Schema::ObjectOf
+            return unless value.is_a?(Hash)
+
+            source = value.with_indifferent_access
+            schema.fields.each_value do |field|
+              next unless field.custom_validation?
+              next unless source.key?(field.output_name)
+
+              validate_field!(field, source[field.output_name], result:, path: [*path, field.name])
+            end
+          when ActionSpec::Schema::ArrayOf
+            return unless value.is_a?(Array)
+
+            value.each_with_index do |entry, index|
+              validate_array_item!(schema.item, entry, result:, path: [*path, index])
+            end
+          end
+        end
+
+        def with_controller_px(px)
+          previous_defined = controller.instance_variable_defined?(:@px)
+          previous = controller.instance_variable_get(:@px)
+          controller.instance_variable_set(:@px, px)
+          yield
+        ensure
+          if previous_defined
+            controller.instance_variable_set(:@px, previous)
+          else
+            controller.remove_instance_variable(:@px) if controller.instance_variable_defined?(:@px)
+          end
+        end
     end
   end
 end

data/lib/action_spec/version.rb

@@ -1,3 +1,3 @@
 module ActionSpec
-  VERSION = "1.4.0"
+  VERSION = "1.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_spec
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.6.0
 platform: ruby
 authors:
 - zhandao