rails-param-validation 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7efa327265bfc8ad86d510b2b014660923870715ba895a9a470d6792bccb13ed
-  data.tar.gz: a641151602952abad4053e6341ebb6ba1f46900ef022fe69c97ec9271920685c
+  metadata.gz: fac9f3a2c6c7aa70bd5026b8bf82a8e18c245a1a543b6eded39e88ad82ca3a25
+  data.tar.gz: 8c3c4d482872bc47daf52acde3ca18294233b77117479b3890dc01e7d9290b28
 SHA512:
-  metadata.gz: 2a2d85cde19d9230454e0dee45a72fddf7dc4a336d80fb812596ab04099f01110cb107bb67329b2c9a87ef490434c899065ef16c6a4a8b25b98b334882b4873f
-  data.tar.gz: 0d9be5ee82de94347d95d0cfa28947f83c769089ddaf41708b3a527db274b8033190bdf7bff19f0ff8db84781fde947e24e49d4d819a028fd65d462d2f94ffde
+  metadata.gz: 17a56f59ef41e16129f1bcc23df6437eb1233799be870787d155652ab76d38c720586a7af7a96a269ee7be449893e0bd82d06b4bae1d755151337dcc2935e487
+  data.tar.gz: d126128c3dcd8feeaa0d381a75a0828564ec986ccf43a9e0a339c310af108504f0712bc1dafa6d41535a6dc2b0872fdf4a3d33d63963922e3ae80704e3222256

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

@@ -1,5 +1,13 @@
 module RailsParamValidation
 class AlternativesValidator < Validator
+    def self.use_automatic_enums=(enabled)
+      @automatic_enums = enabled
+    end
+
+    def self.automatic_enums?
+      @automatic_enums.nil? ? true : @automatic_enums
+    end
+
     # @param [Array] schema
     def initialize(schema, collection)
       schema = AlternativesValidator.simplify schema
@@ -7,32 +15,36 @@ class AlternativesValidator < Validator
 
       @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)
+      if AlternativesValidator.automatic_enums?
+        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
 
-          next
+          if previous_enum_values
+            @inner_validators << ConstantEnumValidator.new(previous_enum_values, collection)
+            previous_enum_values = nil
+          end
+          @inner_validators << validator
         end
 
-        if previous_enum_values
-          @inner_validators << ConstantEnumValidator.new(previous_enum_values, collection)
-          previous_enum_values = nil
-        end
-        @inner_validators << validator
+        @inner_validators << ConstantEnumValidator.new(previous_enum_values, collection) if previous_enum_values
+      else
+        @inner_validators = schema.map { |value| ValidatorFactory.create(value, collection) }
       end
-
-      @inner_validators << ConstantEnumValidator.new(previous_enum_values, collection) if previous_enum_values
     end
 
     def matches?(path, data)

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

@@ -1,3 +1,3 @@
 module RailsParamValidation
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-param-validation
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Oskar Kirmis