dry-schema 1.13.0 → 1.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9899c8cf36335581b0f5f757c5a2c17d7a542b47138eb6f76dd1f8bda8ed3c65
-  data.tar.gz: 1d10a271359578fb471a6e6fd477e690f4b11888b936f92242b51c2d143b8f36
+  metadata.gz: 01ee230572b92457f6619423c9963be605d79e86cfb4cef112767eda78e5223d
+  data.tar.gz: e9584df52d3c640691168703536546654a97eec2960fc96d932ea69ba5cedc50
 SHA512:
-  metadata.gz: f6156af8cad80db7b37a2062079053cddd8d40195d50d2d0db119c4163be1c8105855a1b61bd29de82cd8ee8e96a2329c4346139190d560a8b5c858cf7401b12
-  data.tar.gz: 9bcdbb0a8feb2127bd170036904007ddc3ec6228b8a888f868e70eb3055aac718ffd5d4ee5734a10618efa545f4ea0bcb102bf760db16fe47049bac57c65b48e
+  metadata.gz: b4fa2334f3093e9a18ecea268e8f977204d40104f93c3db75c23bd82001b8b0636f9d8a4053f101b94e7a73982b5bdee67e65b5de13e7709bc1893f3a6c01061
+  data.tar.gz: 2ae6ef323db1a53ae6c375d2bdf1986379aacf5627385394549d784463fc6ebe621bcaaf73b391aa719661e66d47a7a52fd90b5539fe68e681fa4d90e268f2ca

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 <!--- 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
+
+
+### Fixed
+
+- Support sum types of hashes (issue #446 fixed via #457) (@segiddins)
+
+
+[Compare v1.13.0...v1.13.1](https://github.com/dry-rb/dry-schema/compare/v1.13.0...v1.13.1)
+
 ## 1.13.0 2022-11-24
 
 

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2022 dry-rb team
+Copyright (c) 2015-2023 dry-rb team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

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
 
@@ -14,8 +14,8 @@
 
 This library officially supports the following Ruby versions:
 
-* MRI `>= 2.7.0`
-* jruby `>= 9.3` (postponed until 2.7 is supported)
+* MRI `>= 3.0.0`
+* jruby `>= 9.4` (not tested on CI)
 
 ## License
 

data/dry-schema.gemspec

@@ -31,14 +31,14 @@ Gem::Specification.new do |spec|
   spec.metadata["source_code_uri"]   = "https://github.com/dry-rb/dry-schema"
   spec.metadata["bug_tracker_uri"]   = "https://github.com/dry-rb/dry-schema/issues"
 
-  spec.required_ruby_version = ">= 2.7.0"
+  spec.required_ruby_version = ">= 2.7"
 
   # to update dependencies edit project.yml
   spec.add_runtime_dependency "concurrent-ruby", "~> 1.0"
   spec.add_runtime_dependency "dry-configurable", "~> 1.0", ">= 1.0.1"
   spec.add_runtime_dependency "dry-core", "~> 1.0", "< 2"
   spec.add_runtime_dependency "dry-initializer", "~> 3.0"
-  spec.add_runtime_dependency "dry-logic", ">= 1.5", "< 2"
+  spec.add_runtime_dependency "dry-logic", ">= 1.4", "< 2"
   spec.add_runtime_dependency "dry-types", ">= 1.7", "< 2"
   spec.add_runtime_dependency "zeitwerk", "~> 2.6"
 

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
@@ -293,8 +301,8 @@ module Dry
       # @return [Dry::Types::Safe]
       #
       # @api private
-      def new(**options, &block)
-        self.class.new(**options, processor_type: processor_type, config: config, &block)
+      def new(klass: self.class, **options, &block)
+        klass.new(**options, processor_type: processor_type, config: config, &block)
       end
 
       # Set a type for the given key 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/macros/dsl.rb

@@ -122,7 +122,6 @@ module Dry
             macro.call(...)
           end
         end
-        ruby2_keywords :schema if respond_to?(:ruby2_keywords, true)
 
         # Specify a nested hash with enforced `hash?` type-check
         #
@@ -137,7 +136,6 @@ module Dry
             macro.call(...)
           end
         end
-        ruby2_keywords :hash if respond_to?(:ruby2_keywords, true)
 
         # Specify predicates that should be applied to each element of an array
         #
@@ -161,7 +159,6 @@ module Dry
             macro.value(...)
           end
         end
-        ruby2_keywords :each if respond_to?(:ruby2_keywords, true)
 
         # Like `each` but sets `array?` type-check
         #
@@ -181,7 +178,6 @@ module Dry
             macro.value(...)
           end
         end
-        ruby2_keywords :array if respond_to?(:ruby2_keywords, true)
 
         # Set type spec
         #
@@ -220,6 +216,8 @@ module Dry
         end
 
         # @api private
+        # rubocop: disable Metrics/AbcSize
+        # rubocop: disable Metrics/CyclomaticComplexity
         # rubocop: disable Metrics/PerceivedComplexity
         def extract_type_spec(args, nullable: false, set_type: true)
           type_spec = args[0] unless schema_or_predicate?(args[0])
@@ -232,6 +230,10 @@ module Dry
 
             if type_spec.is_a?(::Array)
               type_rule = type_spec.map { |ts| new(chain: false).value(ts) }.reduce(:|)
+            elsif type_spec.is_a?(Dry::Types::Sum) && set_type
+              type_rule = [type_spec.left, type_spec.right].map { |ts|
+                new(klass: Core, chain: false).value(ts)
+              }.reduce(:|)
             else
               type_predicates = predicate_inferrer[resolved_type]
 
@@ -249,6 +251,8 @@ module Dry
             yield(*predicates, type_spec: type_spec, type_rule: nil)
           end
         end
+        # rubocop: enable Metrics/AbcSize
+        # rubocop: enable Metrics/CyclomaticComplexity
         # rubocop: enable Metrics/PerceivedComplexity
 
         # @api private

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

@@ -26,7 +26,6 @@ module Dry
           (filter_schema_dsl[name] || filter_schema_dsl.optional(name)).value(...)
           self
         end
-        ruby2_keywords(:filter) if respond_to?(:ruby2_keywords, true)
 
         # Coerce macro to a rule
         #

data/lib/dry/schema/messages/yaml.rb

@@ -13,7 +13,7 @@ module Dry
       # @api public
       class YAML < Abstract
         LOCALE_TOKEN = "%<locale>s"
-        TOKEN_REGEXP = /%{(\w*)}/.freeze
+        TOKEN_REGEXP = /%{(\w*)}/
         EMPTY_CONTEXT = Object.new.tap { |ctx|
           def ctx.context
             binding

data/lib/dry/schema/result.rb

@@ -72,6 +72,8 @@ module Dry
       # Dump result to a hash returning processed and validated data
       #
       # @return [Hash]
+      #
+      # @api private
       def output
         path.equal?(Path::EMPTY) ? @output : @output.dig(*path)
       end

data/lib/dry/schema/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Schema
-    VERSION = "1.13.0"
+    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.0
+  version: 1.13.3
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-24 00:00:00.000000000 Z
+date: 2023-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -84,7 +84,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.4'
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -94,7 +94,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.4'
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -274,14 +274,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Coercion and validation for data structures