dry-schema 0.3.0 → 0.4.0

data/lib/dry/schema/predicate_inferrer.rb

@@ -12,6 +12,7 @@ module Dry
       extend Dry::Core::Cache
 
       TYPE_TO_PREDICATE = {
+        DateTime => :date_time?,
         FalseClass => :false?,
         Integer => :int?,
         NilClass => :nil?,
@@ -27,38 +28,68 @@ module Dry
       #
       # @api private
       class Compiler
+        # @!attribute [r] registry
+        #   @return [PredicateRegistry]
+        #   @api private
+        attr_reader :registry
+
+        # @api private
+        def initialize(registry)
+          @registry = registry
+        end
+
+        # @api private
+        def infer_predicate(type)
+          TYPE_TO_PREDICATE.fetch(type) { :"#{type.name.split('::').last.downcase}?" }
+        end
+
+        # @api private
         def visit(node)
           meth, rest = node
           public_send(:"visit_#{meth}", rest)
         end
 
-        def visit_definition(node)
+        # @api private
+        def visit_nominal(node)
           type = node[0]
+          predicate = infer_predicate(type)
 
-          TYPE_TO_PREDICATE.fetch(type) {
-            :"#{type.name.split('::').last.downcase}?"
-          }
+          if registry.key?(predicate)
+            predicate
+          else
+            { type?: type }
+          end
+        end
+
+        # @api private
+        def visit_hash(_)
+          :hash?
         end
 
-        def visit_array(*)
+        # @api private
+        def visit_array(_)
           :array?
         end
 
+        # @api private
         def visit_safe(node)
           other, * = node
           visit(other)
         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
 
@@ -71,27 +102,38 @@ module Dry
           end
         end
 
+        # @api private
         def visit_constrained(node)
           other, * = node
           visit(other)
         end
       end
 
+      # @!attribute [r] compiler
+      #   @return [Compiler]
+      #   @api private
+      attr_reader :compiler
+
+      # @api private
+      def initialize(registry)
+        @compiler = Compiler.new(registry)
+      end
+
       # Infer predicate identifier from the provided type
       #
       # @return [Symbol]
       #
       # @api private
-      def self.[](type)
-        fetch_or_store(type.hash) {
-          predicates = Array(compiler.visit(type.to_ast)).flatten
-          Array(REDUCED_TYPES[predicates] || predicates).flatten
-        }
-      end
+      def [](type)
+        self.class.fetch_or_store(type.hash) do
+          predicates = compiler.visit(type.to_ast)
 
-      # @api private
-      def self.compiler
-        @compiler ||= Compiler.new
+          if predicates.is_a?(Hash)
+            predicates
+          else
+            Array(REDUCED_TYPES[predicates] || predicates).flatten
+          end
+        end
       end
     end
   end

data/lib/dry/schema/processor.rb

@@ -32,42 +32,41 @@ module Dry
 
       param :steps, default: -> { EMPTY_ARRAY.dup }
 
-      # Define a schema for your processor class
-      #
-      # @see Params
-      # @see JSON
-      #
-      # @return [Class]
-      #
-      # @api public
-      def self.define(&block)
-        @__definition__ ||= DSL.new(
-          processor_type: self, parent: superclass.definition, **config, &block
-        )
-        self
-      end
-
-      # Return DSL configured via #define
-      #
-      # @return [DSL]
-      #
-      # @api private
-      def self.definition
-        @__definition__ ||= nil
-      end
+      class << self
+        # @!attribute [r] definition
+        #   Return DSL configured via #define
+        #   @return [DSL]
+        #   @api private
+        attr_reader :definition
+
+        # Define a schema for your processor class
+        #
+        # @see Params
+        # @see JSON
+        #
+        # @return [Class]
+        #
+        # @api public
+        def define(&block)
+          @definition ||= DSL.new(
+            processor_type: self, parent: superclass.definition, **config, &block
+          )
+          self
+        end
 
-      # Build a new processor object
-      #
-      # @return [Processor]
-      #
-      # @api public
-      def self.new(&block)
-        if block
-          super.tap(&block)
-        elsif definition
-          definition.call
-        else
-          raise ArgumentError, 'Cannot create a schema without a definition'
+        # Build a new processor object
+        #
+        # @return [Processor]
+        #
+        # @api public
+        def new(&block)
+          if block
+            super.tap(&block)
+          elsif definition
+            definition.call
+          else
+            raise ArgumentError, 'Cannot create a schema without a definition'
+          end
         end
       end
 
@@ -96,6 +95,16 @@ module Dry
           end
         end
       end
+      alias_method :[], :call
+
+      # Return a proc that acts like a schema object
+      #
+      # @return [Proc]
+      #
+      # @api public
+      def to_proc
+        ->(input) { call(input) }
+      end
 
       # Return the key map
       #
@@ -103,7 +112,18 @@ module Dry
       #
       # @api public
       def key_map
-        @__key_map__ ||= steps.detect { |s| s.is_a?(KeyCoercer) }.key_map
+        @key_map ||= steps.detect { |s| s.is_a?(KeyCoercer) }.key_map
+      end
+
+      # Return string represntation
+      #
+      # @return [String]
+      #
+      # @api public
+      def inspect
+        <<~STR.strip
+          #<#{self.class.name} keys=#{key_map.map(&:dump)} rules=#{rules.map { |k, v| [k, v.to_s] }.to_h}>
+        STR
       end
 
       # Return the type schema
@@ -112,7 +132,7 @@ module Dry
       #
       # @api private
       def type_schema
-        @__type_schema__ ||= steps.detect { |s| s.is_a?(ValueCoercer) }.type_schema
+        @type_schema ||= steps.detect { |s| s.is_a?(ValueCoercer) }.type_schema
       end
 
       # Return the rules config
@@ -121,7 +141,7 @@ module Dry
       #
       # @api private
       def config
-        @__config__ ||= steps.detect { |s| s.is_a?(RuleApplier) }.config
+        @config ||= rule_applier.config
       end
 
       # Return AST representation of the rules
@@ -153,8 +173,7 @@ module Dry
       #
       # @api private
       def rule_applier
-        # TODO: make this more explicit through class types
-        @__rule_applier__ ||= steps.last
+        @rule_applier ||= steps.last
       end
       alias_method :to_rule, :rule_applier
     end

data/lib/dry/schema/result.rb

@@ -107,7 +107,7 @@ module Dry
       #
       # @api public
       def errors(options = EMPTY_HASH)
-        message_set(options).dump
+        message_set(options)
       end
 
       # Return the message set
@@ -130,7 +130,7 @@ module Dry
       #
       # @api public
       def inspect
-        "#<#{self.class}#{to_h.inspect} errors=#{errors.inspect}>"
+        "#<#{self.class}#{to_h.inspect} errors=#{errors.to_h.inspect}>"
       end
 
       private

data/lib/dry/schema/rule_applier.rb

@@ -20,10 +20,10 @@ module Dry
       param :rules
 
       # @api private
-      option :config, default: proc { Config.new }
+      option :config, default: -> { Config.new }
 
       # @api private
-      option :message_compiler, default: proc { MessageCompiler.new(Messages.setup(config)) }
+      option :message_compiler, default: -> { MessageCompiler.new(Messages.setup(config.messages)) }
 
       # @api private
       def call(input)
@@ -31,6 +31,7 @@ module Dry
 
         rules.each do |name, rule|
           next if input.error?(name)
+
           result = rule.(input)
           results << result if result.failure?
         end
@@ -40,8 +41,8 @@ module Dry
 
       # @api private
       def to_ast
-        if config.namespace
-          [:namespace, [config.namespace, [:set, rules.values.map(&:to_ast)]]]
+        if config.messages.namespace
+          [:namespace, [config.messages.namespace, [:set, rules.values.map(&:to_ast)]]]
         else
           [:set, rules.values.map(&:to_ast)]
         end

data/lib/dry/schema/trace.rb

@@ -29,13 +29,15 @@ module Dry
       end
 
       # @api private
-      def evaluate(*predicates, **opts, &block)
+      def evaluate(*predicates, **opts)
         pred_opts = opts.dup
         pred_opts.delete(:type_spec)
 
         predicates.each do |predicate|
           if predicate.respond_to?(:call)
             append(predicate)
+          elsif predicate.is_a?(::Hash)
+            evaluate_hash_predicates(predicate)
           elsif predicate.is_a?(::Array)
             append(predicate.map { |pred| __send__(pred) }.reduce(:|))
           else
@@ -43,10 +45,16 @@ module Dry
           end
         end
 
-        pred_opts.each do |predicate, *args|
+        evaluate_hash_predicates(pred_opts)
+
+        self
+      end
+
+      # @api private
+      def evaluate_hash_predicates(predicates)
+        predicates.each do |predicate, *args|
           append(__send__(predicate, *args))
         end
-
         self
       end
 

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 = nil)
+      def self.new(types = Dry::Types, namespace = :nominal)
         super
       end
 
       # @api private
-      def initialize(types, namespace = nil)
+      def initialize(types, namespace = :nominal)
         @types = types
         @namespace = namespace
       end

data/lib/dry/schema/types.rb

@@ -8,7 +8,7 @@ module Dry
     #
     # @api public
     module Types
-      include Dry::Types.module
+      include Dry.Types
     end
   end
 end

data/lib/dry/schema/value_coercer.rb

@@ -20,9 +20,11 @@ module Dry
         if input.success?
           type_schema[Hash(input)]
         else
-          type_schema.member_types.reduce(EMPTY_HASH.dup) do |hash, (name, type)|
-            hash[name] = input.error?(name) ? input[name] : type[input[name]]
-            hash
+          type_schema.each_with_object(EMPTY_HASH.dup) do |key, hash|
+            name = key.name
+            value = input[name]
+
+            hash[name] = input.error?(name) ? value : key[value]
           end
         end
       end

data/lib/dry/schema/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Schema
-    VERSION = '0.3.0'
+    VERSION = '0.4.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-schema
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-04 00:00:00.000000000 Z
+date: 2019-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -28,22 +28,22 @@ dependencies:
   name: dry-configurable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.8.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.8.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: dry-core
   requirement: !ruby/object:Gem::Requirement
@@ -118,20 +118,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.15.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.15.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -257,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Schema coercion and validation