dry-schema 1.9.0 → 1.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 630c8c7019a02d6f22386ef4ac1ca68321af93bd3a5e34f8b62b21d28a7eee69
-  data.tar.gz: e53baa861af349395446deb0183e7358438e4ca4ea7fa78b25d4c4f04e4ea2a5
+  metadata.gz: c2dead9a036c0d9322c68b50938417ebe12a4b62ed2f99a8ae6d4f49f894dabd
+  data.tar.gz: ac3b386e3266e8498aa62549cddfbaece9414281beee5710c1930b062eaacde8
 SHA512:
-  metadata.gz: 2ed11d1eba31d808c75018d5ea78fc649f4f59486c2047554aeabac5cd71e9b2d6e64b88661c8f0615b9a9402c177d2c51f49cd49e3ae6e697c45f9f952dab18
-  data.tar.gz: 5c085c4994f662a44eb372e92a894c76d83eefdce88389ed6c1947004c7bd39204b843ea5eb408af86ad986e6978dde67227b9bdcf7d888d1a8e277b457c4345
+  metadata.gz: '0831055ac93da2898c55b6194703e87bda1c27040ac23965c5f261c2e59387888f679b9dcd967a4a0665cef220b7c97db823670067267b34b40ed09a3c315b81'
+  data.tar.gz: d82ee10469742e83ee412ebe6c06593a86c44c1e0f01fd29067700d9a37ecc461dc3e4ad6e2a09bfe4694d1e95b6c28132810bf243d27338257f66e0c50cc98e

data/CHANGELOG.md

@@ -1,5 +1,43 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
+## 1.9.3 2022-06-23
+
+
+### Added
+
+- Support `anyOf` composition in JSON schema output (@robhanlon22)
+
+### Fixed
+
+- Allow composition of multiple ors (issue #307 fixed via #409) (@robhanlon22)
+
+
+[Compare v1.9.2...v1.9.3](https://github.com/dry-rb/dry-schema/compare/v1.9.2...v1.9.3)
+
+## 1.9.2 2022-05-28
+
+
+### Fixed
+
+- Fix loose JSON schemas for nested hashes (via #401) (@tomdalling)
+- Correct spelling error 'mininum' to 'minimum' in json-schema extension (via #404) (@svenanderzen)
+
+### Changed
+
+- [performance] YAML message backend allocates less strings (via #399) (@casperisfine)
+
+[Compare v1.9.1...v1.9.2](https://github.com/dry-rb/dry-schema/compare/v1.9.1...v1.9.2)
+
+## 1.9.1 2022-02-17
+
+
+### Fixed
+
+- Namespaced messages no longer crashes in certain scenarios (see dry-rb/dry-validation#692 fixed via #398) (@krekoten)
+
+
+[Compare v1.9.0...v1.9.1](https://github.com/dry-rb/dry-schema/compare/v1.9.0...v1.9.1)
+
 ## 1.9.0 2022-02-15
 
 
@@ -136,7 +174,7 @@ This release ships with a bunch of internal refactorings that should improve per
 - Key validation works correctly with a non-nested maybe hashes (issue #311 fixed via #312) (@svobom57)
 
 
-[Compare v1.5.3...master](https://github.com/dry-rb/dry-schema/compare/v1.5.3...master)
+[Compare v1.5.3...main](https://github.com/dry-rb/dry-schema/compare/v1.5.3...main)
 
 ## 1.5.3 2020-08-21
 

data/README.md

@@ -11,7 +11,7 @@
 [![CI Status](https://github.com/dry-rb/dry-schema/workflows/ci/badge.svg)][actions]
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/961f5c776f1d49218b2cede3745e059c)][codacy]
 [![Codacy Badge](https://api.codacy.com/project/badge/Coverage/961f5c776f1d49218b2cede3745e059c)][codacy]
-[![Inline docs](http://inch-ci.org/github/dry-rb/dry-schema.svg?branch=master)][inchpages]
+[![Inline docs](http://inch-ci.org/github/dry-rb/dry-schema.svg?branch=main)][inchpages]
 
 ## Links
 

data/dry-schema.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
-  spec.metadata["changelog_uri"]     = "https://github.com/dry-rb/dry-schema/blob/master/CHANGELOG.md"
+  spec.metadata["changelog_uri"]     = "https://github.com/dry-rb/dry-schema/blob/main/CHANGELOG.md"
   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"
 

data/lib/dry/schema/extensions/json_schema/schema_compiler.rb

@@ -47,7 +47,7 @@ module Dry
             pattern: "^[0-9A-F]{8}-[0-9A-F]{4}-5[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$"
           },
           gt?: {exclusiveMinimum: IDENTITY},
-          gteq?: {mininum: IDENTITY},
+          gteq?: {minimum: IDENTITY},
           lt?: {exclusiveMaximum: IDENTITY},
           lteq?: {maximum: IDENTITY},
           odd?: {type: "integer", not: {multipleOf: 2}},
@@ -88,7 +88,7 @@ module Dry
 
         # @api private
         def visit_set(node, opts = EMPTY_HASH)
-          target = (key = opts[:key]) ? self.class.new : self
+          target = (key = opts[:key]) ? self.class.new(loose: loose?) : self
 
           node.map { |child| target.visit(child, opts) }
 
@@ -114,6 +114,18 @@ module Dry
           end
         end
 
+        # @api private
+        def visit_or(node, opts = EMPTY_HASH)
+          node.each do |child|
+            c = self.class.new(loose: loose?)
+            c.keys.update(subschema: {})
+            c.visit(child, opts.merge(key: :subschema))
+
+            any_of = (keys[opts[:key]][:anyOf] ||= [])
+            any_of << c.keys[:subschema]
+          end
+        end
+
         # @api private
         def visit_implication(node, opts = EMPTY_HASH)
           node.each do |el|

data/lib/dry/schema/message/or/multi_path.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/core/equalizer"
-
 require "dry/schema/message/or/abstract"
 require "dry/schema/path"
 
@@ -14,23 +12,85 @@ module Dry
         # @api public
         class MultiPath < Abstract
           # @api private
-          attr_reader :root
+          class MessageArray
+            # @api private
+            def initialize(messages)
+              @messages = messages.flatten
+            end
+
+            # @api private
+            def _paths
+              @messages.map(&:_path)
+            end
+
+            # @api private
+            def to_or(root)
+              self.class.new(@messages.map { _1.to_or(root) })
+            end
+
+            # @api private
+            def to_h
+              MessageSet.new(@messages).to_h
+            end
+          end
+
+          # @api private
+          def self.handler(message)
+            handlers.find { |k,| message.is_a?(k) }&.last
+          end
 
           # @api private
-          def initialize(...)
-            super
-            flat_left = left.flatten
-            flat_right = right.flatten
-            @root = [*flat_left, *flat_right].map(&:_path).reduce(:&)
-            @left = flat_left.map { _1.to_or(root) }
-            @right = flat_right.map { _1.to_or(root) }
+          private_class_method def self.handlers
+            @handlers ||= {
+              self => -> { _1 },
+              Array => -> { MessageArray.new(_1) }
+            }.freeze
           end
 
           # @api public
           def to_h
-            @to_h ||= Path[[*root, :or]].to_h(
-              [MessageSet.new(left).to_h, MessageSet.new(right).to_h]
-            )
+            @to_h ||= Path[[*root, :or]].to_h(messages.map(&:to_h))
+          end
+
+          # @api private
+          def messages
+            @messages ||= _messages.flat_map { _1.to_or(root) }
+          end
+
+          # @api private
+          def root
+            @root ||= _messages.flat_map(&:_paths).reduce(:&)
+          end
+
+          # @api private
+          def path
+            root
+          end
+
+          # @api private
+          def _paths
+            @paths ||= [Path[root]]
+          end
+
+          # @api private
+          def to_or(root)
+            self.root == root ? messages : [self]
+          end
+
+          private
+
+          # @api private
+          def _messages
+            @_messages ||= [left, right].map do |message|
+              handler = self.class.handler(message)
+
+              unless handler
+                raise ArgumentError,
+                      "#{message.inspect} is of unknown type #{message.class.inspect}"
+              end
+
+              handler.(message)
+            end
           end
         end
       end

data/lib/dry/schema/message/or.rb

@@ -17,8 +17,8 @@ module Dry
 
           if paths.uniq.size == 1
             SinglePath.new(left, right, messages)
-          elsif right.is_a?(Array)
-            if left.is_a?(Array) && paths.uniq.size > 1
+          elsif MultiPath.handler(right)
+            if MultiPath.handler(left) && paths.uniq.size > 1
               MultiPath.new(left, right)
             else
               right

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

@@ -80,6 +80,11 @@ module Dry
         def interpolate(key, options, **data)
           messages.interpolate(key, options, **data)
         end
+
+        # @api private
+        def translate(key, **args)
+          messages.translate(key, **args)
+        end
       end
     end
   end

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

@@ -39,10 +39,10 @@ module Dry
           super do |config|
             config.default_locale = :en unless config.default_locale
 
-            config.root = "%<locale>s.#{config.root}"
+            config.root = -"%<locale>s.#{config.root}"
 
             config.rule_lookup_paths = config.rule_lookup_paths.map { |path|
-              "%<locale>s.#{path}"
+              -"%<locale>s.#{path}"
             }
           end
         end

data/lib/dry/schema/processor.rb

@@ -116,7 +116,7 @@ module Dry
         ->(input) { call(input) }
       end
 
-      # Return string represntation
+      # Return string representation
       #
       # @return [String]
       #

data/lib/dry/schema/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Schema
-    VERSION = "1.9.0"
+    VERSION = "1.9.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-schema
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.3
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-15 00:00:00.000000000 Z
+date: 2022-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -237,7 +237,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-  changelog_uri: https://github.com/dry-rb/dry-schema/blob/master/CHANGELOG.md
+  changelog_uri: https://github.com/dry-rb/dry-schema/blob/main/CHANGELOG.md
   source_code_uri: https://github.com/dry-rb/dry-schema
   bug_tracker_uri: https://github.com/dry-rb/dry-schema/issues
 post_install_message: