dry-types 1.5.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c7c872991cdfc4269f8de895e51cd19b129f6ef86fb78b48ff5ca5bb1e811d8
-  data.tar.gz: b3600454a14b4dde65512f8c55f4c2a9ec1e9293d45364cde763bb0e1185fa9b
+  metadata.gz: fdd7e08f86f3137ead67bb6170e91de625227e97783be335b982e5a4c313b32e
+  data.tar.gz: faa51ae68eb4942cb64520eed7d6c4dbf5b46af384a91acdfc94105f32298839
 SHA512:
-  metadata.gz: 5f0286b20cd4c40478587e083ff4ef7fb6bb39e66ee01864c7f5710697f30378742899ae509181be215096cf76b26d2c1aa14e4b1f2bd651058911e201d5281f
-  data.tar.gz: 2a1ae064396c3074bf28d90fe94867b62b2c787ea0798a7f934bc81b2232b46616f7ee71ad7caaa4612712f1ff306f9f255969b0e4ad67f28e12925fd77dd658
+  metadata.gz: 588feadceca555b168266b6e6ee542d71b154152ea56a88f7b601c33a79b116c90b86356e03bc8ca273e4df5d38e4056277c88502387e836bba4af8409fede14
+  data.tar.gz: 72326eb3f32d33cbc95d1e20d6bec4f1bc40a66fa6cac818d35b8ff2214d3932f3350d5e6cf36a6a49ea3ffd862d7422a49622d5a98937a0be6f914d0f390965

data/CHANGELOG.md

