dry-schema 1.13.1 → 1.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1949729f55d95db1df478e3d2bf0077728c2cfaa5a66ac3d6d00bdbaaf55347
-  data.tar.gz: 574d9ebd59457187c161730f8b2f232d299ff813fb6af10c680b57ce17c5ee46
+  metadata.gz: 01ee230572b92457f6619423c9963be605d79e86cfb4cef112767eda78e5223d
+  data.tar.gz: e9584df52d3c640691168703536546654a97eec2960fc96d932ea69ba5cedc50
 SHA512:
-  metadata.gz: 520e01dc0ab8454bb981fcba032d3a1099fb7fad15b7eaf4008a094fae381178ab389b143a83b2f9f46522722aa14498bcf9a85e9708537d773a3b8f07c81635
-  data.tar.gz: 6d3c13d9d1c13dd632368fd4a3ff34aaa8fec5573a5001540552eadd3debe413160d54bbc8051822deb029c9bf20ffe301a120dbd97f2a569eac398de767053e
+  metadata.gz: b4fa2334f3093e9a18ecea268e8f977204d40104f93c3db75c23bd82001b8b0636f9d8a4053f101b94e7a73982b5bdee67e65b5de13e7709bc1893f3a6c01061
+  data.tar.gz: 2ae6ef323db1a53ae6c375d2bdf1986379aacf5627385394549d784463fc6ebe621bcaaf73b391aa719661e66d47a7a52fd90b5539fe68e681fa4d90e268f2ca

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
+## 1.13.2 2023-05-31
+
+
+### Fixed
+
+- Fix custom predicates setting (via #460) (@solnic)
+
+
+[Compare v1.13.1...v1.13.2](https://github.com/dry-rb/dry-schema/compare/v1.13.1...v1.13.2)
+
 ## 1.13.1 2023-04-07
 
 

data/README.md

@@ -2,7 +2,7 @@
 [gem]: https://rubygems.org/gems/dry-schema
 [actions]: https://github.com/dry-rb/dry-schema/actions
 
-# dry-schema [![Gem Version](https://badge.fury.io/rb/dry-schema.svg)][gem] [![CI Status](https://github.com/dry-rb/dry-schema/workflows/ci/badge.svg)][actions]
+# dry-schema [![Gem Version](https://badge.fury.io/rb/dry-schema.svg)][gem] [![CI Status](https://github.com/dry-rb/dry-schema/workflows/CI/badge.svg)][actions]
 
 ## Links
 

data/lib/dry/schema/config.rb

@@ -22,7 +22,9 @@ module Dry
       # @return [Schema::PredicateRegistry]
       #
       # @api public
-      setting :predicates, default: Schema::PredicateRegistry.new
+      setting :predicates, default: PredicateRegistry.new, constructor: -> predicates {
+        predicates.is_a?(PredicateRegistry) ? predicates : PredicateRegistry.new(predicates)
+      }
 
       # @!method types
       #

data/lib/dry/schema/dsl.rb

@@ -39,9 +39,6 @@ module Dry
 
       extend Dry::Initializer
 
-      # @return [Compiler] The rule compiler object
-      option :compiler, default: -> { Compiler.new }
-
       # @return [Compiler] The type of the processor (Params, JSON, or a custom sub-class)
       option :processor_type, default: -> { Processor }
 
@@ -84,6 +81,7 @@ module Dry
       def self.new(**options, &block)
         dsl = super
         dsl.instance_eval(&block) if block
+        dsl.instance_variable_set("@compiler", options[:compiler]) if options[:compiler]
         dsl
       end
 
@@ -106,6 +104,16 @@ module Dry
         self
       end
 
+      # @api private
+      def compiler
+        @compiler ||= Compiler.new(predicates)
+      end
+
+      # @api private
+      def predicates
+        @predicates ||= config.predicates
+      end
+
       # Return a macro with the provided name
       #
       # @param [Symbol] name

data/lib/dry/schema/extensions/struct.rb

@@ -5,20 +5,42 @@ require "dry/struct"
 module Dry
   module Schema
     module Macros
+      class StructToSchema < ::Dry::Struct::Compiler
+        def call(struct)
+          visit(struct.to_ast)
+        end
+
+        # strip away structs from AST
+        def visit_struct(node)
+          _, ast = node
+          visit(ast)
+        end
+      end
+
+      Hash.option :struct_compiler, default: proc { StructToSchema.new(schema_dsl.config.types) }
+
       Hash.prepend(::Module.new {
         def call(*args)
-          if args.size >= 1 && args[0].is_a?(::Class) && args[0] <= ::Dry::Struct
+          if args.size >= 1 && struct?(args[0])
             if block_given?
               raise ArgumentError, "blocks are not supported when using "\
                                    "a struct class (#{name.inspect} => #{args[0]})"
             end
 
-            super(args[0].schema, *args.drop(1))
-            type(schema_dsl.types[name].constructor(args[0].schema))
+            schema = struct_compiler.(args[0])
+
+            super(schema, *args.drop(1))
+            type(schema_dsl.types[name].constructor(schema))
           else
             super
           end
         end
+
+        private
+
+        def struct?(type)
+          type.is_a?(::Class) && type <= ::Dry::Struct
+        end
       })
     end
 

data/lib/dry/schema/key_validator.rb

@@ -9,8 +9,8 @@ module Dry
     class KeyValidator
       extend Dry::Initializer
 
-      INDEX_REGEX = /\[\d+\]/.freeze
-      DIGIT_REGEX = /\A\d+\z/.freeze
+      INDEX_REGEX = /\[\d+\]/
+      DIGIT_REGEX = /\A\d+\z/
       BRACKETS = "[]"
 
       # @api private

data/lib/dry/schema/macros/core.rb

@@ -19,10 +19,10 @@ module Dry
         option :compiler, default: proc { Compiler.new }
 
         # @api private
-        option :trace, default: proc { Trace.new }
+        option :schema_dsl, optional: true
 
         # @api private
-        option :schema_dsl, optional: true
+        option :trace, default: proc { Trace.new(schema_dsl&.compiler || Compiler.new) }
 
         # @api private
         def new(**options)

data/lib/dry/schema/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Schema
-    VERSION = "1.13.1"
+    VERSION = "1.13.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-schema
 version: !ruby/object:Gem::Version
-  version: 1.13.1
+  version: 1.13.3
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-07 00:00:00.000000000 Z
+date: 2023-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby