dry-types 1.1.0 → 1.3.0

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

@@ -15,7 +15,7 @@ module Dry
         class Safe < Function
           def call(input, &block)
             @fn.(input, &block)
-          rescue NoMethodError, TypeError, ArgumentError => e
+          rescue ::NoMethodError, ::TypeError, ::ArgumentError => e
             CoercionError.handle(e, &block)
           end
         end
@@ -30,7 +30,7 @@ module Dry
           #
           # @return [Function]
           def self.call_class(method, public, safe)
-            @cache.fetch_or_store([method, public, safe].hash) do
+            @cache.fetch_or_store([method, public, safe]) do
               if public
                 ::Class.new(PublicCall) do
                   include PublicCall.call_interface(method, safe)
@@ -53,7 +53,7 @@ module Dry
             #
             # @return [::Module]
             def self.call_interface(method, safe)
-              @interfaces.fetch_or_store([method, safe].hash) do
+              @interfaces.fetch_or_store([method, safe]) do
                 ::Module.new do
                   if safe
                     module_eval(<<~RUBY, __FILE__, __LINE__ + 1)
@@ -65,7 +65,7 @@ module Dry
                     module_eval(<<~RUBY, __FILE__, __LINE__ + 1)
                       def call(input, &block)
                         @target.#{method}(input)
-                      rescue NoMethodError, TypeError, ArgumentError => error
+                      rescue ::NoMethodError, ::TypeError, ::ArgumentError => error
                         CoercionError.handle(error, &block)
                       end
                     RUBY
@@ -90,7 +90,7 @@ module Dry
           class PrivateSafeCall < PrivateCall
             def call(input, &block)
               @target.send(@name, input)
-            rescue NoMethodError, TypeError, ArgumentError => e
+            rescue ::NoMethodError, ::TypeError, ::ArgumentError => e
               CoercionError.handle(e, &block)
             end
           end
@@ -121,7 +121,7 @@ module Dry
         # @param [#call] fn
         # @return [Function]
         def self.[](fn)
-          raise ArgumentError, 'Missing constructor block' if fn.nil?
+          raise ::ArgumentError, 'Missing constructor block' if fn.nil?
 
           if fn.is_a?(Function)
             fn
@@ -146,7 +146,7 @@ module Dry
           last_arg.equal?(:block)
         end
 
-        include Dry::Equalizer(:fn)
+        include ::Dry::Equalizer(:fn, immutable: true)
 
         attr_reader :fn
 
@@ -163,36 +163,22 @@ module Dry
         # @return [Array]
         def to_ast
           if fn.is_a?(::Proc)
-            [:id, Dry::Types::FnContainer.register(fn)]
+            [:id, FnContainer.register(fn)]
           else
             [:callable, fn]
           end
         end
 
-        if RUBY_VERSION >= '2.6'
-          # @return [Function]
-          def >>(other)
-            proc = other.is_a?(::Proc) ? other : other.fn
-            Function[@fn >> proc]
-          end
-
-          # @return [Function]
-          def <<(other)
-            proc = other.is_a?(::Proc) ? other : other.fn
-            Function[@fn << proc]
-          end
-        else
-          # @return [Function]
-          def >>(other)
-            proc = other.is_a?(::Proc) ? other : other.fn
-            Function[-> x { proc[@fn[x]] }]
-          end
+        # @return [Function]
+        def >>(other)
+          f = Function[other]
+          Function[-> x, &b { f.(self.(x, &b), &b) }]
+        end
 
-          # @return [Function]
-          def <<(other)
-            proc = other.is_a?(::Proc) ? other : other.fn
-            Function[-> x { @fn[proc[x]] }]
-          end
+        # @return [Function]
+        def <<(other)
+          f = Function[other]
+          Function[-> x, &b { self.(f.(x, &b), &b) }]
         end
       end
     end

data/lib/dry/types/core.rb

@@ -72,7 +72,9 @@ module Dry
 
     # Register optional strict {NON_NIL} types
     NON_NIL.each_key do |name|
-      register("optional.strict.#{name}", self["strict.#{name}"].optional)
+      type = self[name.to_s].optional
+      register("optional.strict.#{name}", type)
+      register("optional.#{name}", type)
     end
 
     # Register optional {COERCIBLE} types

data/lib/dry/types/decorator.rb

@@ -14,7 +14,7 @@ module Dry
       attr_reader :type
 
       # @param [Type] type
-      def initialize(type, *)
+      def initialize(type, *, **)
         super
         @type = type
       end
@@ -44,13 +44,6 @@ module Dry
         type.constrained?
       end
 
