dry-types 1.4.0 → 1.5.1

data/lib/dry/types/decorator.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/types/options'
+require "dry/types/options"
 
 module Dry
   module Types
@@ -100,7 +100,7 @@ module Dry
       #
       # @api private
       def __new__(type)
-        self.class.new(type, *@__args__[1..-1], **@options)
+        self.class.new(type, *@__args__.drop(1), **@options)
       end
     end
   end

data/lib/dry/types/default.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require 'dry/types/decorator'
+require "dry/core/equalizer"
+require "dry/types/decorator"
 
 module Dry
   module Types
@@ -17,6 +18,11 @@ module Dry
         def evaluate
           value.call(type)
         end
+
+        # @return [true]
+        def callable?
+          true
+        end
       end
 
       include Type
@@ -111,6 +117,13 @@ module Dry
           Undefined.default(type.call_safe(input, &block)) { evaluate }
         end
       end
+
+      # @return [false]
+      #
+      # @api private
+      def callable?
+        false
+      end
     end
   end
 end

data/lib/dry/types/enum.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require 'dry/types/decorator'
+require "dry/core/equalizer"
+require "dry/types/decorator"
 
 module Dry
   module Types
@@ -58,8 +59,8 @@ module Dry
 
       # @api private
       def default(*)
-        raise '.enum(*values).default(value) is not supported. Call '\
-              '.default(value).enum(*values) instead'
+        raise ".enum(*values).default(value) is not supported. Call "\
+              ".default(value).enum(*values) instead"
       end
 
       # Check whether a value is in the enum

data/lib/dry/types/errors.rb

@@ -56,7 +56,7 @@ module Dry
 
       # @return string
       def message
-        errors.map(&:message).join(', ')
+        errors.map(&:message).join(", ")
       end
 
       # @return [Array]

data/lib/dry/types/extensions.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 Dry::Types.register_extension(:maybe) do
-  require 'dry/types/extensions/maybe'
+  require "dry/types/extensions/maybe"
 end
 
 Dry::Types.register_extension(:monads) do
-  require 'dry/types/extensions/monads'
+  require "dry/types/extensions/monads"
 end

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

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
-require 'dry/monads/maybe'
-require 'dry/types/decorator'
+require "dry/core/equalizer"
+require "dry/monads/maybe"
+require "dry/types/decorator"
 
 module Dry
   module Types
@@ -79,7 +80,7 @@ module Dry
       # @api public
       def default(value)
         if value.nil?
-          raise ArgumentError, 'nil cannot be used as a default of a maybe type'
+          raise ArgumentError, "nil cannot be used as a default of a maybe type"
         else
           super
         end
@@ -93,7 +94,7 @@ module Dry
       #
       # @api public
       def maybe
-        Maybe.new(Types['nil'] | self)
+        Maybe.new(Types["nil"] | self)
       end
     end
 

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/monads/result'
+require "dry/monads/result"
 
 module Dry
   module Types

data/lib/dry/types/fn_container.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/types/container'
+require "dry/types/container"
 
 module Dry
   module Types

data/lib/dry/types/hash.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/types/hash/constructor'
+require "dry/types/hash/constructor"
 
 module Dry
   module Types
@@ -8,7 +8,7 @@ module Dry
     #
     # @api public
     class Hash < Nominal
-      NOT_REQUIRED = { required: false }.freeze
+      NOT_REQUIRED = {required: false}.freeze
 
       # @overload schema(type_map, meta = EMPTY_HASH)
       #   @param [{Symbol => Dry::Types::Nominal}] type_map
@@ -50,8 +50,8 @@ module Dry
 
       # @api private
       def weak(*)
-        raise 'Support for old hash schemas was removed, please refer to the CHANGELOG '\
-              'on how to proceed with the new API https://github.com/dry-rb/dry-types/blob/master/CHANGELOG.md'
+        raise "Support for old hash schemas was removed, please refer to the CHANGELOG "\
+              "on how to proceed with the new API https://github.com/dry-rb/dry-types/blob/master/CHANGELOG.md"
       end
       alias_method :permissive, :weak
       alias_method :strict, :weak
@@ -69,7 +69,7 @@ module Dry
       def with_type_transform(proc = nil, &block)
         fn = proc || block
 
-        raise ArgumentError, 'a block or callable argument is required' if fn.nil?
+        raise ArgumentError, "a block or callable argument is required" if fn.nil?
 
         handle = Dry::Types::FnContainer.register(fn)
         with(type_transform_fn: handle)
@@ -95,13 +95,7 @@ module Dry
       #
       # @api public
       def to_ast(meta: true)
-        opts = if RUBY_VERSION >= '2.5'
-                 options.slice(:type_transform_fn)
-               else
-                 options.select { |k, _| k == :type_transform_fn }
-               end
-
-        [:hash, [opts, meta ? self.meta : EMPTY_HASH]]
+        [:hash, [options.slice(:type_transform_fn), meta ? self.meta : EMPTY_HASH]]
       end
 
       private
