rails-param-validation 0.4.14 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3eae277f67629481d14b7c25d6a8d6883b194f0e8a28df8b1dab38854e60b82
-  data.tar.gz: a56276914e1d304238a6de444ec80d8cdfbacb29d00c64746fd2ce88fcc665b3
+  metadata.gz: 6c8f555ee0aafbe724456b93c7eb9fd8cdc54f38d892e9551fe8961bfa40ffb1
+  data.tar.gz: ffca5a75b38b8d282b52af89afcee6d4204ad118286cfeb9f11417e3a7e9494e
 SHA512:
-  metadata.gz: f3629891ba43c919f837b234d0d4133983a43eca0cc0ce8609747624920dcac443ebc9c14acc5c583468493eb189735b5e1fef8fefe4ba0f936e8d011c647246
-  data.tar.gz: 832116a057c74a7259fb7aae6e00ae777f9525102be9de6ef4074957969ccd1834ebd5253763d19d528e7b3faffadfc14ba0c844e1fd55f4202d3ae0db1e987d
+  metadata.gz: e9c3c97ea17e7aa12bdc37932cfeb9233cc40931217a2ff9be2fa2dac4baafaf874a2335b2efad8471235d9c70c85a90f3a8b53fc4e9245fa057b249eefd6203
+  data.tar.gz: a0ad7c5f21b4ac0b4c63bc1b570a8b4082eac1ac6c79f203c425da848d1edf7db10ff8cc671f952470d45b5e8daf20a2d0e5d71a4f375c7e8fecd86f050601de

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

@@ -33,10 +33,11 @@ module RailsParamValidation
   end
 
   class Validator
-    attr_reader :schema
+    attr_reader :schema, :collection
 
-    def initialize(schema)
+    def initialize(schema, collection)
       @schema = schema
+      @collection = collection
     end
 
     # @return [MatchData]

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

@@ -3,27 +3,45 @@ require_relative "./validator"
 
 module RailsParamValidation
 
+  class FactoryCollection
+    # @return [Array<ValidatorFactory>]
+    attr_reader :factories
+
+    # @param [Array<ValidatorFactory>] factories
+    def initialize(factories = [])
+      @factories = factories
+    end
+
+    def register(factory)
+      factories.push factory
+    end
+
+    def clone
+      FactoryCollection.new(factories.clone)
+    end
+  end
+
   class ValidatorFactory
 
     # @param [ValidatorFactory] factory
     def self.register(factory)
-      factories.push factory
+      collection.register factory
     end
 
-    # @return [Array<ValidatorFactory>]
-    def self.factories
-      @@factories ||= []
+    # @return [FactoryCollection]
+    def self.collection
+      @factories ||= FactoryCollection.new
     end
 
     # @return [Validator]
-    def self.create(schema)
-      factory = factories.detect { |f| f.supports? schema }
+    def self.create(schema, collection = self.collection)
+      factory = collection.factories.detect { |f| f.supports? schema }
 
       if factory.nil?
         raise NoMatchingFactory.new(schema)
       end
 
-      factory.create schema
+      factory.create schema, collection
     end
 
     # @return [Boolean]
@@ -31,7 +49,7 @@ module RailsParamValidation
     end
 
     # @return Validator
-    def create(schema)
+    def create(schema, collection)
     end
   end
 end

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

@@ -2,10 +2,10 @@ module RailsParamValidation
 
 class AlternativesValidator < Validator
     # @param [Array] schema
-    def initialize(schema)
-      super schema
+    def initialize(schema, collection)
+      super schema, collection
 
-      @inner_validators = schema.map { |value| ValidatorFactory.create(value) }
+      @inner_validators = schema.map { |value| ValidatorFactory.create(value, collection) }
     end
 
     def matches?(path, data)
@@ -34,8 +34,8 @@ class AlternativesValidator < Validator
       schema.is_a? Array
     end
 
-    def create(schema)
-      AlternativesValidator.new schema
+    def create(schema, collection)
+      AlternativesValidator.new schema, collection
     end
   end
 

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

@@ -2,10 +2,10 @@ module RailsParamValidation
 
   class ArrayValidator < Validator
     # @param [ArrayT] schema
-    def initialize(schema)
-      super schema
+    def initialize(schema, collection)
+      super schema, collection
 
-      @inner_validator = ValidatorFactory.create schema.inner_type
+      @inner_validator = ValidatorFactory.create schema.inner_type, collection
     end
 
     def matches?(path, data)
@@ -41,8 +41,8 @@ module RailsParamValidation
       schema.is_a? AnnotationTypes::ArrayT
     end
 
-    def create(schema)
-      ArrayValidator.new schema
+    def create(schema, collection)
+      ArrayValidator.new schema, collection
     end
   end
 

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

@@ -1,8 +1,8 @@
 module RailsParamValidation
 
   class BooleanValidator < Validator
-    def initialize(schema)
-      super schema
+    def initialize(schema, collection)
+      super schema, collection
     end
 
     def matches?(path, data)
@@ -30,8 +30,8 @@ module RailsParamValidation
       schema == Boolean
     end
 
-    def create(schema)
-      BooleanValidator.new schema
+    def create(schema, collection)
+      BooleanValidator.new schema, collection
     end
   end
 

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

@@ -3,8 +3,8 @@ module RailsParamValidation
   class ConstantValidator < Validator
     CLASS_MAP = { TrueClass => Boolean, FalseClass => Boolean }
 
-    def initialize(schema)
-      super schema
+    def initialize(schema, collection)
+      super schema, collection
 
       @constant = schema
     end
@@ -23,7 +23,7 @@ module RailsParamValidation
     end
 
     def to_openapi
-      ValidatorFactory.create(CLASS_MAP.fetch(schema.class, schema.class)).to_openapi.merge(enum: [schema])
+      ValidatorFactory.create(CLASS_MAP.fetch(schema.class, schema.class), collection).to_openapi.merge(enum: [schema])
     end
   end
 
@@ -32,8 +32,8 @@ module RailsParamValidation
       ![String, Symbol, Numeric, TrueClass, FalseClass].detect { |klass| schema.is_a? klass }.nil?
     end
 
-    def create(schema)
-      ConstantValidator.new schema
+    def create(schema, collection)
+      ConstantValidator.new schema, collection
     end
   end
 

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

@@ -1,12 +1,12 @@
 module RailsParamValidation
 
   class CustomTypeValidator < Validator
-    def initialize(type)
-      super type
+    def initialize(type, collection)
+      super type, collection
     end
 
     def matches?(path, data)
-      ValidatorFactory.create(schema.schema).matches? path, data
+      ValidatorFactory.create(schema.schema, collection).matches? path, data
     end
 
     def to_openapi
@@ -19,8 +19,8 @@ module RailsParamValidation
       schema.is_a? AnnotationTypes::CustomT
     end
 
-    def create(schema)
-      CustomTypeValidator.new schema
+    def create(schema, collection)
+      CustomTypeValidator.new schema, collection
     end
   end
 

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

@@ -1,8 +1,8 @@
 module RailsParamValidation
 
   class DateValidator < Validator
-    def initialize(schema)
-      super schema
+    def initialize(schema, collection)
+      super schema, collection
     end
 
     def matches?(path, data)
@@ -31,8 +31,8 @@ module RailsParamValidation
       schema == Date
     end
 
-    def create(schema)
-      DateValidator.new schema
+    def create(schema, collection)
+      DateValidator.new schema, collection
     end
   end
 

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

@@ -1,8 +1,8 @@
 module RailsParamValidation
 
   class DateTimeValidator < Validator
-    def initialize(schema)
-      super schema
+    def initialize(schema, collection)
+      super schema, collection
     end
 
     def matches?(path, data)
@@ -32,7 +32,7 @@ module RailsParamValidation
     end
 
     def create(schema)
-      DateTimeValidator.new schema
+      DateTimeValidator.new schema, collection
     end
   end
 

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

@@ -1,8 +1,8 @@
 module RailsParamValidation
 
   class FloatValidator < Validator
-    def initialize(schema)
-      super schema
+    def initialize(schema, collection)
+      super schema, collection
     end
 
     def matches?(path, data)
@@ -31,8 +31,8 @@ module RailsParamValidation
       schema == Float
     end
 
-    def create(schema)
-      FloatValidator.new schema
+    def create(schema, collection)
+      FloatValidator.new schema, collection
     end
   end
 

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

@@ -2,11 +2,11 @@ module RailsParamValidation
 
   class HashValidator < Validator
     # @param [HashT] schema
-    def initialize(schema)
-      super schema
+    def initialize(schema, collection)
+      super schema, collection
 
-      @value_validator = ValidatorFactory.create schema.inner_type
-      @key_validator = ValidatorFactory.create schema.key_type
+      @value_validator = ValidatorFactory.create schema.inner_type, collection
+      @key_validator = ValidatorFactory.create schema.key_type, collection
     end
 
     def matches?(path, data)
@@ -44,8 +44,8 @@ module RailsParamValidation
       schema.is_a? AnnotationTypes::HashT
     end
 
