dry-schema 1.3.4 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9efbd58d7d7d70ec01d578de507f1fc6ba3e78bfeb81e30e8b69a2ca29fbc753
-  data.tar.gz: 874370eec0e97f1b87bee9a18d606a45b0aba4d80729c7637407147f4f01a7fc
+  metadata.gz: 8bf30b15bfb1d11c70a14898fe9ac7d9cb74f46f70b5a26b1e08cf6568414160
+  data.tar.gz: fcd0fc1691ffe1e2b2f5129710fa920daf7ec968749625e050fba3ee9a2a7f73
 SHA512:
-  metadata.gz: 8b23a5b75861ef7f9c9ab8430439f580877788c98f79268913723e9fea653df7aaf3fc074839ce561b42c8f7268f9a22069e0a7c8c3f71b20f9cdd4956df1aad
-  data.tar.gz: ee1987669c04d04b93d20d1a975c2418b8cf9b355caf96a313f9a7f4b50d60514ec2071af82d263f0972fc3c24c865c3fb67b7073a914a3dce1636ce958ea455
+  metadata.gz: 7d5a852339e072be3b033268ed826d75a319cf0c33f279e507fc80d6a3ba079370bd7e2859d3aaa5dba786e85521f9c328cf5107f941fa05f422d0bd1a8250af
+  data.tar.gz: f1e95d4206bc7f45ccc8a5018c14f52f20db4c314509d2eedf72a67284cd574f43ee8d73ec071b7325be0512b87269043d1d488ab63c437fd767032907b0183f

data/CHANGELOG.md

