rails-param-validation 0.6.1 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d5f88225db33a9b096591e45a663a2eea47e6e23ce8f57183e1cf9348d77a63
-  data.tar.gz: 0b8de32953399fd870133a26d79d913cb0bfd4aeb820a3d33d6d76e84bd67c79
+  metadata.gz: 67f1683c30ac25b6e91661475bf0085e58eed81b1ef4972e2b810090415fe4c0
+  data.tar.gz: 440a98a849911d1ddd34f06563e5bdff26bbd35d4465a04ba9e9904e46189e6e
 SHA512:
-  metadata.gz: 6c737d8ec89c6b01d85f3f1f3eb23b5964063d015fe11961046e5e1aea26762b143a78138e8f412b34fa8cc3f9086d3f7df296d4ca475a659a49f40be753274d
-  data.tar.gz: edce82d4eeb6d5832726ec4cf9b8dd60ae6aa3195fcc02b616960867cc306d8154ec8b64b0bfefb344ba964da5fd0b299f10a20ae5486966a524d002d57e58bc
+  metadata.gz: dfe1b4203c427fcab593998368e70952b885ae38b7ea1190bf71d7c38c5c3c362e4c5f0c1927ccaf8ac3be7a6e08f1388438c313b22bf07f14132e0b74ce001a
+  data.tar.gz: 496732fbf6e778108933fc9bdc0ccc62e37477f85e2f9242b2c468eb0b0945be463b26f977b2272b6b44189b4ed7dd140eba01365b39643e88c8e3329bf738da

data/lib/rails-param-validation/validators/alternatives.rb

@@ -1,14 +1,38 @@
 module RailsParamValidation
-
 class AlternativesValidator < Validator
     # @param [Array] schema
     def initialize(schema, collection)
+      schema = AlternativesValidator.simplify schema
       super schema, collection
 
-      @inner_validators = schema.map { |value| ValidatorFactory.create(value, collection) }
-      if @inner_validators.all? { |v| v.is_a?(ConstantValidator) }
-        @inner_validators.sort_by! { |v| v.constant.to_s }
+      @inner_validators = []
+
+      previous_enum_values = nil
+      schema.each do |value|
+        validator = ValidatorFactory.create(value, collection)
+        if validator.is_a?(ConstantValidator)
+          if previous_enum_values.nil?
+            previous_enum_values = [value]
+          else
+            if validator.constant.class == previous_enum_values.first.class
+              previous_enum_values << value
+            else
+              @inner_validators << ConstantEnumValidator.new(previous_enum_values, collection)
+              previous_enum_values = [value]
+            end
+          end
+
+          next
+        end
+
+        if previous_enum_values
+          @inner_validators << ConstantEnumValidator.new(previous_enum_values, collection)
+          previous_enum_values = nil
+        end
+        @inner_validators << validator
       end
+
+      @inner_validators << ConstantEnumValidator.new(previous_enum_values, collection) if previous_enum_values
     end
 
     def matches?(path, data)
@@ -28,8 +52,28 @@ class AlternativesValidator < Validator
     end
 
     def to_openapi
+      if @inner_validators.size == 1
+        return @inner_validators.first.to_openapi
+      end
+
       { oneOf: @inner_validators.map(&:to_openapi) }
     end
+
+    protected
+
+    def self.simplify(schema)
+      alternatives = []
+
+      schema.each do |sub_schema|
+        if sub_schema.is_a?(Array)
+          alternatives += sub_schema
+        else
+          alternatives << sub_schema
+        end
+      end
+
+      alternatives
+    end
   end
 
   class AlternativesValidatorFactory < ValidatorFactory

data/lib/rails-param-validation/validators/constant_enum.rb

@@ -0,0 +1,28 @@
+module RailsParamValidation
+  class ConstantEnumValidator < Validator
+    def initialize(schema, collection)
+      super schema, collection
+      @constants = schema
+    end
+
+    def matches?(path, data)
+      detected_values = @constants.select { |c| c.to_s == data.to_s }
+      unless detected_values.any?
+        return MatchResult.new(nil, path, "The value is not one of the allowed constants")
+      end
+
+      MatchResult.new detected_values.first, path
+    end
+
+    def to_openapi
+      ValidatorFactory.create(
+        ConstantValidator::CLASS_MAP.fetch(
+          @constants.first.class,
+          @constants.first.class
+        ),
+        collection
+      ).to_openapi.merge(enum: @constants)
+    end
+  end
+
+end

data/lib/rails-param-validation/version.rb

@@ -1,3 +1,3 @@
 module RailsParamValidation
-  VERSION = "0.6.1"
+  VERSION = "0.7.1"
 end

data/lib/rails-param-validation.rb

@@ -19,6 +19,7 @@ require_relative './rails-param-validation/validators/object'
 require_relative './rails-param-validation/validators/optional'
 require_relative './rails-param-validation/validators/hash'
 require_relative './rails-param-validation/validators/alternatives'
+require_relative './rails-param-validation/validators/constant_enum'
 
 require_relative './rails-param-validation/rails/extensions/annotation_extension' unless defined?(Rails)
 require_relative './rails-param-validation/rails/rails' if defined?(Rails)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-param-validation
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.1
 platform: ruby
 authors:
 - Oskar Kirmis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-11 00:00:00.000000000 Z
+date: 2025-02-26 00:00:00.000000000 Z
 dependencies: []
 description: Declarative parameter definition and validation for Rails
 email:
@@ -57,6 +57,7 @@ files:
 - lib/rails-param-validation/validators/array.rb
 - lib/rails-param-validation/validators/boolean.rb
 - lib/rails-param-validation/validators/constant.rb
+- lib/rails-param-validation/validators/constant_enum.rb
 - lib/rails-param-validation/validators/custom_type.rb
 - lib/rails-param-validation/validators/date.rb
 - lib/rails-param-validation/validators/datetime.rb
@@ -93,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.5.10
 signing_key: 
 specification_version: 4
 summary: Declarative parameter definition and validation for Rails