dry-types 1.7.2 → 1.8.1

data/lib/dry/types/nominal.rb

@@ -48,48 +48,36 @@ module Dry
       # @return [String]
       #
       # @api public
-      def name
-        primitive.name
-      end
+      def name = primitive.name
 
       # @return [false]
       #
       # @api public
-      def default?
-        false
-      end
+      def default? = false
 
       # @return [false]
       #
       # @api public
-      def constrained?
-        false
-      end
+      def constrained? = false
 
       # @return [false]
       #
       # @api public
-      def optional?
-        false
-      end
+      def optional? = false
 
       # @param [BasicObject] input
       #
       # @return [BasicObject]
       #
       # @api private
-      def call_unsafe(input)
-        input
-      end
+      def call_unsafe(input) = input
 
       # @param [BasicObject] input
       #
       # @return [BasicObject]
       #
       # @api private
-      def call_safe(input)
-        input
-      end
+      def call_safe(input, &) = input
 
       # @param [Object] input
       #
@@ -100,18 +88,14 @@ module Dry
       # @return [nil] otherwise
       #
       # @api public
-      def try(input)
-        success(input)
-      end
+      def try(input, &) = success(input)
 
       # @param (see Dry::Types::Success#initialize)
       #
       # @return [Result::Success]
       #
       # @api public
-      def success(input)
-        Result::Success.new(input)
-      end
+      def success(input) = Result::Success.new(input)
 
       # @param (see Failure#initialize)
       #
@@ -119,7 +103,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
@@ -131,12 +115,10 @@ module Dry
       # @return [Boolean]
       #
       # @api public
-      def primitive?(value)
-        value.is_a?(primitive)
-      end
+      def primitive?(value) = value.is_a?(primitive)
 
       # @api private
-      def coerce(input, &_block)
+      def coerce(input, &)
         if primitive?(input)
           input
         elsif block_given?
@@ -178,18 +160,14 @@ module Dry
       # @return [Nominal]
       #
       # @api public
-      def lax
-        self
-      end
+      def lax = self
 
       # Wrap the type with a proc
       #
       # @return [Proc]
       #
       # @api public
-      def to_proc
-        ALWAYS
-      end
+      def to_proc = ALWAYS
     end
 
     extend ::Dry::Core::Deprecations[:"dry-types"]

data/lib/dry/types/predicate_inferrer.rb

@@ -137,7 +137,7 @@ module Dry
           left = visit(left_node)
           right = visit(right_node)
 
-          if left.eql?(NIL)
+          if left.eql?(NIL) # rubocop:disable Lint/DeprecatedConstants
             right
           else
             [[left, right]]
@@ -157,9 +157,7 @@ module Dry
         end
 
         # @api private
-        def visit_any(_)
-          EMPTY_ARRAY
-        end
+        def visit_any(_) = EMPTY_ARRAY
 
         # @api private
         def visit_and(node)
@@ -187,7 +185,7 @@ module Dry
 
         # @api private
         def visit_map(_node)
-          raise NotImplementedError, "map types are not supported yet"
+          raise ::NotImplementedError, "map types are not supported yet"
         end
 
         private

data/lib/dry/types/predicate_registry.rb

@@ -26,9 +26,7 @@ module Dry
       end
 
       # @api private
-      def [](name)
-        predicates[name]
-      end
+      def [](name) = predicates[name]
     end
   end
 end

data/lib/dry/types/primitive_inferrer.rb

@@ -25,20 +25,14 @@ module Dry
         end
 
         # @api private
-        def visit_hash(_)
-          ::Hash
-        end
+        def visit_hash(_) = ::Hash
         alias_method :visit_schema, :visit_hash
 
         # @api private
-        def visit_array(_)
-          ::Array
-        end
+        def visit_array(_) = ::Array
 
         # @api private
-        def visit_lax(node)
-          visit(node)
-        end
+        def visit_lax(node) = visit(node)
 
         # @api private
         def visit_constructor(node)
@@ -66,9 +60,7 @@ module Dry
         end
 
         # @api private
-        def visit_any(_)
-          ::Object
-        end
+        def visit_any(_) = ::Object
       end
 
       # @return [Compiler]

data/lib/dry/types/printable.rb

@@ -7,9 +7,7 @@ module Dry
       # @return [String]
       #
       # @api private
-      def to_s
-        PRINTER.(self) { super }
-      end
+      def to_s = PRINTER.(self)
       alias_method :inspect, :to_s
     end
   end

data/lib/dry/types/printer/composition.rb

@@ -30,12 +30,12 @@ module Dry
           end
         end
 
-        def visit_constructor(type, &block)
+        def visit_constructor(type, &)
           case type
           when @composition_class
-            visit_constructors(type, &block)
+            visit_constructors(type, &)
           else
-            @printer.visit(type, &block)
+            @printer.visit(type, &)
           end
         end
       end

data/lib/dry/types/printer.rb

