dry-types 1.0.0 → 1.2.1

data/lib/dry/types/predicate_registry.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'dry/logic/predicates'
+
+module Dry
+  module Types
+    # 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 = 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
+    end
+  end
+end

data/lib/dry/types/primitive_inferrer.rb

@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+
+require 'dry/core/cache'
+
+module Dry
+  module Types
+    # PrimitiveInferrer returns the list of classes matching a type.
+    #
+    # @api public
+    class PrimitiveInferrer
+      extend 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 primitives from the provided type
+      #
+      # @return [Array[Class]]
+      #
+      # @api private
+      def [](type)
+        self.class.fetch_or_store(type) do
+          Array(compiler.visit(type.to_ast)).freeze
+        end
+      end
+    end
+  end
+end

data/lib/dry/types/printer.rb

@@ -8,6 +8,7 @@ module Dry
         Nominal => :visit_nominal,
         Constructor => :visit_constructor,
         Hash::Constructor => :visit_constructor,
+        Array::Constructor => :visit_constructor,
         Constrained => :visit_constrained,
         Constrained::Coercible => :visit_constrained,
         Hash => :visit_hash,
@@ -26,7 +27,7 @@ module Dry
       }
 
       def call(type)
-        output = "".dup
+        output = ''.dup
         visit(type) { |str| output << str }
         "#<Dry::Types[#{output}]>"
       end
@@ -43,16 +44,20 @@ module Dry
       end
 
       def visit_any(_)
-        yield "Any"
+        yield 'Any'
       end
 
-      def visit_array(_)
-         yield "Array"
+      def visit_array(type)
+        visit_options(EMPTY_HASH, type.meta) do |opts|
+          yield "Array#{opts}"
+        end
       end
 
       def visit_array_member(array)
         visit(array.member) do |type|
-          yield "Array<#{type}>"
+          visit_options(EMPTY_HASH, array.meta) do |opts|
+            yield "Array<#{type}#{opts}>"
+          end
         end
       end
 
@@ -74,7 +79,7 @@ module Dry
           options = constrained.options.dup
           rule = options.delete(:rule)
 
-          visit_options(options) do |opts|
+          visit_options(options) do |_opts|
             yield "Constrained<#{type} rule=[#{rule}]>"
           end
         end
@@ -110,7 +115,7 @@ module Dry
           header = "Schema<#{schema_parameters}keys={"
 
           if size.zero?
-            yield "#{ header}}>"
+            yield "#{header}}>"
           else
             yield header.dup << keys.map { |key|
               visit(key) { |type| type }
@@ -126,7 +131,7 @@ module Dry
             options.delete(:key_type)
             options.delete(:value_type)
 
-            visit_options(options) do |opts|
+            visit_options(options) do |_opts|
               yield "Map<#{key} => #{value}>"
             end
           end
@@ -193,7 +198,7 @@ module Dry
               yield "Enum<#{type} values={#{values}}#{opts}>"
             else
               mapping_str = mapping.map { |key, value|
-                "#{ key.inspect }=>#{value.inspect}"
+                "#{key.inspect}=>#{value.inspect}"
               }.join(', ')
               yield "Enum<#{type} mapping={#{mapping_str}}#{opts}>"
             end
@@ -251,14 +256,14 @@ module Dry
 
         case fn
         when Method
-          yield "#{ fn.receiver }.#{ fn.name }"
+          yield "#{fn.receiver}.#{fn.name}"
         when Proc
           path, line = fn.source_location
 
-          if line && line.zero?
+          if line&.zero?
             yield ".#{path}"
           elsif path
-            yield "#{path.sub(Dir.pwd + '/', EMPTY_STRING) }:#{line}"
+            yield "#{path.sub(Dir.pwd + '/', EMPTY_STRING)}:#{line}"
           elsif fn.lambda?
             yield '(lambda)'
           else

data/lib/dry/types/schema.rb

@@ -156,8 +156,8 @@ module Dry
         [
           :schema,
           [keys.map { |key| key.to_ast(meta: meta) },
-            opts,
-            meta ? self.meta : EMPTY_HASH]
+           opts,
+           meta ? self.meta : EMPTY_HASH]
         ]
       end
 
@@ -175,8 +175,8 @@ module Dry
       # @return [Schema]
       #
       # @api public
-      def strict
-        with(strict: true)
+      def strict(strict = true)
+        with(strict: strict)
       end
 
       # Injects a key transformation function
@@ -190,9 +190,7 @@ module Dry
       def with_key_transform(proc = nil, &block)
         fn = proc || block
 
-        if fn.nil?
-          raise ArgumentError, "a block or callable argument is required"
-        end
+        raise ArgumentError, 'a block or callable argument is required' if fn.nil?
 
         handle = Dry::Types::FnContainer.register(fn)
         with(key_transform_fn: handle)
@@ -203,7 +201,7 @@ module Dry
       # @return [Boolean]
       #
       # @api public
-      def trasform_keys?
+      def transform_keys?
         !options[:key_transform_fn].nil?
       end
 
@@ -294,10 +292,10 @@ module Dry
       #
       # @api private
       def merge_keys(*keys)
-        keys.
-          flatten(1).
-          each_with_object({}) { |key, merged| merged[key.name] = key }.
-          values
+        keys
+          .flatten(1)
+          .each_with_object({}) { |key, merged| merged[key.name] = key }
+          .values
       end
 
       # Validate and coerce a hash. Raise an exception on any error
@@ -315,19 +313,17 @@ module Dry
           if type
             begin
               result[k] = type.call_unsafe(value)
-            rescue ConstraintError => error
-              raise SchemaError.new(type.name, value, error.result)
-            rescue CoercionError => error
-              raise SchemaError.new(type.name, value, error.message)
+            rescue ConstraintError => e
+              raise SchemaError.new(type.name, value, e.result)
+            rescue CoercionError => e
+              raise SchemaError.new(type.name, value, e.message)
             end
           elsif strict?
             raise unexpected_keys(hash.keys)
           end
         end
 
-        if result.size < keys.size
-          resolve_missing_keys(result, options)
-        end
+        resolve_missing_keys(result, options) if result.size < keys.size
 
         result
       end
@@ -351,9 +347,7 @@ module Dry
           end
         end
 
-        if result.size < keys.size
-          resolve_missing_keys(result, options, &block)
-        end
+        resolve_missing_keys(result, options, &block) if result.size < keys.size
 
         result
       end

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'dry/equalizer'
+require 'dry/core/deprecations'
 
 module Dry
   module Types
@@ -14,6 +15,7 @@ module Dry
       #
       # @see Dry::Types::Schema
       class Key
+        extend ::Dry::Core::Deprecations[:'dry-types']
         include Type
         include Dry::Equalizer(:name, :type, :options, inspect: false)
         include Decorator
@@ -94,7 +96,7 @@ module Dry
         #
         # @api public
         def lax
-          super.required(false)
+          __new__(type.lax).required(false)
         end
 
         # Dump to internal AST representation
@@ -113,6 +115,22 @@ module Dry
           ]
         end
 
+        # @see Dry::Types::Meta#meta
+        #
+        # @api public
+        def meta(data = nil)
+          if data.nil? || !data.key?(:omittable)
+            super
+          else
+            self.class.warn(
+              'Using meta for making schema keys is deprecated, ' \
+              'please use .omittable or .required(false) instead' \
+              "\n" + Core::Deprecations::STACK.()
+            )
+            super.required(!data[:omittable])
+          end
+        end
+
         private
 
         # @api private

data/lib/dry/types/spec/types.rb

@@ -2,7 +2,7 @@
 
 RSpec.shared_examples_for 'Dry::Types::Nominal without primitive' do
   def be_boolean
-    satisfy { |x| x == true || x == false  }
+    satisfy { |x| x == true || x == false }
   end
 
   describe '#constrained?' do
@@ -43,9 +43,7 @@ RSpec.shared_examples_for 'Dry::Types::Nominal without primitive' do
 
   describe '#to_s' do
     it 'returns a custom string representation' do
-      if type.class.name.start_with?('Dry::Types')
-        expect(type.to_s).to start_with('#<Dry::Types')
-      end
+      expect(type.to_s).to start_with('#<Dry::Types') if type.class.name.start_with?('Dry::Types')
     end
   end
 
@@ -81,7 +79,7 @@ RSpec.shared_examples_for 'Dry::Types::Nominal#meta' do
       expect(type.meta).not_to have_key :immutable_test
       derived = type.meta(immutable_test: 1)
       expect(derived.meta).to be_frozen