-    def create(schema)
-      HashValidator.new schema
+    def create(schema, collection)
+      HashValidator.new schema, collection
     end
   end
 

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

@@ -1,8 +1,8 @@
 module RailsParamValidation
 
   class IntegerValidator < Validator
-    def initialize(schema)
-      super schema
+    def initialize(schema, collection)
+      super schema, collection
     end
 
     def matches?(path, data)
@@ -31,8 +31,8 @@ module RailsParamValidation
       schema == Integer
     end
 
-    def create(schema)
-      IntegerValidator.new schema
+    def create(schema, collection)
+      IntegerValidator.new schema, collection
     end
   end
 

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

@@ -2,10 +2,10 @@ module RailsParamValidation
 
   class ObjectValidator < Validator
     # @param [Hash] schema
-    def initialize(schema)
-      super schema
+    def initialize(schema, collection)
+      super schema, collection
 
-      @inner_validators = schema.map { |key, value| [key, ValidatorFactory.create(value)] }.to_h
+      @inner_validators = schema.map { |key, value| [key, ValidatorFactory.create(value, collection)] }.to_h
     end
 
     def matches?(path, data)
@@ -55,8 +55,8 @@ module RailsParamValidation
       schema.is_a? Hash
     end
 
-    def create(schema)
-      ObjectValidator.new schema
+    def create(schema, collection)
+      ObjectValidator.new schema, collection
     end
   end
 

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

@@ -1,10 +1,10 @@
 module RailsParamValidation
 
   class OptionalValidator < Validator
-    def initialize(schema)
-      super schema
+    def initialize(schema, collection)
+      super schema, collection
 
-      @inner_validator = ValidatorFactory.create schema.inner_type
+      @inner_validator = ValidatorFactory.create schema.inner_type, collection
       @default         = schema.default
     end
 
@@ -36,8 +36,8 @@ module RailsParamValidation
       schema.is_a? AnnotationTypes::OptionalT
     end
 
-    def create(schema)
-      OptionalValidator.new schema
+    def create(schema, collection)
+      OptionalValidator.new schema, collection
     end
   end
 

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

@@ -1,8 +1,8 @@
 module RailsParamValidation
 
   class RegexValidator < Validator
-    def initialize(schema)
-      super schema
+    def initialize(schema, collection)
+      super schema, collection
     end
 
     def matches?(path, data)
@@ -29,8 +29,8 @@ module RailsParamValidation
       schema.is_a? Regexp
     end
 
-    def create(schema)
-      RegexValidator.new schema
+    def create(schema, collection)
+      RegexValidator.new schema, collection
     end
   end
 

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

@@ -1,8 +1,8 @@
 module RailsParamValidation
 
   class StringValidator < Validator
-    def initialize(schema)
-      super schema
+    def initialize(schema, collection)
+      super schema, collection
     end
 
     def matches?(path, data)
@@ -23,8 +23,8 @@ module RailsParamValidation
       schema == String || schema == Symbol
     end
 
-    def create(schema)
-      StringValidator.new schema
+    def create(schema, collection)
+      StringValidator.new schema, collection
     end
   end
 

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

@@ -3,8 +3,8 @@ module RailsParamValidation
   class UuidValidator < Validator
     REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/
 
-    def initialize(schema)
-      super schema
+    def initialize(schema, collection)
+      super schema, collection
     end
 
     def matches?(path, data)
@@ -31,8 +31,8 @@ module RailsParamValidation
       schema == Uuid
     end
 
-    def create(schema)
-      UuidValidator.new schema
+    def create(schema, collection)
+      UuidValidator.new schema, collection
     end
   end
 

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

@@ -1,3 +1,3 @@
 module RailsParamValidation
-  VERSION = "0.4.14"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-param-validation
 version: !ruby/object:Gem::Version
-  version: 0.4.14
+  version: 0.5.0
 platform: ruby
 authors:
 - Oskar Kirmis
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-25 00:00:00.000000000 Z
+date: 2023-10-30 00:00:00.000000000 Z
 dependencies: []
 description: Declarative parameter definition and validation for Rails
 email:
@@ -78,7 +78,7 @@ metadata:
   homepage_uri: https://okirmis.github.io/rails-param-validation
   source_code_uri: https://github.com/okirmis/rails-param-validation
   changelog_uri: https://github.com/okirmis/rails-param-validation
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -93,8 +93,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.12
-signing_key:
+rubygems_version: 3.3.26
+signing_key: 
 specification_version: 4
 summary: Declarative parameter definition and validation for Rails
 test_files: []