@@ -1,5 +1,35 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
+## 1.7.0 2022-11-04
+
+
+### Changed
+
+- This version is compatible with recently released dry-rb dependencies (@flash-gordon)
+- Updated to dry-core 1.0 (@flash-gordon + @solnic)
+- Dependency on dry-container was dropped (@flash-gordon)
+
+[Compare v1.6.1...v1.7.0](https://github.com/dry-rb/dry-types/compare/v1.6.1...v1.7.0)
+
+## 1.6.1 2022-10-15
+
+
+### Changed
+
+- Fix issues with internal const_missing and Inflector/Module constants (@flash-gordon + @solnic)
+
+[Compare v1.6.0...v1.6.1](https://github.com/dry-rb/dry-types/compare/v1.6.0...v1.6.1)
+
+## 1.6.0 2022-10-15
+
+
+### Changed
+
+- Optimize `PredicateRegistry` for Ruby 2.7+ (see #420 for more details) (@casperisfine)
+- Use zeitwerk for auto-loading (@flash-gordon)
+
+[Compare v1.5.1...v1.6.0](https://github.com/dry-rb/dry-types/compare/v1.5.1...v1.6.0)
+
 ## 1.5.1 2021-02-16
 
 

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2021 dry-rb team
+Copyright (c) 2015-2022 dry-rb team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/README.md

@@ -1,3 +1,4 @@
+<!--- this file is synced from dry-rb/template-gem project -->
 [gem]: https://rubygems.org/gems/dry-types
 [actions]: https://github.com/dry-rb/dry-types/actions
 [codacy]: https://www.codacy.com/gh/dry-rb/dry-types
@@ -10,19 +11,19 @@
 [![CI Status](https://github.com/dry-rb/dry-types/workflows/ci/badge.svg)][actions]
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/f2d71613195f4da993acb9ac9d6ea336)][codacy]
 [![Codacy Badge](https://api.codacy.com/project/badge/Coverage/f2d71613195f4da993acb9ac9d6ea336)][codacy]
-[![Inline docs](http://inch-ci.org/github/dry-rb/dry-types.svg?branch=master)][inchpages]
+[![Inline docs](http://inch-ci.org/github/dry-rb/dry-types.svg?branch=main)][inchpages]
 
 ## Links
 
-* [User documentation](http://dry-rb.org/gems/dry-types)
+* [User documentation](https://dry-rb.org/gems/dry-types)
 * [API documentation](http://rubydoc.info/gems/dry-types)
 
 ## Supported Ruby versions
 
 This library officially supports the following Ruby versions:
 
-* MRI >= `2.5`
-* jruby >= `9.2`
+* MRI `>= 2.7.0`
+* jruby `>= 9.3` (postponed until 2.7 is supported)
 
 ## License
 

data/dry-types.gemspec

@@ -1,41 +1,41 @@
 # frozen_string_literal: true
-# this file is managed by dry-rb/devtools project
 
-lib = File.expand_path('lib', __dir__)
+# this file is synced from dry-rb/template-gem project
+
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'dry/types/version'
+require "dry/types/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'dry-types'
+  spec.name          = "dry-types"
   spec.authors       = ["Piotr Solnica"]
   spec.email         = ["piotr.solnica@gmail.com"]
-  spec.license       = 'MIT'
+  spec.license       = "MIT"
   spec.version       = Dry::Types::VERSION.dup
 
   spec.summary       = "Type system for Ruby supporting coercions, constraints and complex types like structs, value objects, enums etc"
   spec.description   = spec.summary
-  spec.homepage      = 'https://dry-rb.org/gems/dry-types'
+  spec.homepage      = "https://dry-rb.org/gems/dry-types"
   spec.files         = Dir["CHANGELOG.md", "LICENSE", "README.md", "dry-types.gemspec", "lib/**/*"]
-  spec.bindir        = 'bin'
+  spec.bindir        = "bin"
   spec.executables   = []
-  spec.require_paths = ['lib']
+  spec.require_paths = ["lib"]
 
-  spec.metadata['allowed_push_host'] = 'https://rubygems.org'
-  spec.metadata['changelog_uri']     = 'https://github.com/dry-rb/dry-types/blob/master/CHANGELOG.md'
-  spec.metadata['source_code_uri']   = 'https://github.com/dry-rb/dry-types'
-  spec.metadata['bug_tracker_uri']   = 'https://github.com/dry-rb/dry-types/issues'
+  spec.metadata["allowed_push_host"] = "https://rubygems.org"
+  spec.metadata["changelog_uri"]     = "https://github.com/dry-rb/dry-types/blob/main/CHANGELOG.md"
+  spec.metadata["source_code_uri"]   = "https://github.com/dry-rb/dry-types"
+  spec.metadata["bug_tracker_uri"]   = "https://github.com/dry-rb/dry-types/issues"
 
-  spec.required_ruby_version = ">= 2.5.0"
+  spec.required_ruby_version = ">= 2.7.0"
 
   # to update dependencies edit project.yml
   spec.add_runtime_dependency "concurrent-ruby", "~> 1.0"
-  spec.add_runtime_dependency "dry-container", "~> 0.3"
-  spec.add_runtime_dependency "dry-core", "~> 0.5", ">= 0.5"
-  spec.add_runtime_dependency "dry-inflector", "~> 0.1", ">= 0.1.2"
-  spec.add_runtime_dependency "dry-logic", "~> 1.0", ">= 1.0.2"
+  spec.add_runtime_dependency "dry-core", "~> 1.0", "< 2"
+  spec.add_runtime_dependency "dry-inflector", "~> 1.0", "< 2"
+  spec.add_runtime_dependency "dry-logic", ">= 1.4", "< 2"
+  spec.add_runtime_dependency "zeitwerk", "~> 2.6"
 
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "dry-monads", "~> 1.0"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "yard"

data/lib/dry/types/array/constructor.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/types/constructor"
-
 module Dry
   module Types
     # @api public

data/lib/dry/types/array/member.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/types/array/constructor"
-
 module Dry
   module Types
     class Array < Nominal
@@ -72,7 +70,7 @@ module Dry
         # @return [Result,Logic::Result]
         #
         # @api public
-        def try(input, &block)
+        def try(input, &block) # rubocop:disable Metrics/PerceivedComplexity
           if primitive?(input)
             output = []
 

data/lib/dry/types/array.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/types/array/member"
-require "dry/types/array/constructor"
-
 module Dry
   module Types
     # Array type can be used to define an array with optional member type

data/lib/dry/types/builder.rb

@@ -1,12 +1,11 @@
 # frozen_string_literal: true
 
-require "dry/core/deprecations"
-
 module Dry
   module Types
     # Common API for building types and composition
     #
     # @api public
+    # rubocop:disable Metrics/ModuleLength
     module Builder
       include Dry::Core::Constants
 
@@ -32,8 +31,29 @@ module Dry
       #
       # @api private
       def |(other)
-        klass = constrained? && other.constrained? ? Sum::Constrained : Sum
-        klass.new(self, other)
+        compose(other, Sum)
+      end
+
+      # Compose two types into an Intersection type
+      #
+      # @param [Type] other
+      #
+      # @return [Intersection, Intersection::Constrained]
+      #
+      # @api private
+      def &(other)
+        compose(other, Intersection)
+      end
+
+      # Compose two types into an Implication type
+      #
+      # @param [Type] other
+      #
+      # @return [Implication, Implication::Constrained]
+      #
+      # @api private
+      def >(other)
+        compose(other, Implication)
       end
 
       # Turn a type into an optional type
@@ -76,7 +96,7 @@ module Dry
             " value every time. Call `.freeze` when setting the default"\
             " or pass `shared: true` to discard this warning."\
             "\n#{where}",
-            tag: :'dry-types'
+            tag: :"dry-types"
           )
         end
 
@@ -105,7 +125,7 @@ module Dry
           if values.length == 1 && values[0].is_a?(::Hash)
             values[0]
           else
-            ::Hash[values.zip(values)]
+            values.zip(values).to_h
           end
 
         Enum.new(constrained(included_in: mapping.keys), mapping: mapping)
@@ -147,7 +167,7 @@ module Dry
       # @return [Constructor]
       #
       # @api public
-      def fallback(value = Undefined, shared: false, &_fallback)
+      def fallback(value = Undefined, shared: false, &_fallback) # rubocop:disable Metrics/PerceivedComplexity
         if Undefined.equal?(value) && !block_given?
           raise ::ArgumentError, "fallback value or a block must be given"
         end
@@ -167,7 +187,7 @@ module Dry
             " value every time. Call `.freeze` when setting the fallback"\
             " or pass `shared: true` to discard this warning."\
             "\n#{where}",
-            tag: :'dry-types'
+            tag: :"dry-types"
           )
         end
 
@@ -181,12 +201,21 @@ module Dry
           end
         end
       end
+
+      private
+
+      # @api private
+      def compose(other, composition_class)
+        klass =
+          if constrained? && other.constrained?
+            composition_class::Constrained
+          else
+            composition_class
+          end
+
+        klass.new(self, other)
+      end
     end
+    # rubocop:enable Metrics/ModuleLength
   end
 end
-
-require "dry/types/default"
-require "dry/types/constrained"
-require "dry/types/enum"
-require "dry/types/lax"
-require "dry/types/sum"

data/lib/dry/types/builder_methods.rb

@@ -80,7 +80,7 @@ module Dry
       # @param [#call,nil] block Value constructor
       #
       # @return [Dry::Types::Type]
-      def Constructor(klass, cons = nil, &block)
+      def Constructor(klass, cons = nil, &block) # rubocop:disable Metrics/PerceivedComplexity:
         if klass.is_a?(Type)
           if cons || block
             klass.constructor(cons || block)

data/lib/dry/types/coercions/params.rb

@@ -12,9 +12,10 @@ module Dry
       module Params
         TRUE_VALUES = %w[1 on On ON t true True TRUE T y yes Yes YES Y].freeze
         FALSE_VALUES = %w[0 off Off OFF f false False FALSE F n no No NO N].freeze
-        BOOLEAN_MAP = ::Hash[
-          TRUE_VALUES.product([true]) + FALSE_VALUES.product([false])
-        ].merge(true => true, false => false).freeze
+        BOOLEAN_MAP = EMPTY_HASH.merge(
+          [true, *TRUE_VALUES].to_h { |v| [v, true] },
+          [false, *FALSE_VALUES].to_h { |v| [v, false] }
+        ).freeze
 
         extend Coercions
 

data/lib/dry/types/compat.rb

@@ -0,0 +1 @@
+# frozen_string_literal: true

data/lib/dry/types/compiler.rb

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
-require "dry/core/deprecations"
-
 module Dry
   module Types
     # @api private
     class Compiler
-      extend ::Dry::Core::Deprecations[:'dry-types']
+      extend ::Dry::Core::Deprecations[:"dry-types"]
 
       attr_reader :registry
 

data/lib/dry/types/composition.rb

@@ -0,0 +1,152 @@
+# frozen_string_literal: true
+
+require "dry/core/equalizer"
+require "dry/types/options"
+require "dry/types/meta"
+
+module Dry
+  module Types
+    module Composition
+      include Type
+      include Builder
+      include Options
+      include Meta
+      include Printable
+      include Dry::Equalizer(:left, :right, :options, :meta, inspect: false, immutable: true)
+
+      # @return [Type]
+      attr_reader :left
+
+      # @return [Type]
+      attr_reader :right
+
+      module Constrained
+        def rule
+          left.rule.public_send(self.class.operator, right.rule)
+        end
+
+        def constrained?
+          true
+        end
+      end
+
+      def self.included(base)
+        composition_name = Inflector.demodulize(base)
+        ast_type = Inflector.underscore(composition_name).to_sym
+        base.define_singleton_method(:ast_type) { ast_type }
+        base.define_singleton_method(:composition_name) { composition_name }
+        base.const_set("Constrained", Class.new(base) { include Constrained })
+      end
+
+      # @param [Type] left
+      # @param [Type] right
+      # @param [Hash] options
+      #
+      # @api private
+      def initialize(left, right, **options)
+        super
+        @left, @right = left, right
+        freeze
+      end
+
+      # @return [String]
+      #
+      # @api public
+      def name
+        [left, right].map(&:name).join(" #{self.class.operator} ")
+      end
+
+      # @return [false]
+      #
+      # @api public
+      def default?
+        false
+      end
+
+      # @return [false]
+      #
+      # @api public
+      def constrained?
+        false
+      end
+
+      # @return [Boolean]
+      #
+      # @api public
+      def optional?
+        false
+      end
+
+      # @param [Object] input
+      #
+      # @return [Object]
+      #
+      # @api private
+      def call_unsafe(input)
+        raise NotImplementedError
+      end
+
+      # @param [Object] input
+      #
+      # @return [Object]
+      #
+      # @api private
+      def call_safe(input, &block)
+        raise NotImplementedError
+      end
+
+      # @param [Object] input
+      #
+      # @api public
+      def try(input)
+        raise NotImplementedError
+      end
+
+      # @api private
+      def success(input)
+        result = try(input)
+        if result.success?
+          result
+        else
+          raise ArgumentError, "Invalid success value '#{input}' for #{inspect}"
+        end
+      end
+
+      # @api private
+      def failure(input, _error = nil)
+        result = try(input)
+        if result.failure?
+          result
+        else
+          raise ArgumentError, "Invalid failure value '#{input}' for #{inspect}"
+        end
+      end
+
+      # @param [Object] value
+      #
+      # @return [Boolean]
+      #
+      # @api private
+      def primitive?(value)
+        raise NotImplementedError
+      end
+
+      # @see Nominal#to_ast
+      #
+      # @api public
+      def to_ast(meta: true)
+        [self.class.ast_type,
+         [left.to_ast(meta: meta), right.to_ast(meta: meta), meta ? self.meta : EMPTY_HASH]]
+      end
+
+      # Wrap the type with a proc
+      #
+      # @return [Proc]
+      #
+      # @api public
+      def to_proc
+        proc { |value| self.(value) }
+      end
+    end
+  end
+end

data/lib/dry/types/constrained.rb

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/core/equalizer"
-require "dry/types/decorator"
-require "dry/types/constraints"
-require "dry/types/constrained/coercible"
-
 module Dry
   module Types
     # Constrained types apply rules to the input

data/lib/dry/types/constraints.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/logic/rule_compiler"
-require "dry/logic/predicates"
-require "dry/logic/rule/predicate"
-
 module Dry
   # Helper methods for constraint types
   #
@@ -17,8 +13,8 @@ module Dry
     def self.Rule(options)
       rule_compiler.(
         options.map { |key, val|
-          Logic::Rule::Predicate.build(
-            Logic::Predicates[:"#{key}?"]
+          ::Dry::Logic::Rule::Predicate.build(
+            ::Dry::Logic::Predicates[:"#{key}?"]
           ).curry(val).to_ast
         }
       ).reduce(:and)
@@ -28,7 +24,7 @@ module Dry
     #
     # @api private
     def self.rule_compiler
-      @rule_compiler ||= Logic::RuleCompiler.new(Logic::Predicates)
+      @rule_compiler ||= ::Dry::Logic::RuleCompiler.new(::Dry::Logic::Predicates)
     end
   end
 end

data/lib/dry/types/constructor/function.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/core/equalizer"
 require "concurrent/map"
 
 module Dry
@@ -62,17 +61,17 @@ module Dry
                 ::Module.new do
                   if safe
                     module_eval(<<~RUBY, __FILE__, __LINE__ + 1)
-                      def call(input, &block)
-                        @target.#{method}(input, &block)
-                      end
+                      def call(input, &block)              # def call(input, &block)
+                        @target.#{method}(input, &block)   #   @target.coerve(input, &block)
+                      end                                  # end
                     RUBY
                   else
                     module_eval(<<~RUBY, __FILE__, __LINE__ + 1)
-                      def call(input, &block)
-                        @target.#{method}(input)
-                      rescue ::NoMethodError, ::TypeError, ::ArgumentError => error
-                        CoercionError.handle(error, &block)
-                      end
+                      def call(input, &block)                                        # def call(input, &block)
+                        @target.#{method}(input)                                     #   @target.coerce(input)
+                      rescue ::NoMethodError, ::TypeError, ::ArgumentError => error  # rescue ::NoMethodError, ::TypeError, ::ArgumentError => error
+                        CoercionError.handle(error, &block)                          #   CoercionError.handle(error, &block)
+                      end                                                            # end
                     RUBY
                   end
                 end

data/lib/dry/types/constructor.rb

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/core/equalizer"
-require "dry/types/fn_container"
-require "dry/types/constructor/function"
-require "dry/types/constructor/wrapper"
-
 module Dry
   module Types
     # Constructor types apply a function to the input that is supposed to return
@@ -49,13 +44,12 @@ module Dry
 
       # @api private
       def self.wrapper_type
-        @wrapper_type ||= begin
+        @wrapper_type ||=
           if self < Wrapper
             self
           else
             const_set(:Wrapping, ::Class.new(self).include(Wrapper))
           end
-        end
       end
 
       # Instantiate a new constructor type instance
@@ -191,7 +185,7 @@ module Dry
         if type.respond_to?(method)
           response = type.public_send(method, *args, &block)
 
-          if response.is_a?(Type) && type.class.equal?(response.class)
+          if response.is_a?(Type) && response.instance_of?(type.class)
             response.constructor_type[response, **options]
           else
             response

data/lib/dry/types/container.rb

@@ -1,14 +1,12 @@
 # frozen_string_literal: true
 
-require "dry/container"
-
 module Dry
   module Types
     # Internal container for the built-in types
     #
     # @api private
     class Container
-      include Dry::Container::Mixin
+      include Core::Container::Mixin
     end
   end
 end

data/lib/dry/types/core.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/types/any"
-
 module Dry
   module Types
     # Primitives with {Kernel} coercion methods
@@ -60,7 +58,8 @@ module Dry
 
     # Register {KERNEL_COERCIBLE} types
     KERNEL_COERCIBLE.each do |name, primitive|
-      register("coercible.#{name}", self["nominal.#{name}"].constructor(Kernel.method(primitive.name)))
+      register("coercible.#{name}",
+               self["nominal.#{name}"].constructor(Kernel.method(primitive.name)))
     end
 
     # Register {METHOD_COERCIBLE} types

data/lib/dry/types/decorator.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/types/options"
-
 module Dry
   module Types
     # Common API for types

data/lib/dry/types/default.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/core/equalizer"
-require "dry/types/decorator"
-
 module Dry
   module Types
     # Default types are useful when a missing value should be replaced by a default one
@@ -53,7 +50,7 @@ module Dry
       # @param [Object] value
       #
       # @api private
-      def initialize(type, value, **options)
+      def initialize(type, value, **)
         super
         @value = value
       end
@@ -65,8 +62,8 @@ module Dry
       # @return [Default]
       #
       # @api public
-      def constrained(*args)
-        type.constrained(*args).default(value)
+      def constrained(...)
+        type.constrained(...).default(value)
       end
 
       # @return [true]