-      expect(derived.meta).to eql({immutable_test: 1})
+      expect(derived.meta).to eql(immutable_test: 1)
       expect(type.meta).not_to have_key :immutable_test
     end
   end
@@ -111,7 +109,9 @@ RSpec.shared_examples_for Dry::Types::Nominal do
   end
 end
 
-RSpec.shared_examples_for 'a constrained type' do |inputs: Object.new|
+RSpec.shared_examples_for 'a constrained type' do |options = { inputs: Object.new }|
+  inputs = options[:inputs]
+
   let(:fallback) { Object.new }
 
   describe '#call' do
@@ -139,4 +139,3 @@ RSpec.shared_examples_for 'a nominal type' do |inputs: Object.new|
     end
   end
 end
-

data/lib/dry/types/sum.rb

@@ -40,7 +40,7 @@ module Dry
       # @param [Hash] options
       #
       # @api private
-      def initialize(left, right, options = {})
+      def initialize(left, right, **options)
         super
         @left, @right = left, right
         freeze
@@ -146,7 +146,7 @@ module Dry
         if data.nil?
           optional? ? right.meta : super
         elsif optional?
-          self.class.new(left, right.meta(data), options)
+          self.class.new(left, right.meta(data), **options)
         else
           super
         end

data/lib/dry/types/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Types
-    VERSION = '1.0.0'
+    VERSION = '1.2.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-types
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-23 00:00:00.000000000 Z
+date: 2019-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -25,79 +25,79 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: dry-core
+  name: dry-container
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: dry-inflector
+  name: dry-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
-  name: dry-container
+  name: dry-equalizer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
-  name: dry-equalizer
+  name: dry-inflector
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: dry-logic
   requirement: !ruby/object:Gem::Requirement
@@ -105,6 +105,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -112,6 +115,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -127,47 +133,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: dry-monads
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
-  name: dry-monads
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -191,12 +197,18 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
+- ".github/ISSUE_TEMPLATE/----please-don-t-ask-for-support-via-issues.md"
+- ".github/ISSUE_TEMPLATE/---bug-report.md"
+- ".github/ISSUE_TEMPLATE/---feature-request.md"
+- ".github/workflows/custom_ci.yml"
+- ".github/workflows/docsite.yml"
+- ".github/workflows/sync_configs.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
+- CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
@@ -209,11 +221,27 @@ files:
 - benchmarks/profile_valid_input.rb
 - benchmarks/schema_valid_vs_invalid.rb
 - benchmarks/setup.rb
+- docsite/source/array-with-member.html.md
+- docsite/source/built-in-types.html.md
+- docsite/source/constraints.html.md
+- docsite/source/custom-types.html.md
+- docsite/source/default-values.html.md
+- docsite/source/enum.html.md
+- docsite/source/extensions.html.md
+- docsite/source/extensions/maybe.html.md
+- docsite/source/extensions/monads.html.md
+- docsite/source/getting-started.html.md
+- docsite/source/hash-schemas.html.md
+- docsite/source/index.html.md
+- docsite/source/map.html.md
+- docsite/source/optional-values.html.md
+- docsite/source/sum.html.md
 - dry-types.gemspec
 - lib/dry-types.rb
 - lib/dry/types.rb
 - lib/dry/types/any.rb
 - lib/dry/types/array.rb
+- lib/dry/types/array/constructor.rb
 - lib/dry/types/array/member.rb
 - lib/dry/types/builder.rb
 - lib/dry/types/builder_methods.rb
@@ -235,6 +263,7 @@ files:
 - lib/dry/types/errors.rb
 - lib/dry/types/extensions.rb
 - lib/dry/types/extensions/maybe.rb
+- lib/dry/types/extensions/monads.rb
 - lib/dry/types/fn_container.rb
 - lib/dry/types/hash.rb
 - lib/dry/types/hash/constructor.rb
@@ -247,6 +276,9 @@ files:
 - lib/dry/types/nominal.rb
 - lib/dry/types/options.rb
 - lib/dry/types/params.rb
+- lib/dry/types/predicate_inferrer.rb
+- lib/dry/types/predicate_registry.rb
+- lib/dry/types/primitive_inferrer.rb
 - lib/dry/types/printable.rb
 - lib/dry/types/printer.rb
 - lib/dry/types/result.rb
@@ -280,7 +312,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Type system for Ruby supporting coercions, constraints and complex types