@@ -46,7 +46,7 @@ module Dry
         "#<Dry::Types[#{output}]>"
       end
 
-      def visit(type, &block)
+      def visit(type, &)
         print_with = MAPPING.fetch(type.class) do
           if type.class < Constructor
             :visit_constructor
@@ -56,12 +56,10 @@ module Dry
             raise ArgumentError, "Do not know how to print #{type.class}"
           end
         end
-        send(print_with, type, &block)
+        send(print_with, type, &)
       end
 
-      def visit_any(_)
-        yield "Any"
-      end
+      def visit_any(_) = yield "Any"
 
       def visit_array(type)
         visit_options(EMPTY_HASH, type.meta) do |opts|
@@ -101,10 +99,10 @@ module Dry
         end
       end
 
-      def visit_composition(composition, &block)
+      def visit_composition(composition, &)
         klass = composition.class
         @composition_printers[klass] = Composition.new(self, klass)
-        @composition_printers[klass].visit(composition, &block)
+        @composition_printers[klass].visit(composition, &)
       end
 
       def visit_enum(enum)
@@ -114,8 +112,7 @@ module Dry
 
           visit_options(options) do |opts|
             if mapping == enum.inverted_mapping
-              values = mapping.values.map(&:inspect).join(", ")
-              yield "Enum<#{type} values={#{values}}#{opts}>"
+              yield "Enum(#{enum.joined_values})<#{type}#{opts}>"
             else
               mapping_str = mapping.map { |key, value|
                 "#{key.inspect}=>#{value.inspect}"

data/lib/dry/types/result.rb

@@ -25,16 +25,12 @@ module Dry
         # @return [true]
         #
         # @api public
-        def success?
-          true
-        end
+        def success? = true
 
         # @return [false]
         #
         # @api public
-        def failure?
-          false
-        end
+        def failure? = false
       end
 
       # Failure result
@@ -59,23 +55,17 @@ module Dry
         # @return [String]
         #
         # @api private
-        def to_s
-          error.to_s
-        end
+        def to_s = error.to_s
 
         # @return [false]
         #
         # @api public
-        def success?
-          false
-        end
+        def success? = false
 
         # @return [true]
         #
         # @api public
-        def failure?
-          true
-        end
+        def failure? = true
       end
     end
   end

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

@@ -29,38 +29,31 @@ module Dry
           end
 
           unless name.is_a?(::Symbol)
-            raise ArgumentError, "Schemas can only contain symbol keys, #{name.inspect} given"
+            raise ::ArgumentError,
+                  "Schemas can only contain symbol keys, #{name.inspect} given"
           end
 
-          super(type, name, required: required, **options)
+          super
           @name = name
         end
 
         # @api private
-        def call_safe(input, &block)
-          type.call_safe(input, &block)
-        end
+        def call_safe(input, &) = type.call_safe(input, &)
 
         # @api private
-        def call_unsafe(input)
-          type.call_unsafe(input)
-        end
+        def call_unsafe(input) = type.call_unsafe(input)
 
         # @see Dry::Types::Nominal#try
         #
         # @api public
-        def try(input, &block)
-          type.try(input, &block)
-        end
+        def try(input, &) = type.try(input, &)
 
         # Whether the key is required in schema input
         #
         # @return [Boolean]
         #
         # @api public
-        def required?
-          options.fetch(:required)
-        end
+        def required? = options.fetch(:required)
 
         # Control whether the key is required
         #
@@ -87,27 +80,21 @@ module Dry
         # @return [Dry::Types::Schema::Key]
         #
         # @api public
-        def omittable
-          required(false)
-        end
+        def omittable = required(false)
 
         # Turn key into a lax type. Lax types are not strict hence such keys are not required
         #
         # @return [Lax]
         #
         # @api public
-        def lax
-          __new__(type.lax).required(false)
-        end
+        def lax = __new__(type.lax).required(false)
 
         # Make wrapped type optional
         #
         # @return [Key]
         #
         # @api public
-        def optional
-          __new__(type.optional)
-        end
+        def optional = __new__(type.optional)
 
         # Dump to internal AST representation
         #
@@ -144,9 +131,7 @@ module Dry
         private
 
         # @api private
-        def decorate?(response)
-          response.is_a?(Type)
-        end
+        def decorate?(response) = response.is_a?(Type)
       end
     end
   end

data/lib/dry/types/schema.rb

@@ -17,8 +17,8 @@ module Dry
     #
     # @api public
     class Schema < Hash
-      NO_TRANSFORM = Dry::Types::FnContainer.register { |x| x }
-      SYMBOLIZE_KEY = Dry::Types::FnContainer.register(:to_sym.to_proc)
+      NO_TRANSFORM = ::Dry::Types::FnContainer.register { |x| x }
+      SYMBOLIZE_KEY = ::Dry::Types::FnContainer.register(:to_sym.to_proc)
 
       include ::Enumerable
 
@@ -46,7 +46,7 @@ module Dry
 
         key_fn = options.fetch(:key_transform_fn, NO_TRANSFORM)
 
-        @transform_key = Dry::Types::FnContainer[key_fn]
+        @transform_key = ::Dry::Types::FnContainer[key_fn]
 
         super
       end
@@ -77,9 +77,7 @@ module Dry
       # @return [Hash{Symbol => Object}]
       #
       # @api public
-      def apply(hash, options = EMPTY_HASH)
-        call_unsafe(hash, options)
-      end
+      def apply(hash, options = EMPTY_HASH) = call_unsafe(hash, options)
 
       # @param input [Hash] hash
       #
@@ -184,9 +182,9 @@ module Dry
       def with_key_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)
+        handle = ::Dry::Types::FnContainer.register(fn)
         with(key_transform_fn: handle)
       end
 
@@ -226,8 +224,8 @@ module Dry
       # @return [Array<Dry::Types::Schema::Key>,Enumerator]
       #
       # @api public
-      def each(&block)
-        keys.each(&block)
+      def each(&)
+        keys.each(&)
       end
 
       # Whether the schema has the given key
@@ -256,9 +254,9 @@ module Dry
       #   @return [Dry::Types::Schema::Key,Object] key type or block value if key is not in schema
       #
       # @api public
-      def key(name, fallback = Undefined, &block)
+      def key(name, fallback = Undefined, &)
         if Undefined.equal?(fallback)
-          name_key_map.fetch(name, &block)
+          name_key_map.fetch(name, &)
         else
           name_key_map.fetch(name, fallback)
         end

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

@@ -31,7 +31,7 @@ RSpec.shared_examples_for "Dry::Types::Nominal without primitive" do
 
   describe "#==" do
     it "has #== defined" do
-      expect(type).to eq(type)
+      expect(type).to eql(type)
     end
   end
 
@@ -74,7 +74,7 @@ RSpec.shared_examples_for "Dry::Types::Nominal#meta" do
     end
 
     it "is locally immutable" do
-      expect(type.meta).to be_a ::Hash
+      expect(type.meta).to be_a Hash
       expect(type.meta).to be_frozen
       expect(type.meta).not_to have_key :immutable_test
       derived = type.meta(immutable_test: 1)

data/lib/dry/types/sum.rb

@@ -8,16 +8,12 @@ module Dry
     class Sum
       include Composition
 
-      def self.operator
-        :|
-      end
+      def self.operator = :|
 
       # @return [Boolean]
       #
       # @api public
-      def optional?
-        primitive?(nil)
-      end
+      def optional? = primitive?(nil)
 
       # @param [Object] input
       #
@@ -33,8 +29,8 @@ module Dry
       # @return [Object]
       #
       # @api private
-      def call_safe(input, &block)
-        left.call_safe(input) { right.call_safe(input, &block) }
+      def call_safe(input, &)
+        left.call_safe(input) { right.call_safe(input, &) }
       end
 
       # @param [Object] input
@@ -84,9 +80,9 @@ module Dry
       # @see Builder#constrained
       #
       # @api public
-      def constrained(options)
+      def constrained(...)
         if optional?
-          right.constrained(options).optional
+          right.constrained(...).optional
         else
           super
         end

data/lib/dry/types/type.rb

@@ -40,9 +40,9 @@ module Dry
       #   @return [Object]
       #
       # @api public
-      def call(input = Undefined, &block)
+      def call(input = Undefined, &)
         if block_given?
-          call_safe(input, &block)
+          call_safe(input, &)
         else
           call_unsafe(input)
         end

data/lib/dry/types/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Types
-    VERSION = "1.7.2"
+    VERSION = "1.8.1"
   end
 end

data/lib/dry/types.rb

@@ -165,8 +165,8 @@ module Dry
 
       if container.keys.any? { |key| key.split(".")[0] == underscored }
         raise ::NameError,
-              "dry-types does not define constants for default types. "\
-              'You can access the predefined types with [], e.g. Dry::Types["integer"] '\
+              "dry-types does not define constants for default types. " \
+              "You can access the predefined types with [], e.g. Dry::Types['integer'] " \
               "or generate a module with types using Dry.Types()"
       else
         super

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-types
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.8.1
 platform: ruby
 authors:
 - Piotr Solnica
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-05 00:00:00.000000000 Z
+date: 2025-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bigdecimal
@@ -94,62 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Type system for Ruby supporting coercions, constraints and complex types
   like structs, value objects, enums etc
 email:
@@ -226,7 +170,8 @@ metadata:
   changelog_uri: https://github.com/dry-rb/dry-types/blob/main/CHANGELOG.md
   source_code_uri: https://github.com/dry-rb/dry-types
   bug_tracker_uri: https://github.com/dry-rb/dry-types/issues
-post_install_message: 
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -234,15 +179,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key: 
+rubygems_version: 3.3.27
+signing_key:
 specification_version: 4
 summary: Type system for Ruby supporting coercions, constraints and complex types
   like structs, value objects, enums etc