@@ -1,8 +1,29 @@
+# 1.4.0 2019-10-08
+
+### Added
+
+- Support for passing multiple parent schemas. They are inherited from left to right (@ianwhite)
+
+	```ruby
+	Dry::Schema.define(parent: [parent_a, parent_b, parent_c]) do
+		...
+	end
+	```
+
+- Improved error messages about missing translations (@skryukov)
+- [experimental] before/after callbacks for schema steps (@skryukov)
+
+### Fixed
+
+- Added/fixed support for custom optional types (@flash-gordon)
+
+[Compare v1.3.4...v1.4.0](https://github.com/dry-rb/dry-schema/compare/v1.3.4...v1.4.0)
+
 # 1.3.4 2019-09-11
 
 ### Fixed
 
-* Fixed regression where using `array?` predicate within a block would crach (issue #186) (@skryukov)
+- Fixed regression where using `array?` predicate within a block would crach (issue #186) (@skryukov)
 
 [Compare v1.3.3...v1.3.4](https://github.com/dry-rb/dry-schema/compare/v1.3.3...v1.3.4)
 
@@ -10,10 +31,10 @@
 
 ### Fixed
 
-* Reject attempts to build a nested schema for array types built on `Dry::Types::Nominal` (fixed #171) (@flash-gordon)
-* Current `I18n.locale` is now properly handled when caching message templates (@flash-gordon)
-* Default processor uses strict types by default, which fixes various cases when `maybe` is used with a constructor type (@flash-gordon)
-* Namespaced messages no longer causes a crash when used with nested schemas (fixed #176) (@solnic)
+- Reject attempts to build a nested schema for array types built on `Dry::Types::Nominal` (fixed #171) (@flash-gordon)
+- Current `I18n.locale` is now properly handled when caching message templates (@flash-gordon)
+- Default processor uses strict types by default, which fixes various cases when `maybe` is used with a constructor type (@flash-gordon)
+- Namespaced messages no longer causes a crash when used with nested schemas (fixed #176) (@solnic)
 
 [Compare v1.3.2...v1.3.3](https://github.com/dry-rb/dry-schema/compare/v1.3.2...v1.3.3)
 
@@ -21,7 +42,7 @@
 
 ### Added
 
-* Support for new predicates: `bytesize?`, `min_bytesize?` and `max_bytesize?` (@bmalinconico)
+- Support for new predicates: `bytesize?`, `min_bytesize?` and `max_bytesize?` (@bmalinconico)
 
 [Compare v1.3.1...v1.3.2](https://github.com/dry-rb/dry-schema/compare/v1.3.1...v1.3.2)
 
@@ -29,8 +50,8 @@
 
 ### Fixed
 
-* `Result#error?` works correctly with nested hashes and arrays (@solnic)
-* `:hints` extension no longer causes a crash where base messages are generated too (issue #165) (@solnic)
+- `Result#error?` works correctly with nested hashes and arrays (@solnic)
+- `:hints` extension no longer causes a crash where base messages are generated too (issue #165) (@solnic)
 
 [Compare v1.3.0...v1.3.1](https://github.com/dry-rb/dry-schema/compare/v1.3.0...v1.3.1)
 
@@ -40,15 +61,15 @@
 
 - Automatic predicate inferring for constrained types! (@flash-gordon)
 
-  ```ruby
-  Types::Name = Types::String.constrained(min_size: 1)
+	```ruby
+	Types::Name = Types::String.constrained(min_size: 1)
 
-  schema = Dry::Schema.define do
-    required(:name).value(Types::Name)
-  end
+	schema = Dry::Schema.define do
+		required(:name).value(Types::Name)
+	end
 
-  schema.(name: '').errors.to_h # => { name: ["size cannot be less than 1"] }
-  ```
+	schema.(name: '').errors.to_h # => { name: ["size cannot be less than 1"] }
+	```
 
 - Support for redefining re-used schemas (issue #43) (@skryukov)
 
@@ -64,19 +85,19 @@
 
 - Ability to configure your own type container (@Morozzzko)
 
-  ```ruby
-  types = Dry::Schema::TypeContainer.new
-  types.register(
-    'params.trimmed_string',
-    Types::String.constructor(&:strip).constructor(&:downcase)
-  )
+	```ruby
+	types = Dry::Schema::TypeContainer.new
+	types.register(
+		'params.trimmed_string',
+		Types::String.constructor(&:strip).constructor(&:downcase)
+	)
 
-  Dry::Schema.Params do
-    config.types = types
+	Dry::Schema.Params do
+		config.types = types
 
-    require(:name).value(:trimmed_string)
-  end
-  ```
+		require(:name).value(:trimmed_string)
+	end
+	```
 
 ### Fixed
 
@@ -98,18 +119,18 @@
 
 ### Added
 
-- `config.messages.default_locale` for setting...default locale (surprise, surprise) (solnic)
-- `Config` exposes `predicates` setting too (solnic)
+- `config.messages.default_locale` for setting...default locale (surprise, surprise) (@solnic)
+- `Config` exposes `predicates` setting too (@solnic)
 
 ### Fixed
 
-- `filled` macro behavior results in `must be filled` error messages when appropriate - see PR #141 for more information (issue #134) (solnic)
-- Filter rules no longer cause keys to be added to input (issue #142) (solnic)
-- Filter rules work now with inheritance (solnic)
-- Inherited type schemas used by coercion are now properly configured as `lax` type (solnic)
-- `Config` is now finalized before instantiating schemas and properly dupped when its inherited (flash-gordon + solnic)
-- `Config#eql?` works as expected (solnic)
-- Predicates are properly inferred from array with a member type spec, ie `array[:integer]` results in `array? + each(:integer?)` (issue #140) (solnic)
+- `filled` macro behavior results in `must be filled` error messages when appropriate - see PR #141 for more information (issue #134) (@solnic)
+- Filter rules no longer cause keys to be added to input (issue #142) (@solnic)
+- Filter rules work now with inheritance (@solnic)
+- Inherited type schemas used by coercion are now properly configured as `lax` type (@solnic)
+- `Config` is now finalized before instantiating schemas and properly dupped when its inherited (@flash-gordon + @solnic)
+- `Config#eql?` works as expected (@solnic)
+- Predicates are properly inferred from array with a member type spec, ie `array[:integer]` results in `array? + each(:integer?)` (issue #140) (@solnic)
 
 [Compare v1.0.3...v1.1.0](https://github.com/dry-rb/dry-schema/compare/v1.0.3...v1.1.0)
 
@@ -117,9 +138,9 @@
 
 ### Fixed
 
-- `Object#hash` is no longer used to calculate cache keys due to a potential risk of having hash collisions (solnic)
-- Predicate arguments are used again for template cache keys (solnic)
-- `I18n` messages backend no longer evaluates templates twice (solnic)
+- `Object#hash` is no longer used to calculate cache keys due to a potential risk of having hash collisions (@solnic)
+- Predicate arguments are used again for template cache keys (@solnic)
+- `I18n` messages backend no longer evaluates templates twice (@solnic)
 
 [Compare v1.0.2...v1.0.3](https://github.com/dry-rb/dry-schema/compare/v1.0.2...v1.0.3)
 
@@ -127,7 +148,7 @@
 
 ### Fixed
 
-- Caching message templates uses restricted set of known keys to calculate cache keys (issue #132) (solnic)
+- Caching message templates uses restricted set of known keys to calculate cache keys (issue #132) (@solnic)
 
 [Compare v1.0.1...v1.0.2](https://github.com/dry-rb/dry-schema/compare/v1.0.1...v1.0.2)
 
@@ -135,7 +156,7 @@
 
 ### Fixed
 
-- Applying `key?` predicate no longer causes recursive calls to `Result#errors` (issue #130) (solnic)
+- Applying `key?` predicate no longer causes recursive calls to `Result#errors` (issue #130) (@solnic)
 
 [Compare v1.0.0...v1.0.1](https://github.com/dry-rb/dry-schema/compare/v1.0.0...v1.0.1)
 
@@ -143,12 +164,12 @@
 
 ### Changed
 
-- [BREAKING] `Result#to_hash` was removed (solnic)
+- [BREAKING] `Result#to_hash` was removed (@solnic)
 
 ### Fixed
 
-- Setting `:any` as the type spec no longer crashes (solnic)
-- `Result#error?` handles paths to array elements correctly (solnic)
+- Setting `:any` as the type spec no longer crashes (@solnic)
+- `Result#error?` handles paths to array elements correctly (@solnic)
 
 [Compare v0.6.0...v1.0.0](https://github.com/dry-rb/dry-schema/compare/v0.6.0...v1.0.0)
 
@@ -156,9 +177,9 @@
 
 ### Changed
 
-- Dependency on `dry-types` was bumped to `~> 1.0` (solnic)
-- Dependency on `dry-logic` was bumped to `~> 1.0` (solnic)
-- Dependency on `dry-initializer` was bumped to `~> 3.0` (solnic)
+- Dependency on `dry-types` was bumped to `~> 1.0` (@solnic)
+- Dependency on `dry-logic` was bumped to `~> 1.0` (@solnic)
+- Dependency on `dry-initializer` was bumped to `~> 3.0` (@solnic)
 
 [Compare v0.5.1...v0.6.0](https://github.com/dry-rb/dry-schema/compare/v0.5.1...v0.6.0)
 
@@ -166,7 +187,7 @@
 
 ### Fixed
 
-- Key map no longer crashes on unexpected input (issue #118) (solnic)
+- Key map no longer crashes on unexpected input (issue #118) (@solnic)
 
 [Compare v0.5.0...v0.5.1](https://github.com/dry-rb/dry-schema/compare/v0.5.0...v0.5.1)
 
@@ -176,38 +197,38 @@
 
 - Support for arbitrary meta-data in messages, ie:
 
-  ```yaml
-  en:
-    dry_schema:
-      errors:
-        filled?:
-          text: "cannot be blank"
-          code: 123
-  ```
+	```yaml
+	en:
+		dry_schema:
+			errors:
+				filled?:
+					text: "cannot be blank"
+					code: 123
+	```
 
-  Now your error hash will include `{ foo: [{ text: 'cannot be blank', code: 123 }] }` (solnic + flash-gordon)
+	Now your error hash will include `{ foo: [{ text: 'cannot be blank', code: 123 }] }` (@solnic + @flash-gordon)
 
-- Support for type specs in `array` macro, ie `required(:tags).array(:integer)` (solnic)
-- Support for type specs in `each` macro, ie `required(:tags).each(:integer)` (solnic)
+- Support for type specs in `array` macro, ie `required(:tags).array(:integer)` (@solnic)
+- Support for type specs in `each` macro, ie `required(:tags).each(:integer)` (@solnic)
 - Shortcut for defining an array with hash as its member, ie:
 
-  ```ruby
-  Dry::Schema.Params do
-    required(:tags).array(:hash) do
-      required(:name).filled(:string)
-    end
-  end
-  ```
+	```ruby
+	Dry::Schema.Params do
+		required(:tags).array(:hash) do
+			required(:name).filled(:string)
+		end
+	end
+	```
 
 ### Fixed
 
-- Inferring predicates doesn't crash when `Any` type is used (flash-gordon)
-- Inferring type specs when type is already set works correctly (solnic)
+- Inferring predicates doesn't crash when `Any` type is used (@flash-gordon)
+- Inferring type specs when type is already set works correctly (@solnic)
 
 ### Changed
 
-- [BREAKING] `:monads` extension wraps entire result objects in `Success` or `Failure` (flash-gordon)
-- When `:hints` are disabled, result AST will not include hint nodes (solnic)
+- [BREAKING] `:monads` extension wraps entire result objects in `Success` or `Failure` (@flash-gordon)
+- When `:hints` are disabled, result AST will not include hint nodes (@solnic)
 
 [Compare v0.4.0...v0.5.0](https://github.com/dry-rb/dry-schema/compare/v0.4.0...v0.5.0)
 
@@ -215,30 +236,30 @@
 
 ### Added
 
-- Schemas are now compatible with procs via `#to_proc` (issue #53) (solnic)
-- Support for configuring `top_namespace` for localized messages (solnic)
-- Support for configuring more than one load path for localized messages (solnic)
-- Support for inferring predicates from arbitrary types (issue #101) (solnic)
+- Schemas are now compatible with procs via `#to_proc` (issue #53) (@solnic)
+- Support for configuring `top_namespace` for localized messages (@solnic)
+- Support for configuring more than one load path for localized messages (@solnic)
+- Support for inferring predicates from arbitrary types (issue #101) (@solnic)
 
 ### Fixed
 
-- Handling of messages for `optional` keys without value rules works correctly (issue #87) (solnic)
-- Message structure for `optional` keys with an array of hashes no longer duplicates keys (issue #89) (solnic)
-- Inferring `:date_time?` predicate works correctly with `DateTime` types (issue #97) (solnic)
+- Handling of messages for `optional` keys without value rules works correctly (issue #87) (@solnic)
+- Message structure for `optional` keys with an array of hashes no longer duplicates keys (issue #89) (@solnic)
+- Inferring `:date_time?` predicate works correctly with `DateTime` types (issue #97) (@solnic)
 
 ### Changed
 
-- [BREAKING] Updated to work with `dry-types 0.15.0` (flash-gordon)
-- [BREAKING] `Result#{errors,messages,hints}` returns `MessageSet` object now which is an enumerable coercible to a hash (solnic)
-- [BREAKING] `Messages` backend classes no longer use global configuration (solnic)
-- [BREAKING] Passing a non-symbol key name in the DSL will raise `ArgumentError` (issue #29) (solnic)
+- [BREAKING] Updated to work with `dry-types 0.15.0` (@flash-gordon)
+- [BREAKING] `Result#{errors,messages,hints}` returns `MessageSet` object now which is an enumerable coercible to a hash (@solnic)
+- [BREAKING] `Messages` backend classes no longer use global configuration (@solnic)
+- [BREAKING] Passing a non-symbol key name in the DSL will raise `ArgumentError` (issue #29) (@solnic)
 - [BREAKING] Configuration for message backends is now nested under `messages` key with following settings:
-  - `messages.backend` - previously `messages`
-  - `messages.load_paths` - previously `messages_path`
-  - `messages.namespace` - previously `namespace`
-  - `messages.top_namespace` - **new setting** see above
-- [BREAKING] `Messages::I18n` uses `I18.store_translations` instead of messing with `I18n.load_path` (solnic)
-- Schemas (`Params` and `JSON`) have nicer inspect (solnic)
+	- `messages.backend` - previously `messages`
+	- `messages.load_paths` - previously `messages_path`
+	- `messages.namespace` - previously `namespace`
+	- `messages.top_namespace` - **new setting** see above
+- [BREAKING] `Messages::I18n` uses `I18.store_translations` instead of messing with `I18n.load_path` (@solnic)
+- Schemas (`Params` and `JSON`) have nicer inspect (@solnic)
 
 [Compare v0.3.0...v0.4.0](https://github.com/dry-rb/dry-schema/compare/v0.3.0...v0.4.0)
 
@@ -246,16 +267,16 @@
 
 ### Fixed
 
-- Configuration is properly inherited from a parent schema (skryukov)
-- `Result#error?` returns `true` when a preceding key has errors (solnic)
-- Predicate inferrer no longer chokes on sum, constructor and enum types (solnic)
-- Predicate inferrer infers `:bool?` from boolean types (solnic)
-- Block-based definitions using `array` works correctly (solnic)
-- Using a disjunction with `array` and `hash` produces correct errors when element validation for array failed (solnic)
+- Configuration is properly inherited from a parent schema (@skryukov)
+- `Result#error?` returns `true` when a preceding key has errors (@solnic)
+- Predicate inferrer no longer chokes on sum, constructor and enum types (@solnic)
+- Predicate inferrer infers `:bool?` from boolean types (@solnic)
+- Block-based definitions using `array` works correctly (@solnic)
+- Using a disjunction with `array` and `hash` produces correct errors when element validation for array failed (@solnic)
 
 ### Changed
 
-- Required ruby version was removed from gemspec for people who are stuck on MRI 2.3.x (solnic)
+- Required ruby version was removed from gemspec for people who are stuck on MRI 2.3.x (@solnic)
 
 [Compare v0.2.0...v0.3.0](https://github.com/dry-rb/dry-schema/compare/v0.2.0...v0.3.0)
 
@@ -263,28 +284,28 @@
 
 ### Added
 
-- New `hash` macro which prepends `hash?` type-check and allows nested schema definition (solnic)
-- New `array` macro which works like `each` but prepends `array?` type-check (solnic)
+- New `hash` macro which prepends `hash?` type-check and allows nested schema definition (@solnic)
+- New `array` macro which works like `each` but prepends `array?` type-check (@solnic)
 
 ### Fixed
 
-- Rule name translation works correctly with I18n (issue #52) (solnic)
-- Rule name translation works correctly with namespaced messages (both I18n and plain YAML) (issue #57) (solnic)
-- Error messages under namespaces are correctly resolved for overridden names (issue #53) (solnic)
-- Namespaced error messages work correctly when schemas are reused within other schemas (issue #49) (solnic)
-- Child schema can override inherited rules now (issue #66) (skryukov)
-- Hints are correctly generated for disjunction that use type-check predicates (issue #24) (solnic)
-- Hints are correctly generated for nested schemas (issue #26) (solnic)
-- `filled` macro respects inferred type-check predicates and puts them in front (solnic)
-- Value coercion works correctly with re-usable nested schemas (issue #25) (solnic)
+- Rule name translation works correctly with I18n (issue #52) (@solnic)
+- Rule name translation works correctly with namespaced messages (both I18n and plain YAML) (issue #57) (@solnic)
+- Error messages under namespaces are correctly resolved for overridden names (issue #53) (@solnic)
+- Namespaced error messages work correctly when schemas are reused within other schemas (issue #49) (@solnic)
+- Child schema can override inherited rules now (issue #66) (@skryukov)
+- Hints are correctly generated for disjunction that use type-check predicates (issue #24) (@solnic)
+- Hints are correctly generated for nested schemas (issue #26) (@solnic)
+- `filled` macro respects inferred type-check predicates and puts them in front (@solnic)
+- Value coercion works correctly with re-usable nested schemas (issue #25) (@solnic)
 
 ### Changed
 
-- [BREAKING] **Messages are now configured under `dry_schema` namespace by default** (issue #38) (solnic)
-- [BREAKING] Hints are now an optional feature provided by `:hints` extension, to load it do `Dry::Schema.load_extensions(:hints)` (solnic)
-- [BREAKING] Hints generation was improved in general, output of `Result#messages` and `Result#hints` changed in some cases (solnic)
-- [BREAKING] `schema` macro no longer prepends `hash?` check, for this behavior use the new `hash` macro (see #31) (solnic)
-- [BREAKING] Support for MRI < 2.4 was dropped (solnic)
+- [BREAKING] **Messages are now configured under `dry_schema` namespace by default** (issue #38) (@solnic)
+- [BREAKING] Hints are now an optional feature provided by `:hints` extension, to load it do `Dry::Schema.load_extensions(:hints)` (@solnic)
+- [BREAKING] Hints generation was improved in general, output of `Result#messages` and `Result#hints` changed in some cases (@solnic)
+- [BREAKING] `schema` macro no longer prepends `hash?` check, for this behavior use the new `hash` macro (see #31) (@solnic)
+- [BREAKING] Support for MRI < 2.4 was dropped (@solnic)
 
 [Compare v0.1.1...v0.2.0](https://github.com/dry-rb/dry-schema/compare/v0.1.1...v0.2.0)
 
@@ -292,16 +313,16 @@
 
 ### Added
 
-- `Result#error?` supports checking nested errors too ie`result.error?('user.address')` (solnic)
+- `Result#error?` supports checking nested errors too ie`result.error?('user.address')` (@solnic)
 
 ### Fixed
 
-- Fix issues with templates and invalid tokens (issue #27) (solnic)
-- Fix Ruby warnings (flash-gordon)
+- Fix issues with templates and invalid tokens (issue #27) (@solnic)
+- Fix Ruby warnings (@flash-gordon)
 
 ### Internal
 
-- Key and value coercers are now equalizable (flash-gordon)
+- Key and value coercers are now equalizable (@flash-gordon)
 
 [Compare v0.1.0...v0.1.1](https://github.com/dry-rb/dry-schema/compare/v0.1.0...v0.1.1)
 

data/README.md

@@ -1,5 +1,6 @@
 [gem]: https://rubygems.org/gems/dry-schema
 [travis]: https://travis-ci.com/dry-rb/dry-schema
+[actions]: https://github.com/dry-rb/dry-schema/actions
 [codeclimate]: https://codeclimate.com/github/dry-rb/dry-schema
 [chat]: https://dry-rb.zulipchat.com
 [inchpages]: http://inch-ci.org/github/dry-rb/dry-schema
@@ -7,7 +8,8 @@
 # dry-schema [![Join the chat at https://dry-rb.zulipchat.com](https://img.shields.io/badge/dry--rb-join%20chat-%23346b7a.svg)][chat]
 
 [![Gem Version](https://badge.fury.io/rb/dry-schema.svg)][gem]
-[![Build Status](https://travis-ci.com/dry-rb/dry-schema.svg?branch=master)][travis]
+[![Travis Status](https://travis-ci.com/dry-rb/dry-schema.svg?branch=master)][travis]
+[![CI Status](https://github.com/dry-rb/dry-schema/workflows/ci/badge.svg)][actions]
 [![Code Climate](https://codeclimate.com/github/dry-rb/dry-schema/badges/gpa.svg)][codeclimate]
 [![Test Coverage](https://codeclimate.com/github/dry-rb/dry-schema/badges/coverage.svg)][codeclimate]
 [![Inline docs](http://inch-ci.org/github/dry-rb/dry-schema.svg?branch=master)][inchpages]

data/lib/dry/schema/constants.rb

@@ -26,10 +26,11 @@ module Dry
     # An error raised when a localized message cannot be found
     MissingMessageError = Class.new(StandardError) do
       # @api private
-      def initialize(path)
+      def initialize(path, paths = [])
         *rest, rule = path
         super(<<~STR)
-          Message template for #{rule.inspect} under #{rest.join(DOT).inspect} was not found
+          Message template for #{rule.inspect} under #{rest.join(DOT).inspect} was not found. Searched in:
+          #{paths.map { |string| "\"#{string}\"" }.join("\n")}
         STR
       end
     end

data/lib/dry/schema/dsl.rb

@@ -9,6 +9,7 @@ require 'dry/schema/types'
 require 'dry/schema/macros'
 
 require 'dry/schema/processor'
+require 'dry/schema/processor_steps'
 require 'dry/schema/key_map'
 require 'dry/schema/key_coercer'
 require 'dry/schema/value_coercer'
@@ -64,18 +65,21 @@ module Dry
       # @return [Compiler] A key=>type map defined within the DSL
       option :types, default: -> { EMPTY_HASH.dup }
 
-      # @return [DSL] An optional parent DSL object that will be used to merge keys and rules
-      option :parent, optional: true
+      # @return [Array] Optional parent DSL objects, that will be used to merge keys and rules
+      option :parent, Types::Coercible::Array, default: -> { EMPTY_ARRAY.dup }, as: :parents
 
       # @return [Config] Configuration object exposed via `#configure` method
       option :config, optional: true, default: proc { parent ? parent.config.dup : Config.new }
 
+      # @return [ProcessorSteps] Steps for the processor
+      option :steps, default: proc { parent ? parent.steps.dup : ProcessorSteps.new }
+
       # Build a new DSL object and evaluate provided block
       #
       # @param [Hash] options
       # @option options [Class] :processor The processor type (`Params`, `JSON` or a custom sub-class)
       # @option options [Compiler] :compiler An instance of a rule compiler (must be compatible with `Schema::Compiler`) (optional)
-      # @option options [DSL] :parent An instance of the parent DSL (optional)
+      # @option options [Array[DSL]] :parent One or more instances of the parent DSL (optional)
       # @option options [Config] :config A configuration object (optional)
       #
       # @see Schema.define
@@ -189,9 +193,10 @@ module Dry
       #
       # @api private
       def call
-        steps = [key_coercer]
-        steps << filter_schema.rule_applier if filter_rules?
-        steps << value_coercer << rule_applier
+        steps[:key_coercer] = key_coercer
+        steps[:value_coercer] = value_coercer
+        steps[:rule_applier] = rule_applier
+        steps[:filter_schema] = filter_schema.rule_applier if filter_rules?
 
         processor_type.new(schema_dsl: self, steps: steps)
       end
@@ -215,14 +220,54 @@ module Dry
         -> member_type { type_registry['array'].of(resolve_type(member_type)) }
       end
 
+      # Method allows steps injection to the processor
+      #
+      # @example
+      #   before(:rule_applier) do |input|
+      #     input.compact
+      #   end
+      #
+      # @return [DSL]
+      #
+      # @api public
+      def before(key, &block)
+        steps.before(key, &block)
+        self
+      end
+
+      # Method allows steps injection to the processor
+      #
+      # @example
+      #   after(:rule_applier) do |input|
+      #     input.compact
+      #   end
+      #
+      # @return [DSL]
+      #
+      # @api public
+      def after(key, &block)
+        steps.after(key, &block)
+        self
+      end
+
+      # The parent (last from parents) which is used for copying non mergeable configuration
+      #
+      # @return DSL
+      #
+      # @api public
+      def parent
+        @parent ||= parents.last
+      end
+
       # Return type schema used by the value coercer
       #
       # @return [Dry::Types::Safe]
       #
       # @api private
       def type_schema
-        schema = type_registry['hash'].schema(types).lax
-        parent ? parent.type_schema.schema(schema.to_a) : schema
+        our_schema = type_registry['hash'].schema(types).lax
+        schemas = [*parents.map(&:type_schema), our_schema]
+        schemas.inject { |result, schema| result.schema(schema.to_a) }
       end
 
       # Return a new DSL instance using the same processor type
@@ -276,14 +321,18 @@ module Dry
       #
       # @api private
       def filter_schema_dsl
-        @filter_schema_dsl ||= new(parent: parent_filter_schema)
+        @filter_schema_dsl ||= new(parent: parent_filter_schemas)
       end
 
       # Check if any filter rules were defined
       #
       # @api private
       def filter_rules?
-        (instance_variable_defined?('@filter_schema_dsl') && !filter_schema_dsl.macros.empty?) || parent&.filter_rules?
+        if instance_variable_defined?('@filter_schema_dsl') && !filter_schema_dsl.macros.empty?
+          return true
+        end
+
+        parents.any?(&:filter_rules?)
       end
 
       protected
@@ -323,10 +372,8 @@ module Dry
       private
 
       # @api private
-      def parent_filter_schema
-        return unless parent
-
-        parent.filter_schema if parent.filter_rules?
+      def parent_filter_schemas
+        parents.select(&:filter_rules?).map(&:filter_schema)
       end
 
       # Build a key coercer
@@ -380,12 +427,12 @@ module Dry
 
       # @api private
       def parent_rules
-        parent&.rules || EMPTY_HASH
+        parents.reduce({}) { |rules, parent| rules.merge(parent.rules) }
       end
 
       # @api private
       def parent_key_map
-        parent&.key_map || EMPTY_ARRAY
+        parents.reduce([]) { |key_map, parent| parent.key_map + key_map }
       end
     end
   end

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

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require 'dry/logic/operators'
+require 'dry/types/predicate_inferrer'
+require 'dry/types/primitive_inferrer'
 
 require 'dry/schema/macros/core'
 
@@ -26,13 +28,13 @@ module Dry
         #   PredicateInferrer is used to infer predicate type-check from a type spec
         #   @return [PredicateInferrer]
         #   @api private
-        option :predicate_inferrer, default: proc { PredicateInferrer.new(compiler.predicates) }
+        option :predicate_inferrer, default: proc { ::Dry::Types::PredicateInferrer.new(compiler.predicates) }
 
         # @!attribute [r] primitive_inferrer
         #   PrimitiveInferrer used to get a list of primitive classes from configured type
         #   @return [PrimitiveInferrer]
         #   @api private
-        option :primitive_inferrer, default: proc { PrimitiveInferrer.new }
+        option :primitive_inferrer, default: proc { ::Dry::Types::PrimitiveInferrer.new }
 
         # @overload value(*predicates, **predicate_opts)
         #   Set predicates without and with arguments
@@ -198,9 +200,7 @@ module Dry
           predicates = Array(type_spec ? args[1..-1] : args)
 
           if type_spec
-            resolved_type = schema_dsl.resolve_type(
-              nullable && !type_spec.is_a?(::Array) ? [:nil, type_spec] : type_spec
-            )
+            resolved_type = resolve_type(type_spec, nullable)
 
             type(resolved_type) if set_type
 
@@ -213,6 +213,17 @@ module Dry
 
           yield(*predicates, type_spec: type_spec)
         end
+
+        # @api private
+        def resolve_type(type_spec, nullable)
+          resolved = schema_dsl.resolve_type(type_spec)
+
+          if type_spec.is_a?(::Array) || !nullable || resolved.optional?
+            resolved
+          else
+            schema_dsl.resolve_type([:nil, resolved])
+          end
+        end
       end
     end
   end

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'dry/schema/primitive_inferrer'
 require 'dry/schema/macros/value'
 
 module Dry

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'dry/schema/predicate_inferrer'
 require 'dry/schema/processor'
 require 'dry/schema/macros/dsl'
 require 'dry/schema/constants'

data/lib/dry/schema/message_compiler.rb

@@ -130,7 +130,8 @@ module Dry
           path: path.last, **tokens, **lookup_options(arg_vals: arg_vals, input: input)
         ).to_h
 
-        template, meta = messages[predicate, options] || raise(MissingMessageError, path)
+        template, meta = messages[predicate, options] ||
+          raise(MissingMessageError.new(path, messages.looked_up_paths(predicate, options)))
 
         text = message_text(template, tokens, options)
 

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

@@ -99,23 +99,27 @@ module Dry
         end
         alias_method :[], :call
 
+        # Retrieve an array of looked up paths
+        #
+        # @param [Symbol] predicate
+        # @param [Hash] options
+        #
+        # @return [String]
+        #
+        # @api public
+        def looked_up_paths(predicate, options)
+          tokens = lookup_tokens(predicate, options)
+          filled_lookup_paths(tokens)
+        end
+
         # Try to find a message for the given predicate and its options
         #
         # @api private
         #
         # rubocop:disable Metrics/AbcSize
         def lookup(predicate, options)
-          tokens = options.merge(
-            predicate: predicate,
-            root: options[:not] ? "#{root}.not" : root,
-            arg_type: config.arg_types[options[:arg_type]],
-            val_type: config.val_types[options[:val_type]],
-            message_type: options[:message_type] || :failure
-          )
-
           opts = options.reject { |k, _| config.lookup_options.include?(k) }
-
-          path = lookup_paths(tokens).detect { |key| key?(key, opts) }
+          path = lookup_paths(predicate, options).detect { |key| key?(key, opts) }
 
           return unless path
 
@@ -130,7 +134,13 @@ module Dry
         # rubocop:enable Metrics/AbcSize
 
         # @api private
-        def lookup_paths(tokens)
+        def lookup_paths(predicate, options)
+          tokens = lookup_tokens(predicate, options)
+          filled_lookup_paths(tokens)
+        end
+
+        # @api private
+        def filled_lookup_paths(tokens)
           config.lookup_paths.map { |path| path % tokens }
         end
 
@@ -178,6 +188,17 @@ module Dry
 
         private
 
+        # @api private
+        def lookup_tokens(predicate, options)
+          options.merge(
+            predicate: predicate,
+            root: options[:not] ? "#{root}.not" : root,
+            arg_type: config.arg_types[options[:arg_type]],
+            val_type: config.val_types[options[:val_type]],
+            message_type: options[:message_type] || :failure
+          )
+        end
+
         # @api private
         def custom_top_namespace?(path)
           path.to_s == DEFAULT_MESSAGES_PATH.to_s && config.top_namespace != DEFAULT_MESSAGES_ROOT

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

@@ -55,7 +55,7 @@ module Dry
         end
 
         # @api private
-        def lookup_paths(tokens)
+        def filled_lookup_paths(tokens)
           super(tokens.merge(root: "#{tokens[:root]}.#{namespace}")) + super
         end
 

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

@@ -68,6 +68,18 @@ module Dry
         @t = proc { |key, locale: default_locale| get("%<locale>s.#{key}", locale: locale) }
       end
 
+      # Get an array of looked up paths
+      #
+      # @param [Symbol] predicate
+      # @param [Hash] options
+      #
+      # @return [String]
+      #
+      # @api public
+      def looked_up_paths(predicate, options)
+        super.map { |path| path % { locale: options[:locale] || default_locale } }
+      end
+
       # Get a message for the given key and its options
       #
       # @param [Symbol] key

data/lib/dry/schema/predicate_registry.rb

@@ -1,35 +1,14 @@
 # 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`
     #
     # @api private
-    class PredicateRegistry
-      # @api private
-      attr_reader :predicates
-
-      # @api private
-      attr_reader :has_predicate
-
-      # @api private
-      def initialize(predicates = Dry::Logic::Predicates)
-        @predicates = predicates
-        @has_predicate = ::Kernel.instance_method(:respond_to?).bind(@predicates)
-      end
-
-      # @api private
-      def [](name)
-        predicates[name]
-      end
-
-      # @api private
-      def key?(name)
-        has_predicate.(name)
-      end
-
+    class PredicateRegistry < Dry::Types::PredicateRegistry
       # @api private
       def arg_list(name, *values)
         predicate = self[name]

data/lib/dry/schema/processor.rb

@@ -5,6 +5,7 @@ require 'dry/initializer'
 
 require 'dry/schema/type_registry'
 require 'dry/schema/type_container'
+require 'dry/schema/processor_steps'
 require 'dry/schema/rule_applier'
 require 'dry/schema/key_coercer'
 require 'dry/schema/value_coercer'
@@ -12,14 +13,9 @@ require 'dry/schema/value_coercer'
 module Dry
   module Schema
     # Processes input data using objects configured within the DSL
+    # Processing is split into steps represented by `ProcessorSteps`.
     #
-    # Processing is split into 4 main steps:
-    #
-    #   1. Prepare input hash using a key map
-    #   2. Apply pre-coercion filtering rules (optional step, used only when `filter` was used)
-    #   3. Apply value coercions based on type specifications
-    #   4. Apply rules
-    #
+    # @see ProcessorSteps
     # @see Params
     # @see JSON
     #
@@ -32,7 +28,7 @@ module Dry
       setting :type_registry_namespace, :strict
       setting :filter_empty_string, false
 
-      option :steps, default: -> { EMPTY_ARRAY.dup }
+      option :steps, default: -> { ProcessorSteps.new }
 
       option :schema_dsl
 
@@ -77,16 +73,6 @@ module Dry
         end
       end
 
-      # Append a step
-      #
-      # @return [Processor]
-      #
-      # @api private
-      def <<(step)
-        steps << step
-        self
-      end
-
       # Apply processing steps to the provided input
       #
       # @param [Hash] input
@@ -96,10 +82,7 @@ module Dry
       # @api public
       def call(input)
         Result.new(input, message_compiler: message_compiler) do |result|
-          steps.each do |step|
-            output = step.(result)
-            result.replace(output) if output.is_a?(::Hash)
-          end
+          steps.call(result)
         end
       end
       alias_method :[], :call
@@ -119,7 +102,7 @@ module Dry
       #
       # @api public
       def key_map
-        @key_map ||= steps.detect { |s| s.is_a?(KeyCoercer) }.key_map
+        steps[:key_coercer].key_map
       end
 
       # Return string represntation
@@ -139,7 +122,7 @@ module Dry
       #
       # @api private
       def type_schema
-        @type_schema ||= steps.detect { |s| s.is_a?(ValueCoercer) }.type_schema
+        steps[:value_coercer].type_schema
       end
 
       # Return the rules config
@@ -180,7 +163,7 @@ module Dry
       #
       # @api private
       def rule_applier
-        @rule_applier ||= steps.last
+        steps[:rule_applier]
       end
       alias_method :to_rule, :rule_applier
 

data/lib/dry/schema/processor_steps.rb

@@ -0,0 +1,101 @@
+# frozen_string_literal: true
+
+require 'dry/initializer'
+
+module Dry
+  module Schema
+    # Steps for the Dry::Schema::Processor
+    #
+    # There are 4 main steps:
+    #
+    #   1. `key_coercer` - Prepare input hash using a key map
+    #   2. `filter_schema` - Apply pre-coercion filtering rules
+    #      (optional step, used only when `filter` was used)
+    #   3. `value_coercer` - Apply value coercions based on type specifications
+    #   4. `rule_applier` - Apply rules
+    #
+    # @see Processor
+    #
+    # @api public
+    class ProcessorSteps
+      extend Dry::Initializer
+
+      STEPS_IN_ORDER = %i[key_coercer filter_schema value_coercer rule_applier].freeze
+
+      option :steps, default: -> { EMPTY_HASH.dup }
+      option :before_steps, default: -> { EMPTY_HASH.dup }
+      option :after_steps, default: -> { EMPTY_HASH.dup }
+
+      def call(result)
+        STEPS_IN_ORDER.each do |name|
+          before_steps[name]&.each { |step| process_step(step, result) }
+          process_step(steps[name], result)
+          after_steps[name]&.each { |step| process_step(step, result) }
+        end
+        result
+      end
+
+      # Return step by name
+      #
+      # @param [Symbol] name The step name
+      #
+      # @api public
+      def [](name)
+        steps[name]
+      end
+
+      # Sets step by name
+      #
+      # @param [Symbol] name The step name
+      #
+      # @api public
+      def []=(name, value)
+        validate_step_name(name)
+        steps[name] = value
+      end
+
+      # Add passed block before mentioned step
+      #
+      # @param [Symbol] name The step name
+      #
+      # @return [ProcessorSteps]
+      #
+      # @api public
+      def after(name, &block)
+        validate_step_name(name)
+        after_steps[name] ||= EMPTY_ARRAY.dup
+        after_steps[name] << block.to_proc
+        self
+      end
+
+      # Add passed block before mentioned step
+      #
+      # @param [Symbol] name The step name
+      #
+      # @return [ProcessorSteps]
+      #
+      # @api public
+      def before(name, &block)
+        validate_step_name(name)
+        before_steps[name] ||= EMPTY_ARRAY.dup
+        before_steps[name] << block.to_proc
+        self
+      end
+
+      # @api private
+      def process_step(step, result)
+        return unless step
+
+        output = step.(result)
+        result.replace(output) if output.is_a?(::Hash)
+      end
+
+      # @api private
+      def validate_step_name(name)
+        return if STEPS_IN_ORDER.include?(name)
+
+        raise ArgumentError, "Undefined step name #{name}. Available names: #{STEPS_IN_ORDER}"
+      end
+    end
+  end
+end

data/lib/dry/schema/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Schema
-    VERSION = '1.3.4'
+    VERSION = '1.4.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-schema
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.4.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-11 00:00:00.000000000 Z
+date: 2019-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -106,14 +106,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -217,8 +217,8 @@ files:
 - lib/dry/schema/predicate.rb
 - lib/dry/schema/predicate_inferrer.rb
 - lib/dry/schema/predicate_registry.rb
-- lib/dry/schema/primitive_inferrer.rb
 - lib/dry/schema/processor.rb
+- lib/dry/schema/processor_steps.rb
 - lib/dry/schema/result.rb
 - lib/dry/schema/rule_applier.rb
 - lib/dry/schema/trace.rb

data/lib/dry/schema/primitive_inferrer.rb

@@ -1,99 +0,0 @@
-# frozen_string_literal: true
-
-require 'dry/core/cache'
-
-module Dry
-  module Schema
-    # PrimitiveInferrer is used internally by `Macros::Filled`
-    # for inferring a list of possible primitives that a given
-    # type can handle.
-    #
-    # @api private
-    class PrimitiveInferrer
-      extend Dry::Core::Cache
-
-      # Compiler reduces type AST into a list of primitives
-      #
-      # @api private
-      class Compiler
-        # @api private
-        def visit(node)
-          meth, rest = node
-          public_send(:"visit_#{meth}", rest)
-        end
-
-        # @api private
-        def visit_nominal(node)
-          type, _ = node
-          type
-        end
-
-        # @api private
-        def visit_hash(_)
-          Hash
-        end
-        alias_method :visit_schema, :visit_hash
-
-        # @api private
-        def visit_array(_)
-          Array
-        end
-
-        # @api private
-        def visit_lax(node)
-          visit(node)
-        end
-
-        # @api private
-        def visit_constructor(node)
-          other, * = node
-          visit(other)
-        end
-
-        # @api private
-        def visit_enum(node)
-          other, * = node
-          visit(other)
-        end
-
-        # @api private
-        def visit_sum(node)
-          left, right = node
-
-          [visit(left), visit(right)].flatten(1)
-        end
-
-        # @api private
-        def visit_constrained(node)
-          other, * = node
-          visit(other)
-        end
-
-        # @api private
-        def visit_any(_)
-          Object
-        end
-      end
-
-      # @return [Compiler]
-      # @api private
-      attr_reader :compiler
-
-      # @api private
-      def initialize
-        @compiler = Compiler.new
-      end
-
-      # Infer predicate identifier from the provided type
-      #
-      # @return [Symbol]
-      #
-      # @api private
-      def [](type)
-        self.class.fetch_or_store(type.hash) do
-          Array(compiler.visit(type.to_ast)).freeze
-        end
-      end
-    end
-  end
-end