-      # @return [Sum]
-      #
-      # @api public
-      def optional
-        Types['strict.nil'] | self
-      end
-
       # @param [Symbol] meth
       # @param [Boolean] include_private
       #
@@ -90,7 +83,7 @@ module Dry
       # @api private
       def method_missing(meth, *args, &block)
         if type.respond_to?(meth)
-          response = type.__send__(meth, *args, &block)
+          response = type.public_send(meth, *args, &block)
 
           if decorate?(response)
             __new__(response)
@@ -101,6 +94,7 @@ module Dry
           super
         end
       end
+      ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
 
       # Replace underlying type
       #

data/lib/dry/types/default.rb

@@ -10,7 +10,7 @@ module Dry
     class Default
       # @api private
       class Callable < Default
-        include Dry::Equalizer(:type, inspect: false)
+        include Dry::Equalizer(:type, inspect: false, immutable: true)
 
         # Evaluates given callable
         # @return [Object]
@@ -23,7 +23,7 @@ module Dry
       include Decorator
       include Builder
       include Printable
-      include Dry::Equalizer(:type, :value, inspect: false)
+      include Dry::Equalizer(:type, :value, inspect: false, immutable: true)
 
       # @return [Object]
       attr_reader :value

data/lib/dry/types/enum.rb

@@ -9,7 +9,7 @@ module Dry
     # @api public
     class Enum
       include Type
-      include Dry::Equalizer(:type, :mapping, inspect: false)
+      include Dry::Equalizer(:type, :mapping, inspect: false, immutable: true)
       include Decorator
       include Builder
 
@@ -27,7 +27,7 @@ module Dry
       # @option options [Array] :values
       #
       # @api private
-      def initialize(type, options)
+      def initialize(type, **options)
         super
         @mapping = options.fetch(:mapping).freeze
         @values = @mapping.keys.freeze

data/lib/dry/types/errors.rb

@@ -2,7 +2,7 @@
 
 module Dry
   module Types
-    extend Dry::Core::ClassAttributes
+    extend ::Dry::Core::ClassAttributes
 
     # @!attribute [r] namespace
     #   @return [Container{String => Nominal}]
@@ -12,7 +12,7 @@ module Dry
 
     # Base class for coercion errors raise by dry-types
     #
-    class CoercionError < StandardError
+    class CoercionError < ::StandardError
       # @api private
       def self.handle(exception, meta: Undefined)
         if block_given?
@@ -34,7 +34,7 @@ module Dry
       # @api private
       def initialize(message, meta: Undefined, backtrace: Undefined)
         unless message.is_a?(::String)
-          raise ArgumentError, "message must be a string, #{message.class} given"
+          raise ::ArgumentError, "message must be a string, #{message.class} given"
         end
 
         super(message)
@@ -74,9 +74,9 @@ module Dry
       end
     end
 
-    MapError = Class.new(CoercionError)
+    MapError = ::Class.new(CoercionError)
 
-    SchemaKeyError = Class.new(CoercionError)
+    SchemaKeyError = ::Class.new(CoercionError)
     private_constant(:SchemaKeyError)
 
     class MissingKeyError < SchemaKeyError

data/lib/dry/types/extensions.rb

@@ -3,3 +3,7 @@
 Dry::Types.register_extension(:maybe) do
   require 'dry/types/extensions/maybe'
 end
+
+Dry::Types.register_extension(:monads) do
+  require 'dry/types/extensions/monads'
+end

data/lib/dry/types/extensions/maybe.rb

@@ -10,11 +10,11 @@ module Dry
     # @api public
     class Maybe
       include Type
-      include Dry::Equalizer(:type, :options, inspect: false)
+      include ::Dry::Equalizer(:type, :options, inspect: false, immutable: true)
       include Decorator
       include Builder
       include Printable
-      include Dry::Monads::Maybe::Mixin
+      include ::Dry::Monads::Maybe::Mixin
 
       # @param [Dry::Monads::Maybe, Object] input
       #
@@ -23,7 +23,7 @@ module Dry
       # @api private
       def call_unsafe(input = Undefined)
         case input
-        when Dry::Monads::Maybe
+        when ::Dry::Monads::Maybe
           input
         when Undefined
           None()
@@ -37,14 +37,14 @@ module Dry
       # @return [Dry::Monads::Maybe]
       #
       # @api private
-      def call_safe(input = Undefined, &block)
+      def call_safe(input = Undefined)
         case input
-        when Dry::Monads::Maybe
+        when ::Dry::Monads::Maybe
           input
         when Undefined
           None()
         else
-          Maybe(type.call_safe(input, &block))
+          Maybe(type.call_safe(input) { |output = input| return yield(output) })
         end
       end
 
