dry-types 1.7.2 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12b751a4799c67217dd1540dacc45a70ce51dab53441ec64e575f74a520e0eb6
-  data.tar.gz: e50e85513f68af8f0b98f5af707c2e82826c7daed237fba9ca014b96fc4e4754
+  metadata.gz: 506bb7b5eca44ddc06b248c28598dd58987cce24039e5991e7d659f41bed2235
+  data.tar.gz: 363581b2882f4cc03844b9e78e2211b3ff6af0304ac5b122e64d7ef5e4c39271
 SHA512:
-  metadata.gz: c7247fc6a64c97967a83de7613f298d25137c4d03ae9afa79929255cca792dcb6a9f7203f4cdefb942b662c7ec7a32d0386a005c8e6e19ecfa03d37d802d2877
-  data.tar.gz: 2a54fd10714b4a5a74e7026de501c9a74f4378890ed4e39f98f9b163eb23ebfd28d27d85165e18a68aa8603149df2c8d56eabef99f36d26c56f6e60676fa3e3b
+  metadata.gz: 70288750b129718df5082fd50a921250771c1c3d677ad673c0ca5a5f142b141ddd1804c25aeb8e7ec3fff59238ad12b8447eaa655cda6d5b79d499af7581bee9
+  data.tar.gz: 190559f11fc01b46dcd419607ca8ae707681aba95843c76132d63c0a78b7ebc4037ee331b59a04f9c771b81dc8956b41cb13473a8ce224eaca8311351ca9ac02

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
+## 1.8.0 2025-01-06
+
+
+### Added
+
+- Added `Enum#each_value` to iterate over enum values (@CharlieWWW94 in #471)
+
+### Fixed
+
+- Fixed `Default#try` to return correct result (@elcuervo + @flash-gordon in #475)
+
+### Changed
+
+- Set min Ruby version to 3.1 (@flash-gordon)
+- Better representation of Enum types (@flash-gordon, see #460)
+
+[Compare v1.7.2...v1.8.0](https://github.com/dry-rb/dry-types/compare/v1.7.2...v1.8.0)
+
 ## 1.7.2 2024-01-05
 
 

data/README.md

@@ -15,7 +15,7 @@
 
 This library officially supports the following Ruby versions:
 
-* MRI `>= 3.0`
+* MRI `>= 3.1`
 * jruby `>= 9.4` (not tested on CI)
 
 ## License

data/dry-types.gemspec

@@ -21,23 +21,19 @@ Gem::Specification.new do |spec|
   spec.executables   = []
   spec.require_paths = ["lib"]
 
-  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.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.metadata["rubygems_mfa_required"] = "true"
 
-  spec.required_ruby_version = ">= 3.0"
+  spec.required_ruby_version = ">= 3.1"
 
   # to update dependencies edit project.yml
-  spec.add_runtime_dependency "bigdecimal", "~> 3.0"
-  spec.add_runtime_dependency "concurrent-ruby", "~> 1.0"
-  spec.add_runtime_dependency "dry-core", "~> 1.0"
-  spec.add_runtime_dependency "dry-inflector", "~> 1.0"
-  spec.add_runtime_dependency "dry-logic", "~> 1.4"
-  spec.add_runtime_dependency "zeitwerk", "~> 2.6"
-
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "yard"
+  spec.add_dependency "bigdecimal", "~> 3.0"
+  spec.add_dependency "concurrent-ruby", "~> 1.0"
+  spec.add_dependency "dry-core", "~> 1.0"
+  spec.add_dependency "dry-inflector", "~> 1.0"
+  spec.add_dependency "dry-logic", "~> 1.4"
+  spec.add_dependency "zeitwerk", "~> 2.6"
 end

data/lib/dry/types/any.rb

@@ -9,9 +9,7 @@ module Dry
     #
     # @api public
     class AnyClass < Nominal
-      def self.name
-        "Any"
-      end
+      def self.name = "Any"
 
       # @api private
       def initialize(**options)
@@ -21,9 +19,7 @@ module Dry
       # @return [String]
       #
       # @api public
-      def name
-        "Any"
-      end
+      def name = "Any"
 
       # @param [Hash] new_options
       #
@@ -37,9 +33,7 @@ module Dry
       # @return [Array]
       #
       # @api public
-      def to_ast(meta: true)
-        [:any, meta ? self.meta : EMPTY_HASH]
-      end
+      def to_ast(meta: true) = [:any, meta ? self.meta : EMPTY_HASH]
     end
 
     Any = AnyClass.new

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

@@ -7,23 +7,17 @@ module Dry
       # @api private
       class Constructor < ::Dry::Types::Constructor
         # @api private
-        def constructor_type
-          ::Dry::Types::Array::Constructor
-        end
+        def constructor_type = ::Dry::Types::Array::Constructor
 
         # @return [Lax]
         #
         # @api public
-        def lax
-          Lax.new(type.lax.constructor(fn, meta: meta))
-        end
+        def lax = Lax.new(type.lax.constructor(fn, meta: meta))
 
         # @see Dry::Types::Array#of
         #
         # @api public
-        def of(member)
-          type.of(member).constructor(fn, meta: meta)
-        end
+        def of(member) = type.of(member).constructor(fn, meta: meta)
       end
     end
   end

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

@@ -113,9 +113,7 @@ module Dry
         end
 
         # @api private
-        def constructor_type
-          ::Dry::Types::Array::Constructor
-        end
+        def constructor_type = ::Dry::Types::Array::Constructor
       end
     end
   end

data/lib/dry/types/array.rb

@@ -16,7 +16,7 @@ module Dry
       def of(type)
         member =
           case type
-          when String then Types[type]
+          when ::String then Types[type]
           else type
           end
 

data/lib/dry/types/builder.rb

@@ -5,23 +5,18 @@ module Dry
     # Common API for building types and composition
     #
     # @api public
-    # rubocop:disable Metrics/ModuleLength
     module Builder
-      include Dry::Core::Constants
+      include ::Dry::Core::Constants
 
       # @return [Class]
       #
       # @api private
-      def constrained_type
-        Constrained
-      end
+      def constrained_type = Constrained
 
       # @return [Class]
       #
       # @api private
-      def constructor_type
-        Constructor
-      end
+      def constructor_type = Constructor
 
       # Compose two types into a Sum type
       #
@@ -30,9 +25,7 @@ module Dry
       # @return [Sum, Sum::Constrained]
       #
       # @api private
-      def |(other)
-        compose(other, Sum)
-      end
+      def |(other) = compose(other, Sum)
 
       # Compose two types into an Intersection type
       #
@@ -41,9 +34,7 @@ module Dry
       # @return [Intersection, Intersection::Constrained]
       #
       # @api private
-      def &(other)
-        compose(other, Intersection)
-      end
+      def &(other) = compose(other, Intersection)
 
       # Compose two types into an Implication type
       #
@@ -52,18 +43,14 @@ module Dry
       # @return [Implication, Implication::Constrained]
       #
       # @api private
-      def >(other)
-        compose(other, Implication)
-      end
+      def >(other) = compose(other, Implication)
 
       # Turn a type into an optional type
       #
       # @return [Sum]
       #
       # @api public
-      def optional
-        Types["nil"] | self
-      end
+      def optional = Types["nil"] | self
 
       # Turn a type into a constrained type
       #
@@ -72,8 +59,8 @@ module Dry
       # @return [Constrained]
       #
       # @api public
-      def constrained(options)
-        constrained_type.new(self, rule: Types.Rule(options))
+      def constrained(...)
+        constrained_type.new(self, rule: Types.Rule(...))
       end
 
       # Turn a type into a type with a default value
@@ -91,10 +78,10 @@ module Dry
         unless input.frozen? || options[:shared]
           where = Core::Deprecations::STACK.()
           Core::Deprecations.warn(
-            "#{input.inspect} is mutable."\
-            " Be careful: types will return the same instance of the default"\
-            " value every time. Call `.freeze` when setting the default"\
-            " or pass `shared: true` to discard this warning."\
+            "#{input.inspect} is mutable. " \
+            "Be careful: types will return the same instance of the default " \
+            "value every time. Call `.freeze` when setting the default " \
+            "or pass `shared: true` to discard this warning." \
             "\n#{where}",
             tag: :"dry-types"
           )
@@ -137,9 +124,7 @@ module Dry
       # @return [Lax]
       #
       # @api public
-      def lax
-        Lax.new(self)
-      end
+      def lax = Lax.new(self)
 
       # Define a constructor for the type
       #
@@ -182,16 +167,16 @@ module Dry
         unless value.frozen? || shared
           where = Core::Deprecations::STACK.()
           Core::Deprecations.warn(
-            "#{value.inspect} is mutable."\
-            " Be careful: types will return the same instance of the fallback"\
-            " value every time. Call `.freeze` when setting the fallback"\
-            " or pass `shared: true` to discard this warning."\
+            "#{value.inspect} is mutable. " \
+            "Be careful: types will return the same instance of the fallback " \
+            "value every time. Call `.freeze` when setting the fallback " \
+            "or pass `shared: true` to discard this warning." \
             "\n#{where}",
             tag: :"dry-types"
           )
         end
 
-        constructor do |input, type, &_block|
+        constructor do |input, type, &|
           type.(input) do |output = input|
             if block_given?
               yield(output)
@@ -216,6 +201,5 @@ module Dry
         klass.new(self, other)
       end
     end
-    # rubocop:enable Metrics/ModuleLength
   end
 end

data/lib/dry/types/builder_methods.rb

@@ -23,18 +23,14 @@ module Dry
       # @param [Dry::Types::Type] type
       #
       # @return [Dry::Types::Array]
-      def Array(type)
-        Strict(::Array).of(type)
-      end
+      def Array(type) = Strict(::Array).of(type)
 
       # Build a hash schema
       #
       # @param [Hash{Symbol => Dry::Types::Type}] type_map
       #
       # @return [Dry::Types::Array]
-      def Hash(type_map)
-        Strict(::Hash).schema(type_map)
-      end
+      def Hash(type_map) = Strict(::Hash).schema(type_map)
 
       # Build a type which values are instances of a given class
       # Values are checked using `is_a?` call
@@ -47,9 +43,7 @@ module Dry
       # @param [Class,Module] klass Class or module
       #
       # @return [Dry::Types::Type]
-      def Instance(klass)
-        Nominal(klass).constrained(type: klass)
-      end
+      def Instance(klass) = Nominal(klass).constrained(type: klass)
       alias_method :Strict, :Instance
 
       # Build a type with a single value
@@ -58,9 +52,7 @@ module Dry
       # @param [Object] value
       #
       # @return [Dry::Types::Type]
-      def Value(value)
-        Nominal(value.class).constrained(eql: value)
-      end
+      def Value(value) = Nominal(value.class).constrained(eql: value)
 
       # Build a type with a single value
       # The equality check done with `equal?`
@@ -68,9 +60,7 @@ module Dry
       # @param [Object] object
       #
       # @return [Dry::Types::Type]
-      def Constant(object)
-        Nominal(object.class).constrained(is: object)
-      end
+      def Constant(object) = Nominal(object.class).constrained(is: object)
 
       # Build a constructor type
       # If no constructor block given it uses .new method

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

@@ -21,7 +21,7 @@ module Dry
         # @raise CoercionError
         #
         # @api public
-        def self.to_nil(input, &_block)
+        def self.to_nil(input, &)
           if input.nil?
             nil
           elsif block_given?
@@ -38,13 +38,13 @@ module Dry
         # @raise CoercionError
         #
         # @api public
-        def self.to_decimal(input, &_block)
+        def self.to_decimal(input, &)
           if input.is_a?(::Float)
             input.to_d
           else
             BigDecimal(input)
           end
-        rescue ArgumentError, TypeError
+        rescue ::ArgumentError, ::TypeError
           if block_given?
             yield
           else

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

@@ -26,7 +26,7 @@ module Dry
         # @raise CoercionError
         #
         # @api public
-        def self.to_nil(input, &_block)
+        def self.to_nil(input, &)
           if input.nil? || empty_str?(input)
             nil
           elsif block_given?
@@ -46,7 +46,7 @@ module Dry
         # @raise CoercionError
         #
         # @api public
-        def self.to_true(input, &_block)
+        def self.to_true(input, &)
           BOOLEAN_MAP.fetch(input.to_s) do
             if block_given?
               yield
@@ -66,7 +66,7 @@ module Dry
         # @raise CoercionError
         #
         # @api public
-        def self.to_false(input, &_block)
+        def self.to_false(input, &)
           BOOLEAN_MAP.fetch(input.to_s) do
             if block_given?
               yield
@@ -83,14 +83,14 @@ module Dry
         # @raise CoercionError
         #
         # @api public
-        def self.to_int(input, &block)
-          if input.is_a? String
+        def self.to_int(input, &)
+          if input.is_a?(::String)
             Integer(input, 10)
           else
             Integer(input)
           end
-        rescue ArgumentError, TypeError => e
-          CoercionError.handle(e, &block)
+        rescue ::ArgumentError, ::TypeError => e
+          CoercionError.handle(e, &)
         end
 
         # @param [#to_f, Object] input
@@ -100,10 +100,10 @@ module Dry
         # @raise CoercionError
         #
         # @api public
-        def self.to_float(input, &block)
+        def self.to_float(input, &)
           Float(input)
-        rescue ArgumentError, TypeError => e
-          CoercionError.handle(e, &block)
+        rescue ::ArgumentError, ::TypeError => e
+          CoercionError.handle(e, &)
         end
 
         # @param [#to_d, Object] input
@@ -113,7 +113,7 @@ module Dry
         # @raise CoercionError
         #
         # @api public
-        def self.to_decimal(input, &_block)
+        def self.to_decimal(input, &)
           to_float(input) do
             if block_given?
               return yield
@@ -132,7 +132,7 @@ module Dry
         # @raise CoercionError
         #
         # @api public
-        def self.to_ary(input, &_block)
+        def self.to_ary(input, &)
           if empty_str?(input)
             []
           elsif input.is_a?(::Array)
@@ -151,7 +151,7 @@ module Dry
         # @raise CoercionError
         #
         # @api public
-        def self.to_hash(input, &_block)
+        def self.to_hash(input, &)
           if empty_str?(input)
             {}
           elsif input.is_a?(::Hash)

data/lib/dry/types/coercions.rb

@@ -15,12 +15,12 @@ module Dry
       # @see Date.parse
       #
       # @api public
-      def to_date(input, &block)
+      def to_date(input, &)
         if input.respond_to?(:to_str)
           begin
             ::Date.parse(input)
-          rescue ArgumentError, RangeError => e
-            CoercionError.handle(e, &block)
+          rescue ::ArgumentError, ::RangeError => e
+            CoercionError.handle(e, &)
           end
         elsif input.is_a?(::Date)
           input
@@ -38,12 +38,12 @@ module Dry
       # @see DateTime.parse
       #
       # @api public
-      def to_date_time(input, &block)
+      def to_date_time(input, &)
         if input.respond_to?(:to_str)
           begin
             ::DateTime.parse(input)
-          rescue ArgumentError => e
-            CoercionError.handle(e, &block)
+          rescue ::ArgumentError => e
+            CoercionError.handle(e, &)
           end
         elsif input.is_a?(::DateTime)
           input
@@ -61,12 +61,12 @@ module Dry
       # @see Time.parse
       #
       # @api public
-      def to_time(input, &block)
+      def to_time(input, &)
         if input.respond_to?(:to_str)
           begin
             ::Time.parse(input)
-          rescue ArgumentError => e
-            CoercionError.handle(e, &block)
+          rescue ::ArgumentError => e
+            CoercionError.handle(e, &)
           end
         elsif input.is_a?(::Time)
           input
@@ -84,10 +84,10 @@ module Dry
       # @raise CoercionError
       #
       # @api public
-      def to_symbol(input, &block)
+      def to_symbol(input, &)
         input.to_sym
-      rescue NoMethodError => e
-        CoercionError.handle(e, &block)
+      rescue ::NoMethodError => e
+        CoercionError.handle(e, &)
       end
 
       private
@@ -99,9 +99,7 @@ module Dry
       # @return [Boolean]
       #
       # @api private
-      def empty_str?(value)
-        EMPTY_STRING.eql?(value)
-      end
+      def empty_str?(value) = EMPTY_STRING.eql?(value)
     end
   end
 end

data/lib/dry/types/compiler.rb

@@ -12,9 +12,7 @@ module Dry
         @registry = registry
       end
 
-      def call(ast)
-        visit(ast)
-      end
+      def call(ast) = visit(ast)
 
       def visit(node)
         type, body = node
@@ -50,7 +48,7 @@ module Dry
       end
 
       def visit_rule(node)
-        Dry::Types.rule_compiler.([node])[0]
+        ::Dry::Types.rule_compiler.([node])[0]
       end
 
       def visit_sum(node)
@@ -60,7 +58,7 @@ module Dry
 
       def visit_array(node)
         member, meta = node
-        member = member.is_a?(Class) ? member : visit(member)
+        member = visit(member) unless member.is_a?(::Class)
         registry["nominal.array"].of(member).meta(meta)
       end
 
@@ -118,14 +116,14 @@ module Dry
 
         case type
         when :id
-          Dry::Types::FnContainer[node.fetch(0)]
+          ::Dry::Types::FnContainer[node.fetch(0)]
         when :callable
           node.fetch(0)
         when :method
           target, method = node
           target.method(method)
         else
-          raise ArgumentError, "Cannot build callable from #{fn.inspect}"
+          raise ::ArgumentError, "Cannot build callable from #{fn.inspect}"
         end
       end
     end