rails-param-validation 0.7.1 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67f1683c30ac25b6e91661475bf0085e58eed81b1ef4972e2b810090415fe4c0
-  data.tar.gz: 440a98a849911d1ddd34f06563e5bdff26bbd35d4465a04ba9e9904e46189e6e
+  metadata.gz: fac9f3a2c6c7aa70bd5026b8bf82a8e18c245a1a543b6eded39e88ad82ca3a25
+  data.tar.gz: 8c3c4d482872bc47daf52acde3ca18294233b77117479b3890dc01e7d9290b28
 SHA512:
-  metadata.gz: dfe1b4203c427fcab593998368e70952b885ae38b7ea1190bf71d7c38c5c3c362e4c5f0c1927ccaf8ac3be7a6e08f1388438c313b22bf07f14132e0b74ce001a
-  data.tar.gz: 496732fbf6e778108933fc9bdc0ccc62e37477f85e2f9242b2c468eb0b0945be463b26f977b2272b6b44189b4ed7dd140eba01365b39643e88c8e3329bf738da
+  metadata.gz: 17a56f59ef41e16129f1bcc23df6437eb1233799be870787d155652ab76d38c720586a7af7a96a269ee7be449893e0bd82d06b4bae1d755151337dcc2935e487
+  data.tar.gz: d126128c3dcd8feeaa0d381a75a0828564ec986ccf43a9e0a339c310af108504f0712bc1dafa6d41535a6dc2b0872fdf4a3d33d63963922e3ae80704e3222256

data/lib/rails-param-validation/rails/openapi/routing_helper.rb

@@ -1,42 +1,36 @@
 module RailsParamValidation
-  class Formatter < ActionDispatch::Journey::Visitors::FunctionalVisitor
-    def binary(node, seed)
-      visit(node.right, visit(node.left, seed))
-    end
-
-    def nary(node, seed)
-      node.children.inject(seed) { |s, c| visit(c, s) }
-    end
-
-    def terminal(node, seed)
-      seed.map { |s| s + node.left }
-    end
-
-    def visit_GROUP(node, seed)
-      visit(node.left, seed.dup) + seed
-    end
-
-    def visit_SYMBOL(node, seed)
-      name = node.left
-      name = name[1..-1] if name[0] == ":"
-      seed.map { |s| s + "{#{name}}" }
-    end
-  end
-
   class RoutingHelper
     def self.routes_for(controller, action)
       routes = []
       Rails.application.routes.routes.each do |route|
         if route.defaults[:controller] == controller && route.defaults[:action] == action
-          Formatter.new.accept(route.path.ast, [""]).each do |path|
-            if !RailsParamValidation.openapi.skip_format_endpoints || !path.end_with?('.{format}')
-              routes.push(path: path, method: route.verb)
-            end
-          end
+          path = RoutingHelper.build_path(route.path.build_formatter, include_format: !RailsParamValidation.openapi.skip_format_endpoints)
+          routes.push(path: path, method: route.verb)
         end
       end
 
       routes
     end
+
+    def self.build_path(formatter, include_format:)
+      parts = formatter.instance_variable_get(:@parts).map do |part|
+        case part
+        when String
+          part
+        when ActionDispatch::Journey::Format::Parameter
+          "{#{part.name}}"
+        when ActionDispatch::Journey::Format
+          if include_format
+            build_path(part, include_format: true)
+          else
+            nil
+          end
+        else
+          nil
+        end
+      end
+
+      parts.reject(&:nil?).join
+    end
   end
 end

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.1"
+  VERSION = "0.7.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-param-validation
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.3
 platform: ruby
 authors:
 - Oskar Kirmis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-02-26 00:00:00.000000000 Z
+date: 2025-02-27 00:00:00.000000000 Z
 dependencies: []
 description: Declarative parameter definition and validation for Rails
 email: