dry-schema 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a4bd19052082cf526e57fca967abe2bbfbdcdfd4c1439c09acfb19bc3b25562
-  data.tar.gz: 82ffd3bf33409876cf372406e480ca25de8776dfad334ff634b0b041f2ca33ed
+  metadata.gz: e7dce78efba45d06df82c2de21ab9da5208fef746034e1f3aba396221897540d
+  data.tar.gz: 85f73e374a58a8110a3d75f1617d3b015b07b0d3f9c44caf4dceced1930d88df
 SHA512:
-  metadata.gz: dfde0da5889a34f7ef68699048cd755462f49d9d6249435fd5e0006a8d482dfa3a130e73397f02a83bbb11a4ad2c6e5c039e53154a0072d7f89e4a71ee89748b
-  data.tar.gz: dbc0e2f57947b69241c34451980af16b2c60be5cffb770c510f9ddce91daf58a9e6d900eac2884ca88f30c88dce415a4d6bd629d97922a3c79458458fd3ec289
+  metadata.gz: b1317319cec5bacf68ec380166226382c4d10818db4b1a575841f04c43b12b2b420877121876ebb13ce85c59b7b88a375c1f9798523cc6fb123e274507203cd2
+  data.tar.gz: fa995747a3efd66855e6d8cbb7d07e6d2002cd9e459237acc58b8747dd7f7d728d4a5f57482269d25e3c63319110975e8b01ec713536defd31742812dc92e334

data/CHANGELOG.md

@@ -1,7 +1,30 @@
+# v1.2.0 2019-06-13
+
+### Added
+
+* Ability to configure your own type container (@Morozzzko)
+
+### Fixed
+
+* `filled` macro no longer generates incorrect messages for arrays (issue #151) (@solnic)
+* `filled` macro works correctly with constructor types (@solnic)
+* `filled` works correctly with nested schemas (#149) (@solnic + @timriley)
+* Custom array constructors are no longer discredited by `array` macro (@solnic)
+* `BigDecimal` type is correctly handled by predicate inference (@solnic)
+* Works with latest `dry-logic` which provides the new `respond_to?` predicate (#153) (@flash-gordon)
+
+### Changed
+
+* Fixes related to `filled` restored pre-1.1.0 behavior of `:hints` which are again included (@solnic)
+* `filled` no longer uses filter rules to handle empty strings in `Params` (@solnic)
+
+[Compare v1.1.0...v1.2.0](https://github.com/dry-rb/dry-schema/compare/v1.1.0...v1.2.0)
+
 # v1.1.0 2019-05-30
 
 ### Added
 
+* `config.messages.default_locale` for setting...default locale (surprise, surprise) (solnic)
 * `Config` exposes `predicates` setting too (solnic)
 
 ### Fixed

data/lib/dry/schema/config.rb

@@ -5,6 +5,7 @@ require 'dry/configurable'
 
 require 'dry/schema/constants'
 require 'dry/schema/predicate_registry'
+require 'dry/schema/type_container'
 
 module Dry
   module Schema
@@ -26,6 +27,15 @@ module Dry
       # @api public
       setting(:predicates, Schema::PredicateRegistry.new)
 
+      # @!method types
+      #
+      # Return configured container with extra types
+      #
+      # @return [Hash]
+      #
+      # @api public
+      setting(:types, Dry::Types)
+
       # @!method messages
       #
       # Return configuration for message backend

data/lib/dry/schema/dsl.rb

@@ -351,7 +351,10 @@ module Dry
       #
       # @api private
       def type_registry
-        processor_type.config.type_registry
+        @type_registry ||= TypeRegistry.new(
+          config.types,
+          processor_type.config.type_registry_namespace
+        )
       end
 
       # Return key map type configured by the processor type

data/lib/dry/schema/json.rb

@@ -12,7 +12,7 @@ module Dry
     # @api public
     class JSON < Processor
       config.key_map_type = :stringified
-      config.type_registry = config.type_registry.namespaced(:json)
+      config.type_registry_namespace = :json
       config.filter_empty_string = false
     end
   end

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

@@ -68,7 +68,6 @@ module Dry
         # @api public
         def filled(*args, **opts, &block)
           append_macro(Macros::Filled) do |macro|
-            filter(:filled?) if opts[:type_spec] && macro.filter?
             macro.call(*args, **opts, &block)
           end
         end

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'dry/types/type'
 require 'dry/schema/macros/dsl'
 
 module Dry
@@ -12,7 +13,9 @@ module Dry
         # @api private
         def value(*args, **opts)
           extract_type_spec(*args, set_type: false) do |*predicates, type_spec:|
-            type(schema_dsl.array[type_spec]) if type_spec
+            if type_spec && !type_spec.is_a?(Dry::Types::Type)
+              type(schema_dsl.array[type_spec])
+            end
 
             super(*predicates, type_spec: type_spec, **opts)
           end

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

@@ -20,12 +20,8 @@ module Dry
         def call(*predicates, **opts, &block)
           ensure_valid_predicates(predicates)
 
-          if opts[:type_spec]
-            if filter?
-              value(*predicates, **opts, &block)
-            else
-              value(predicates[0], :filled?, *predicates[1..predicates.size - 1], **opts, &block)
-            end
+          if opts[:type_spec] && !filter_empty_string?
+            value(predicates[0], :filled?, *predicates[1..predicates.size - 1], **opts, &block)
           else
             value(:filled?, *predicates, **opts, &block)
           end
@@ -45,8 +41,8 @@ module Dry
         # rubocop:enable Style/GuardClause
 
         # @api private
-        def filter?
-          !primitives.include?(NilClass) && processor_config.filter_empty_string
+        def filter_empty_string?
+          !expected_primitives.include?(NilClass) && processor_config.filter_empty_string
         end
 
         # @api private
@@ -55,7 +51,7 @@ module Dry
         end
 
         # @api private
-        def primitives
+        def expected_primitives
           primitive_inferrer[schema_type]
         end
 

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

@@ -14,31 +14,45 @@ module Dry
           super(*args) unless args.empty?
 
           if block
-            definition = schema_dsl.new(&block)
+            schema = define(&block)
+            trace << schema.to_rule
+          end
+
+          self
+        end
 
-            parent_type = schema_dsl.types[name]
-            definition_schema = definition.type_schema
+        private
 
-            schema_type =
-              if parent_type.respond_to?(:of)
-                parent_type.of(definition_schema)
-              else
-                definition_schema
-              end
+        # @api private
+        def define(&block)
+          definition = schema_dsl.new(&block)
+          schema = definition.call
 
-            final_type =
-              if parent_type.optional?
-                schema_type.optional
-              else
-                schema_type
-              end
+          type_schema = array? ? parent_type.of(definition.type_schema) : definition.type_schema
+          final_type = optional? ? type_schema.optional : type_schema
 
-            schema_dsl.set_type(name, final_type)
+          type(final_type)
 
-            trace << definition.to_rule
+          if schema.filter_rules?
+            schema_dsl[name].filter { hash?.then(schema(schema.filter_schema)) }
           end
 
-          self
+          schema
+        end
+
+        # @api private
+        def parent_type
+          schema_dsl.types[name]
+        end
+
+        # @api private
+        def optional?
+          parent_type.optional?
+        end
+
+        # @api private
+        def array?
+          parent_type.respond_to?(:of)
         end
       end
     end

data/lib/dry/schema/params.rb

@@ -12,7 +12,7 @@ module Dry
     # @api public
     class Params < Processor
       config.key_map_type = :stringified
-      config.type_registry = config.type_registry.namespaced(:params)
+      config.type_registry_namespace = :params
       config.filter_empty_string = true
     end
   end

data/lib/dry/schema/predicate_inferrer.rb

@@ -17,7 +17,8 @@ module Dry
         Integer => :int?,
         NilClass => :nil?,
         String => :str?,
-        TrueClass => :true?
+        TrueClass => :true?,
+        BigDecimal => :decimal?
       }.freeze
 
       REDUCED_TYPES = {

data/lib/dry/schema/predicate_registry.rb

@@ -11,9 +11,13 @@ module Dry
       # @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
@@ -23,7 +27,7 @@ module Dry
 
       # @api private
       def key?(name)
-        predicates.respond_to?(name)
+        has_predicate.(name)
       end
 
       # @api private

data/lib/dry/schema/processor.rb

@@ -4,6 +4,7 @@ require 'dry/configurable'
 require 'dry/initializer'
 
 require 'dry/schema/type_registry'
+require 'dry/schema/type_container'
 require 'dry/schema/rule_applier'
 require 'dry/schema/key_coercer'
 require 'dry/schema/value_coercer'
@@ -28,7 +29,7 @@ module Dry
       extend Dry::Configurable
 
       setting :key_map_type
-      setting :type_registry, TypeRegistry.new
+      setting :type_registry_namespace, :nominal
       setting :filter_empty_string, false
 
       option :steps, default: -> { EMPTY_ARRAY.dup }

data/lib/dry/schema/type_container.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'dry/container'
+require 'dry/types'
+
+module Dry
+  module Schema
+    # A class to build containers for custom types, which can be used in schemas
+    #
+    # @example
+    #   MyTypeContainer = Dry::Schema::TypeContainer.new
+    #   MyTypeContainer.register('params.fancy_string', Types::FancyString)
+    #
+    # @api public
+    class TypeContainer
+      include Dry::Container::Mixin
+
+      def initialize(types_container = Dry::Types.container)
+        super()
+
+        merge(types_container)
+      end
+
+      alias registered? key?
+    end
+  end
+end

data/lib/dry/schema/type_registry.rb

@@ -36,6 +36,7 @@ module Dry
       # @api private
       def [](name)
         key = [namespace, name].compact.join(DOT)
+
         type = types.registered?(key) ? types[key] : types[name.to_s]
         type
       end

data/lib/dry/schema/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Schema
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-schema
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-30 00:00:00.000000000 Z
+date: 2019-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -222,6 +222,7 @@ files:
 - lib/dry/schema/result.rb
 - lib/dry/schema/rule_applier.rb
 - lib/dry/schema/trace.rb
+- lib/dry/schema/type_container.rb
 - lib/dry/schema/type_registry.rb
 - lib/dry/schema/types.rb
 - lib/dry/schema/value_coercer.rb