@@ -54,13 +54,13 @@ module Dry
       #
       # @api public
       def try(input = Undefined)
-        res = if input.equal?(Undefined)
-                None()
-              else
-                Maybe(type[input])
-              end
+        result = type.try(input)
 
-        Result::Success.new(res)
+        if result.success?
+          Result::Success.new(Maybe(result.input))
+        else
+          result
+        end
       end
 
       # @return [true]
@@ -93,7 +93,7 @@ module Dry
       #
       # @api public
       def maybe
-        Maybe.new(Types['strict.nil'] | self)
+        Maybe.new(Types['nil'] | self)
       end
     end
 
@@ -119,7 +119,7 @@ module Dry
 
     # Register non-coercible maybe types
     NON_NIL.each_key do |name|
-      register("maybe.strict.#{name}", self["strict.#{name}"].maybe)
+      register("maybe.strict.#{name}", self[name.to_s].maybe)
     end
 
     # Register coercible maybe types

data/lib/dry/types/extensions/monads.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'dry/monads/result'
+
+module Dry
+  module Types
+    # Monad extension for Result
+    #
+    # @api public
+    class Result
+      include Dry::Monads::Result::Mixin
+
+      # Turn result into a monad
+      #
+      # This makes result objects work with dry-monads (or anything with a compatible interface)
+      #
+      # @return [Dry::Monads::Success,Dry::Monads::Failure]
+      #
+      # @api public
+      def to_monad
+        if success?
+          Success(input)
+        else
+          Failure([error, input])
+        end
+      end
+    end
+  end
+end

data/lib/dry/types/hash.rb

@@ -113,7 +113,7 @@ module Dry
 
         type_map.map do |map_key, type|
           name, options = key_name(map_key)
-          key = Schema::Key.new(resolve_type(type), name, options)
+          key = Schema::Key.new(resolve_type(type), name, **options)
           type_transform.(key)
         end
       end
@@ -121,7 +121,8 @@ module Dry
       # @api private
       def resolve_type(type)
         case type
-        when String, Class then Types[type]
+        when Type then type
+        when ::Class, ::String then Types[type]
         else type
         end
       end

data/lib/dry/types/lax.rb

@@ -13,9 +13,9 @@ module Dry
       include Decorator
       include Builder
       include Printable
-      include Dry::Equalizer(:type, inspect: false)
+      include Dry::Equalizer(:type, inspect: false, immutable: true)
 
-      private :options, :constructor
+      undef :options, :constructor, :<<, :>>, :prepend, :append
 
       # @param [Object] input
       #
@@ -40,9 +40,6 @@ module Dry
       # @api public
       def try(input, &block)
         type.try(input, &block)
-      rescue CoercionError => e
-        result = failure(input, e.message)
-        block ? yield(result) : result
       end
 
       # @see Nominal#to_ast

data/lib/dry/types/meta.rb

@@ -16,7 +16,7 @@ module Dry
       # @return [Type]
       #
       # @api public
-      def with(options)
+      def with(**options)
         super(meta: @meta, **options)
       end
 
@@ -28,8 +28,8 @@ module Dry
       #   @return [Type] new type with added metadata
       #
       # @api public
-      def meta(data = nil)
-        if !data
+      def meta(data = Undefined)
+        if Undefined.equal?(data)
           @meta
         elsif data.empty?
           self

data/lib/dry/types/module.rb

@@ -18,10 +18,10 @@ module Dry
     #
     # @api public
     class Module < ::Module
-      def initialize(registry, *args)
+      def initialize(registry, *args, **kwargs)
         @registry = registry
-        check_parameters(*args)
-        constants = type_constants(*args)
+        check_parameters(*args, **kwargs)
+        constants = type_constants(*args, **kwargs)
         define_constants(constants)
         extend(BuilderMethods)
 

data/lib/dry/types/nominal.rb

@@ -19,7 +19,7 @@ module Dry
       include Meta
       include Builder
       include Printable
-      include Dry::Equalizer(:primitive, :options, :meta, inspect: false)
+      include Dry::Equalizer(:primitive, :options, :meta, inspect: false, immutable: true)
 
       # @return [Class]
       attr_reader :primitive

data/lib/dry/types/params.rb

@@ -55,5 +55,11 @@ module Dry
     register('params.symbol') do
       self['nominal.symbol'].constructor(Coercions::Params.method(:to_symbol))
     end
+
+    COERCIBLE.each_key do |name|
+      next if name.equal?(:string)
+
+      register("optional.params.#{name}", self['params.nil'] | self["params.#{name}"])
+    end
   end
 end