@@ -129,7 +123,7 @@ module Dry
 
       # @api private
       def key_name(key)
-        if key.to_s.end_with?('?')
+        if key.to_s.end_with?("?")
           [key.to_s.chop.to_sym, NOT_REQUIRED]
         else
           [key, EMPTY_HASH]
@@ -139,5 +133,5 @@ module Dry
   end
 end
 
-require 'dry/types/schema/key'
-require 'dry/types/schema'
+require "dry/types/schema/key"
+require "dry/types/schema"

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/types/constructor'
+require "dry/types/constructor"
 
 module Dry
   module Types

data/lib/dry/types/inflector.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/inflector'
+require "dry/inflector"
 
 module Dry
   module Types

data/lib/dry/types/json.rb

@@ -1,35 +1,35 @@
 # frozen_string_literal: true
 
-require 'dry/types/coercions/json'
+require "dry/types/coercions/json"
 
 module Dry
   module Types
-    register('json.nil') do
-      self['nominal.nil'].constructor(Coercions::JSON.method(:to_nil))
+    register("json.nil") do
+      self["nominal.nil"].constructor(Coercions::JSON.method(:to_nil))
     end
 
-    register('json.date') do
-      self['nominal.date'].constructor(Coercions::JSON.method(:to_date))
+    register("json.date") do
+      self["nominal.date"].constructor(Coercions::JSON.method(:to_date))
     end
 
-    register('json.date_time') do
-      self['nominal.date_time'].constructor(Coercions::JSON.method(:to_date_time))
+    register("json.date_time") do
+      self["nominal.date_time"].constructor(Coercions::JSON.method(:to_date_time))
     end
 
-    register('json.time') do
-      self['nominal.time'].constructor(Coercions::JSON.method(:to_time))
+    register("json.time") do
+      self["nominal.time"].constructor(Coercions::JSON.method(:to_time))
     end
 
-    register('json.decimal') do
-      self['nominal.decimal'].constructor(Coercions::JSON.method(:to_decimal))
+    register("json.decimal") do
+      self["nominal.decimal"].constructor(Coercions::JSON.method(:to_decimal))
     end
 
-    register('json.symbol') do
-      self['nominal.symbol'].constructor(Coercions::JSON.method(:to_symbol))
+    register("json.symbol") do
+      self["nominal.symbol"].constructor(Coercions::JSON.method(:to_symbol))
     end
 
-    register('json.array') { self['array'] }
+    register("json.array") { self["array"] }
 
-    register('json.hash') { self['hash'] }
+    register("json.hash") { self["hash"] }
   end
 end

data/lib/dry/types/lax.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'dry/core/deprecations'
-require 'dry/types/decorator'
+require "dry/core/deprecations"
+require "dry/types/decorator"
 
 module Dry
   module Types

data/lib/dry/types/map.rb

@@ -21,7 +21,7 @@ module Dry
     #
     # @api public
     class Map < Nominal
-      def initialize(_primitive, key_type: Types['any'], value_type: Types['any'], meta: EMPTY_HASH)
+      def initialize(_primitive, key_type: Types["any"], value_type: Types["any"], meta: EMPTY_HASH)
         super(_primitive, key_type: key_type, value_type: value_type, meta: meta)
       end
 
@@ -43,7 +43,7 @@ module Dry
       #
       # @api public
       def name
-        'Map'
+        "Map"
       end
 
       # @param [Hash] hash

data/lib/dry/types/meta.rb

@@ -11,7 +11,7 @@ module Dry
         @meta = meta.freeze
       end
 
-      # @param [Hash] new_options
+      # @param options [Hash] new_options
       #
       # @return [Type]
       #

data/lib/dry/types/module.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'dry/core/deprecations'
-require 'dry/types/builder_methods'
+require "dry/core/deprecations"
+require "dry/types/builder_methods"
 
 module Dry
   module Types
@@ -31,7 +31,7 @@ module Dry
             base.instance_exec(const_get(:Nominal, false)) do |nominal|
               extend Dry::Core::Deprecations[:'dry-types']
               const_set(:Definition, nominal)
-              deprecate_constant(:Definition, message: 'Nominal')
+              deprecate_constant(:Definition, message: "Nominal")
             end
           end
         end
@@ -69,7 +69,7 @@ module Dry
       def registry_tree
         @registry_tree ||= @registry.keys.each_with_object({}) { |key, tree|
           type = @registry[key]
-          *modules, const_name = key.split('.').map { |part|
+          *modules, const_name = key.split(".").map { |part|
             Inflector.camelize(part).to_sym
           }
           next if modules.empty?
@@ -87,14 +87,14 @@ module Dry
         referenced.concat(aliases.keys)
 
         known = @registry.keys.map { |k|
-          ns, *path = k.split('.')
+          ns, *path = k.split(".")
           ns.to_sym unless path.empty?
         }.compact.uniq
 
         (referenced.uniq - known).each do |name|
           raise ArgumentError,
                 "#{name.inspect} is not a known type namespace. "\
-                "Supported options are #{known.map(&:inspect).join(', ')}"
+                "Supported options are #{known.map(&:inspect).join(", ")}"
         end
       end
 

data/lib/dry/types/nominal.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
-require 'dry/core/deprecations'
-require 'dry/types/builder'
-require 'dry/types/result'
-require 'dry/types/options'
-require 'dry/types/meta'
+require "dry/core/deprecations"
+require "dry/core/equalizer"
+require "dry/types/builder"
+require "dry/types/result"
+require "dry/types/options"
+require "dry/types/meta"
 
 module Dry
   module Types
@@ -98,7 +99,6 @@ module Dry
       end
 
       # @param [Object] input
-      # @param [#call,nil] block
       #
       # @yieldparam [Failure] failure
       # @yieldreturn [Result]
@@ -126,7 +126,7 @@ module Dry
       #
       # @api public
       def failure(input, error)
-        raise ArgumentError, 'error must be a CoercionError' unless error.is_a?(CoercionError)
+        raise ArgumentError, "error must be a CoercionError" unless error.is_a?(CoercionError)
 
         Result::Failure.new(input, error)
       end
@@ -201,10 +201,10 @@ module Dry
 
     extend Dry::Core::Deprecations[:'dry-types']
     Definition = Nominal
-    deprecate_constant(:Definition, message: 'Nominal')
+    deprecate_constant(:Definition, message: "Nominal")
   end
 end
 
-require 'dry/types/array'
-require 'dry/types/hash'
-require 'dry/types/map'
+require "dry/types/array"
+require "dry/types/hash"
+require "dry/types/map"

data/lib/dry/types/params.rb

@@ -1,65 +1,67 @@
 # frozen_string_literal: true
 
-require 'dry/types/coercions/params'
+require "dry/types/coercions/params"
 
 module Dry
   module Types
-    register('params.nil') do
-      self['nominal.nil'].constructor(Coercions::Params.method(:to_nil))
+    register("params.nil") do
+      self["nominal.nil"].constructor(Coercions::Params.method(:to_nil))
     end
 
-    register('params.date') do
-      self['nominal.date'].constructor(Coercions::Params.method(:to_date))
+    register("params.date") do
+      self["nominal.date"].constructor(Coercions::Params.method(:to_date))
     end
 
-    register('params.date_time') do
-      self['nominal.date_time'].constructor(Coercions::Params.method(:to_date_time))
+    register("params.date_time") do
+      self["nominal.date_time"].constructor(Coercions::Params.method(:to_date_time))
     end
 
-    register('params.time') do
-      self['nominal.time'].constructor(Coercions::Params.method(:to_time))
+    register("params.time") do
+      self["nominal.time"].constructor(Coercions::Params.method(:to_time))
     end
 
-    register('params.true') do
-      self['nominal.true'].constructor(Coercions::Params.method(:to_true))
+    register("params.true") do
+      self["nominal.true"].constructor(Coercions::Params.method(:to_true))
     end
 
-    register('params.false') do
-      self['nominal.false'].constructor(Coercions::Params.method(:to_false))
+    register("params.false") do
+      self["nominal.false"].constructor(Coercions::Params.method(:to_false))
     end
 
-    register('params.bool') do
-      self['params.true'] | self['params.false']
+    register("params.bool") do
+      self["params.true"] | self["params.false"]
     end
 
-    register('params.integer') do
-      self['nominal.integer'].constructor(Coercions::Params.method(:to_int))
+    register("params.integer") do
+      self["nominal.integer"].constructor(Coercions::Params.method(:to_int))
     end
 
-    register('params.float') do
-      self['nominal.float'].constructor(Coercions::Params.method(:to_float))
+    register("params.float") do
+      self["nominal.float"].constructor(Coercions::Params.method(:to_float))
     end
 
-    register('params.decimal') do
-      self['nominal.decimal'].constructor(Coercions::Params.method(:to_decimal))
+    register("params.decimal") do
+      self["nominal.decimal"].constructor(Coercions::Params.method(:to_decimal))
     end
 
-    register('params.array') do
-      self['nominal.array'].constructor(Coercions::Params.method(:to_ary))
+    register("params.array") do
+      self["nominal.array"].constructor(Coercions::Params.method(:to_ary))
     end
 
-    register('params.hash') do
-      self['nominal.hash'].constructor(Coercions::Params.method(:to_hash))
+    register("params.hash") do
+      self["nominal.hash"].constructor(Coercions::Params.method(:to_hash))
     end
 
-    register('params.symbol') do
-      self['nominal.symbol'].constructor(Coercions::Params.method(:to_symbol))
+    register("params.symbol") do
+      self["nominal.symbol"].constructor(Coercions::Params.method(:to_symbol))
     end
 
+    register("params.string", self["string"])
+
     COERCIBLE.each_key do |name|
       next if name.equal?(:string)
 
-      register("optional.params.#{name}", self['params.nil'] | self["params.#{name}"])
+      register("optional.params.#{name}", self["params.nil"] | self["params.#{name}"])
     end
   end
 end