dry-schema 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09bdaec12d22913780786013c56defc8bdda2551ae564d1a4267e8a57aecd52f'
-  data.tar.gz: 0b1af5392034213bbec06167860abc37dcb61ee9397bb2bd33fec2868d6bb1ef
+  metadata.gz: a05f28f075af158f47da3ead0ea7441c8408d6d3aa9473481e47ceecdb94263f
+  data.tar.gz: a326e62e9af7360654a61204096d636acda23eabd497a1d2c847fc4afe8cfa98
 SHA512:
-  metadata.gz: df1c3a36d836d4e31498f05fae0e27f3975a8b9b839ac4ebf6b92b6c5faa12b44b8715db18bb87d668dc61c669d9a59b04599ed7298387f12bac1eb34676647f
-  data.tar.gz: b3b3540b8f4b7fa4a6b270858b0940e7d9fe225fab3be57952ab727b5aa78fd4a0fa3233d7993684a5cbcba95524e614b5b8b62a55bf30fd188c7ee742b99e9f
+  metadata.gz: 8b360914840bf0a6db5d5e3c2ba7464077ddc2c21664758256ef06f054e8a4a9fddc53fe8a13fc5a3456fb2794ac84051496471826ef49fb293a51074d2b9abf
+  data.tar.gz: '09862ce9b446d84a507846a47435c1d82d483531940fd6dc6bc6244bccf22cca430673a589950c74bbcbec35a771b01a5ffd00ac37decd256057e5da618ff8e9'

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+# 1.3.3 2019-08-14
+
+### 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)
+
+[Compare v1.3.2...v1.3.3](https://github.com/dry-rb/dry-schema/compare/v1.3.2...v1.3.3)
+
 # 1.3.2 2019-08-01
 
 ### Added

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

@@ -28,6 +28,12 @@ module Dry
         #   @api private
         option :predicate_inferrer, default: proc { 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 }
+
         # @overload value(*predicates, **predicate_opts)
         #   Set predicates without and with arguments
         #

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

@@ -10,12 +10,6 @@ module Dry
       #
       # @api private
       class Filled < Value
-        # @!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 }
-
         # @api private
         def call(*predicates, **opts, &block)
           ensure_valid_predicates(predicates)

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

@@ -28,8 +28,8 @@ module Dry
           definition = schema_dsl.new(&block)
           schema = definition.call
           type_schema =
-            if array?
-              parent_type.of(definition.type_schema)
+            if array?(parent_type)
+              build_array_type(parent_type, definition.type_schema)
             elsif redefined_schema?(args)
               parent_type.schema(definition.types)
             else
@@ -56,11 +56,6 @@ module Dry
           parent_type.optional?
         end
 
-        # @api private
-        def array?
-          parent_type.respond_to?(:of)
-        end
-
         # @api private
         def schema?
           parent_type.respond_to?(:schema)

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

@@ -17,8 +17,8 @@ module Dry
             current_type = schema_dsl.types[name]
 
             updated_type =
-              if current_type.respond_to?(:of)
-                current_type.of(schema.type_schema)
+              if array?(current_type)
+                build_array_type(current_type, schema.type_schema)
               else
                 schema.type_schema
               end
@@ -39,6 +39,25 @@ module Dry
           self
         end
 
+        # @api private
+        def array?(type)
+          primitive_inferrer[type].eql?([::Array])
+        end
+
+        # @api private
+        def build_array_type(array_type, member)
+          if array_type.respond_to?(:of)
+            array_type.of(member)
+          else
+            raise ArgumentError, <<~ERROR.split("\n").join(' ')
+              Cannot define schema for a nominal array type.
+              Array types must be instances of Dry::Types::Array,
+              usually constructed with Types::Constructor(Array) { ... } or
+              Dry::Types['array'].constructor { ... }
+            ERROR
+          end
+        end
+
         # @api private
         def respond_to_missing?(meth, include_private = false)
           super || meth.to_s.end_with?(QUESTION_MARK)

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

@@ -92,7 +92,7 @@ module Dry
         #
         # @api public
         def call(predicate, options)
-          cache.fetch_or_store([predicate, options.reject { |k,| k.equal?(:input) }]) do
+          cache.fetch_or_store(cache_key(predicate, options)) do
             text, meta = lookup(predicate, options)
             [Template[text], meta] if text
           end
@@ -167,6 +167,15 @@ module Dry
           config.default_locale
         end
 
+        # @api private
+        def cache_key(predicate, options)
+          if options.key?(:input)
+            [predicate, options.reject { |k,| k.equal?(:input) }]
+          else
+            [predicate, options]
+          end
+        end
+
         private
 
         # @api private

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

@@ -79,6 +79,15 @@ module Dry
         self
       end
 
+      # @api private
+      def cache_key(predicate, options)
+        if options[:locale]
+          super
+        else
+          [*super, I18n.locale]
+        end
+      end
+
       private
 
       # @api private

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

@@ -64,6 +64,11 @@ module Dry
           base_paths = messages.rule_lookup_paths(tokens)
           base_paths.map { |key| key.gsub('dry_schema', "dry_schema.#{namespace}") } + base_paths
         end
+
+        # @api private
+        def cache_key(predicate, options)
+          messages.cache_key(predicate, options)
+        end
       end
     end
   end

data/lib/dry/schema/namespaced_rule.rb

@@ -29,9 +29,10 @@ module Dry
       end
 
       # @api private
-      def ast(input=Undefined)
+      def ast(input = Undefined)
         [:namespace, [namespace, rule.ast(input)]]
       end
+      alias_method :to_ast, :ast
     end
   end
 end

data/lib/dry/schema/primitive_inferrer.rb

@@ -32,6 +32,7 @@ module Dry
         def visit_hash(_)
           Hash
         end
+        alias_method :visit_schema, :visit_hash
 
         # @api private
         def visit_array(_)

data/lib/dry/schema/processor.rb

@@ -29,7 +29,7 @@ module Dry
       extend Dry::Configurable
 
       setting :key_map_type
-      setting :type_registry_namespace, :nominal
+      setting :type_registry_namespace, :strict
       setting :filter_empty_string, false
 
       option :steps, default: -> { EMPTY_ARRAY.dup }

data/lib/dry/schema/type_registry.rb

@@ -18,12 +18,12 @@ module Dry
       attr_reader :namespace
 
       # @api private
-      def self.new(types = Dry::Types, namespace = :nominal)
+      def self.new(types = Dry::Types, namespace = :strict)
         super
       end
 
       # @api private
-      def initialize(types, namespace = :nominal)
+      def initialize(types, namespace = :strict)
         @types = types
         @namespace = namespace
       end

data/lib/dry/schema/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Schema
-    VERSION = '1.3.2'
+    VERSION = '1.3.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-schema
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-01 00:00:00.000000000 Z
+date: 2019-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby