dry-schema 1.10.2 → 1.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e0f30051a5014afc7cf0dc8f66f23a20f05e83dd3b2a970491d85d84e5be988
-  data.tar.gz: 771b790fd369f36abf86367a95afaac387825df4b041bdc325c02f7f41cd3487
+  metadata.gz: 52498945533408be846a7c22b278471bb1e45fec87b9b3a994eee33034009fff
+  data.tar.gz: 1b5f542e5c07fb57a67cd7fa2062bf17a51bcc6acf2e9ba4955468f42a9c4b08
 SHA512:
-  metadata.gz: 12759b86883bd94e85480124539c44a3280491935a86addacd02c799696cce5d5e1cec54238b17d89c05cbe704e2394ac4749c9349e9f8e1bbe6ed92f344af73
-  data.tar.gz: 57b2a77a57ef8587a3a520eeecc7cc3dd5d766a92ba5096ed2306c0e466ee0c9580e7550c3ef475e88eb61a58ce7c92de3860442e29455f5590ccfa0bd7b5eda
+  metadata.gz: d189171c08a31c3011ff9747890eb3286f019edd2a5ec6f8bb28c9dcfd1b623886d52cdd88715bac608c1adf58d0ffd139c68a228799d207d1353821f16f5dd9
+  data.tar.gz: 105ac239e814c3ce1b40641137c5b9bf01dbd3c077d3891606773e4825f92c90a37d1248f6b352f75b77bafc80b52b2a0c1d4b719ec3a4a5fde09c186f6dd4f5

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
+## 1.10.3 2019-10-10
+
+
+### Fixed
+
+- Addressed regressions causing issues with handling sum types (see #419 and #423 fixed via #425) (@robhanlon22)
+
+
+[Compare v1.10.2...v1.10.3](https://github.com/dry-rb/dry-schema/compare/v1.10.2...v1.10.3)
+
 ## 1.10.2 2022-08-23
 
 

data/dry-schema.gemspec

@@ -36,10 +36,10 @@ Gem::Specification.new do |spec|
   # to update dependencies edit project.yml
   spec.add_runtime_dependency "concurrent-ruby", "~> 1.0"
   spec.add_runtime_dependency "dry-configurable", "~> 0.13", ">= 0.13.0"
-  spec.add_runtime_dependency "dry-core", "~> 0.5", ">= 0.5"
+  spec.add_runtime_dependency "dry-core", "~> 0.9", ">= 0.9"
   spec.add_runtime_dependency "dry-initializer", "~> 3.0"
-  spec.add_runtime_dependency "dry-logic", "~> 1.0"
-  spec.add_runtime_dependency "dry-types", "~> 1.5"
+  spec.add_runtime_dependency "dry-logic", "~> 1.3"
+  spec.add_runtime_dependency "dry-types", "~> 1.6"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

data/lib/dry/schema/compiler.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/logic/rule_compiler"
 require "dry/schema/namespaced_rule"
 require "dry/schema/predicate_registry"
 

data/lib/dry/schema/config.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/core/equalizer"
-require "dry/configurable"
-
 require "dry/schema/constants"
 require "dry/schema/predicate_registry"
 require "dry/schema/type_container"

data/lib/dry/schema/constants.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "pathname"
-require "dry/core/constants"
 
 module Dry
   # Common constants used across the library

data/lib/dry/schema/key_coercer.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/core/cache"
-require "dry/core/equalizer"
-
 module Dry
   module Schema
     # Coerces keys in a hash using provided coercer function

data/lib/dry/schema/key_map.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/core/equalizer"
-require "dry/core/cache"
 require "dry/schema/constants"
 require "dry/schema/key"
 

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/logic/operators"
-
 require "dry/schema/macros/core"
 require "dry/schema/predicate_inferrer"
 require "dry/schema/primitive_inferrer"
@@ -85,6 +83,24 @@ module Dry
           end
         end
 
+        # Set type specification and predicates for a maybe value
+        #
+        # @example
+        #   required(:name).maybe(:string)
+        #
+        # @see Macros::Key#value
+        #
+        # @return [Macros::Key]
+        #
+        # @api public
+        def maybe(*args, **opts, &block)
+          extract_type_spec(args, nullable: true) do |*predicates, type_spec:, type_rule:|
+            append_macro(Macros::Maybe) do |macro|
+              macro.call(*predicates, type_spec: type_spec, type_rule: type_rule, **opts, &block)
+            end
+          end
+        end
+
         # Specify a nested hash without enforced `hash?` type-check
         #
         # This is a simpler building block than `hash` macro, use it

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/types/type"
 require "dry/schema/macros/dsl"
 
 module Dry

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

@@ -13,12 +13,15 @@ module Dry
         def call(*predicates, **opts, &block)
           ensure_valid_predicates(predicates)
 
-          if opts[:type_spec] && !filter_empty_string?
-            value(predicates[0], :filled?, *predicates[1..predicates.size - 1], **opts, &block)
-          elsif opts[:type_rule]
-            value(:filled?).value(*predicates, **opts, &block)
-          else
-            value(:filled?, *predicates, **opts, &block)
+          append_macro(Macros::Value) do |macro|
+            if opts[:type_spec] && !filter_empty_string?
+              macro.call(predicates[0], :filled?, *predicates[1..predicates.size - 1], **opts,
+                         &block)
+            elsif opts[:type_rule]
+              macro.call(:filled?).value(*predicates, **opts, &block)
+            else
+              macro.call(:filled?, *predicates, **opts, &block)
+            end
           end
         end
 

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

@@ -32,24 +32,6 @@ module Dry
         end
         ruby2_keywords(:filter) if respond_to?(:ruby2_keywords, true)
 
-        # Set type specification and predicates for a maybe value
-        #
-        # @example
-        #   required(:name).maybe(:string)
-        #
-        # @see Macros::Key#value
-        #
-        # @return [Macros::Key]
-        #
-        # @api public
-        def maybe(*args, **opts, &block)
-          extract_type_spec(args, nullable: true) do |*predicates, type_spec:, type_rule:|
-            append_macro(Macros::Maybe) do |macro|
-              macro.call(*predicates, type_spec: type_spec, type_rule: type_rule, **opts, &block)
-            end
-          end
-        end
-
         # Coerce macro to a rule
         #
         # @return [Dry::Logic::Rule]

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

@@ -19,7 +19,9 @@ module Dry
             raise ::Dry::Schema::InvalidSchemaError, "Using maybe with nil? predicate is redundant"
           end
 
-          value(*args, **opts, &block)
+          append_macro(Macros::Value) do |macro|
+            macro.call(*args, **opts, &block)
+          end
 
           self
         end

data/lib/dry/schema/message.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "dry/initializer"
-require "dry/core/equalizer"
 
 require "dry/schema/path"
 require "dry/schema/message/or"

data/lib/dry/schema/message_set.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/core/equalizer"
-
 module Dry
   module Schema
     # A set of messages used to generate errors

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

@@ -2,8 +2,6 @@
 
 require "set"
 require "concurrent/map"
-require "dry/core/equalizer"
-require "dry/configurable"
 
 require "dry/schema/constants"
 require "dry/schema/messages/template"

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "dry/initializer"
-require "dry/core/equalizer"
 
 require "dry/schema/constants"
 

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

@@ -3,7 +3,6 @@
 require "yaml"
 require "pathname"
 
-require "dry/core/equalizer"
 require "dry/schema/constants"
 require "dry/schema/messages/abstract"
 
@@ -169,11 +168,9 @@ module Dry
             text = input.gsub("%", "#")
 
             # rubocop:disable Security/Eval
-            # rubocop:disable Style/DocumentDynamicEvalDefinition
             evaluator = eval(<<~RUBY, EMPTY_CONTEXT, __FILE__, __LINE__ + 1)
               -> (#{tokens.map { |token| "#{token}:" }.join(", ")}) { "#{text}" }
             RUBY
-            # rubocop:enable Style/DocumentDynamicEvalDefinition
             # rubocop:enable Security/Eval
 
             {

data/lib/dry/schema/predicate.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/core/equalizer"
-require "dry/logic/operators"
-
 module Dry
   module Schema
     # Predicate objects used within the DSL

data/lib/dry/schema/predicate_inferrer.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/types/predicate_inferrer"
-
 module Dry
   module Schema
     # @api private

data/lib/dry/schema/predicate_registry.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/logic/predicates"
-require "dry/types/predicate_registry"
-
 module Dry
   module Schema
     # A registry with predicate objects from `Dry::Logic::Predicates`

data/lib/dry/schema/primitive_inferrer.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/types/primitive_inferrer"
-
 module Dry
   module Schema
     # @api private

data/lib/dry/schema/processor.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-require "dry/configurable"
 require "dry/initializer"
-require "dry/logic/operators"
 
 require "dry/schema/type_registry"
 require "dry/schema/type_container"

data/lib/dry/schema/result.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "dry/initializer"
-require "dry/core/equalizer"
 
 require "dry/schema/path"
 

data/lib/dry/schema/value_coercer.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/core/equalizer"
 require "dry/initializer"
 
 module Dry

data/lib/dry/schema/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Schema
-    VERSION = "1.10.2"
+    VERSION = "1.10.3"
   end
 end

data/lib/dry/schema.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
-require "dry/core/extensions"
+require "dry/core"
 require "dry/configurable"
 require "dry/logic"
+require "dry/types"
 
 require "dry/schema/config"
 require "dry/schema/constants"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-schema
 version: !ruby/object:Gem::Version
-  version: 1.10.2
+  version: 1.10.3
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-23 00:00:00.000000000 Z
+date: 2022-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -50,20 +50,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: dry-initializer
   requirement: !ruby/object:Gem::Requirement
@@ -84,28 +84,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: dry-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement