dry-initializer 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49644712268c1c8896eb7b9d067d5f3abf65789330d465f0acad780a4f50644e
-  data.tar.gz: 102ef164a75b9d4849400753a21046d5753217806de6c8963476ef8fafeb780d
+  metadata.gz: be50d677121c471c7921e3ad842921e172fa29bef381290012a0f2a4a11980d9
+  data.tar.gz: 02cb06be56f166c3eacec5f29ecef2589611123467c23eccd912e44632b50f57
 SHA512:
-  metadata.gz: '07780a5de808586056b92a3b9a2f1169f5fea4d7879abd1080fc27a7e6123b22d2a07878e9ca9203995c9f01c3e5a47b030b5dc7004d67a4a540413aabdb5890'
-  data.tar.gz: e352bf6de1a4aae2cf183be62ef4f64a4c70daf0f329122b0d6cd00a7e6081767aa745e938ae4464e52d322bfb08ce943a3312b4f92e02d87c1b968edf0498c4
+  metadata.gz: 83c2f86f9a06c429cd53c4452e200ac85e889ca536140fa83fbeb488e11317d1c0f4585903542d865be713cd44f86a38b1647de096994ae801afa8fed912d117
+  data.tar.gz: 8af84416c708e34373d30810f8e04ca4249f0ee6f2ccff6d49dd4a4477112354370c71ce5263dc5c1ff276b107617156377ae186a9ffc53a453753f154695b7b

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
+## 3.2.0 2025-01-01
+
+
+### Changed
+
+- Set minimal supported Ruby version to 3.1 (@flash-gordon)
+- Exclude block forwarding from `Root#initialize`. This helps
+with tracking down calls that shouldn't pass a block in Ruby 3.4 (see #109) (@flash-gordon)
+
+
+[Compare v3.1.1...v3.2.0](https://github.com/dry-rb/dry-initializer/compare/v3.1.1...v3.2.0)
+
+## 3.1.1 2022-01-19
+
+
+### Changed
+
+- Improved error messages were rolled back, they created an implicit dependency on dry-types (@flash-gordon)
+
+[Compare v3.1.0...v3.1.1](https://github.com/dry-rb/dry-initializer/compare/v3.1.0...v3.1.1)
+
 ## 3.1.0 2022-01-16
 
 

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2021 dry-rb team
+Copyright (c) 2015-2025 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,29 +1,21 @@
 <!--- this file is synced from dry-rb/template-gem project -->
 [gem]: https://rubygems.org/gems/dry-initializer
 [actions]: https://github.com/dry-rb/dry-initializer/actions
-[codacy]: https://www.codacy.com/gh/dry-rb/dry-initializer
-[chat]: https://dry-rb.zulipchat.com
-[inchpages]: http://inch-ci.org/github/dry-rb/dry-initializer
 
-# dry-initializer [![Join the chat at https://dry-rb.zulipchat.com](https://img.shields.io/badge/dry--rb-join%20chat-%23346b7a.svg)][chat]
-
-[![Gem Version](https://badge.fury.io/rb/dry-initializer.svg)][gem]
-[![CI Status](https://github.com/dry-rb/dry-initializer/workflows/ci/badge.svg)][actions]
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/03c8923afd734e9fb0f4bfe9cc893edb)][codacy]
-[![Codacy Badge](https://api.codacy.com/project/badge/Coverage/03c8923afd734e9fb0f4bfe9cc893edb)][codacy]
-[![Inline docs](http://inch-ci.org/github/dry-rb/dry-initializer.svg?branch=master)][inchpages]
+# dry-initializer [![Gem Version](https://badge.fury.io/rb/dry-initializer.svg)][gem] [![CI Status](https://github.com/dry-rb/dry-initializer/workflows/ci/badge.svg)][actions]
 
 ## Links
 
 * [User documentation](https://dry-rb.org/gems/dry-initializer)
 * [API documentation](http://rubydoc.info/gems/dry-initializer)
+* [Forum](https://discourse.dry-rb.org)
 
 ## Supported Ruby versions
 
 This library officially supports the following Ruby versions:
 
-* MRI `>= 2.7.0`
-* jruby `>= 9.3` (postponed until 2.7 is supported)
+* MRI `>= 3.1.0`
+* jruby `>= 9.4` (not tested on CI)
 
 ## License
 

data/dry-initializer.gemspec

@@ -22,11 +22,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
-  spec.metadata["changelog_uri"]     = "https://github.com/dry-rb/dry-initializer/blob/master/CHANGELOG.md"
+  spec.metadata["changelog_uri"]     = "https://github.com/dry-rb/dry-initializer/blob/main/CHANGELOG.md"
   spec.metadata["source_code_uri"]   = "https://github.com/dry-rb/dry-initializer"
   spec.metadata["bug_tracker_uri"]   = "https://github.com/dry-rb/dry-initializer/issues"
 
-  spec.required_ruby_version = ">= 2.7.0"
+  spec.required_ruby_version = ">= 3.1.0"
 
   # to update dependencies edit project.yml
 

data/lib/dry/initializer/builders/attribute.rb

@@ -53,7 +53,7 @@ module Dry
 
         def required_reader
           "#{@val} = #{@opts}.fetch(:'#{@source}')" \
-          " { raise KeyError, \"\#{self.class}: #{@definition} is required\" }"
+            " { raise KeyError, \"\#{self.class}: #{@definition} is required\" }"
         end
 
         def definition_line
@@ -72,23 +72,17 @@ module Dry
           return unless @type
 
           arity = @type.is_a?(Proc) ? @type.arity : @type.method(:call).arity
-          type_call_params = \
-            arity.equal?(1) || arity.negative? ? @val : "#{@val}, self"
-
-          <<-COERCE
-            begin
-              unless #{@null} == #{@val}
-                #{@val} = #{@item}.type.call(#{type_call_params})
-              end
-            rescue Dry::Types::ConstraintError => e
-              raise Dry::Initializer::CoercionError.new(e, '#{@source}')
-            end
-          COERCE
+
+          if arity.equal?(1) || arity.negative?
+            "#{@val} = #{@item}.type.call(#{@val}) unless #{@null} == #{@val}"
+          else
+            "#{@val} = #{@item}.type.call(#{@val}, self) unless #{@null} == #{@val}"
+          end
         end
 
         def assignment_line
           "#{@ivar} = #{@val}" \
-          " unless #{@null} == #{@val} && instance_variable_defined?(:#{@ivar})"
+            " unless #{@null} == #{@val} && instance_variable_defined?(:#{@ivar})"
         end
       end
     end

data/lib/dry/initializer/builders/initializer.rb

@@ -35,7 +35,7 @@ module Dry
 
         def undef_line
           "undef :__dry_initializer_initialize__" \
-          " if private_method_defined? :__dry_initializer_initialize__"
+            " if private_method_defined? :__dry_initializer_initialize__"
         end
 
         def define_line

data/lib/dry/initializer/builders/reader.rb

@@ -28,8 +28,8 @@ module Dry
 
         def undef_line
           "undef :#{@target} if method_defined?(:#{@target})" \
-          "  || private_method_defined?(:#{@target})" \
-          "  || protected_method_defined?(:#{@target})"
+            "  || private_method_defined?(:#{@target})" \
+            "  || protected_method_defined?(:#{@target})"
         end
 
         def attribute_line

data/lib/dry/initializer/config.rb

@@ -109,7 +109,7 @@ module Dry
       def finalize
         @definitions = final_definitions
         check_order_of_params
-        mixin.class_eval(code)
+        mixin.class_eval(code, "#{__FILE__}:#{__LINE__} class_eval")
         children.each(&:finalize)
         self
       end
@@ -140,11 +140,11 @@ module Dry
       def add_definition(option, name, type, block, **opts)
         opts = {
           parent: extended_class,
-          option: option,
-          null: null,
+          option:,
+          null:,
           source: name,
-          type: type,
-          block: block,
+          type:,
+          block:,
           **opts
         }
 
@@ -177,7 +177,7 @@ module Dry
             current
           elsif optional
             raise SyntaxError, "#{extended_class}: required #{current}" \
-                              " goes after optional #{optional}"
+                               " goes after optional #{optional}"
           else
             optional
           end

data/lib/dry/initializer/definition.rb

@@ -18,11 +18,11 @@ module Dry
       def options
         {
           as: target,
-          type: type,
-          optional: optional,
-          default: default,
-          reader: reader,
-          desc: desc
+          type:,
+          optional:,
+          default:,
+          reader:,
+          desc:
         }.compact
       end
 

data/lib/dry/initializer/dispatchers/build_nested_type.rb

@@ -19,7 +19,7 @@ module Dry
           check_certainty!(source, type, block)
           check_name!(target, block)
           type ||= build_nested_type(parent, target, block)
-          {parent: parent, source: source, target: target, type: type, **options}
+          {parent:, source:, target:, type:, **options}
         end
         # rubocop: enable Metrics/ParameterLists
 
@@ -58,7 +58,6 @@ module Dry
 
         def build_struct(klass_name, block)
           # rubocop: disable Security/Eval
-          # rubocop: disable Style/DocumentDynamicEvalDefinition
           eval <<~RUBY, TOPLEVEL_BINDING, __FILE__, __LINE__ + 1
             class #{klass_name} < Dry::Initializer::Struct
             end

data/lib/dry/initializer/dispatchers/check_type.rb

@@ -12,7 +12,7 @@ module Dry
           check_if_callable! source, type
           check_arity! source, type, wrap
 
-          {source: source, type: type, wrap: wrap, **options}
+          {source:, type:, wrap:, **options}
         end
 
         private

data/lib/dry/initializer/dispatchers/prepare_default.rb

@@ -14,7 +14,7 @@ module Dry
           default = callable! default
           check_arity! default
 
-          {default: default, optional: (optional | default), **options}
+          {default:, optional: (optional | default), **options}
         end
 
         private
@@ -38,8 +38,8 @@ module Dry
 
         def invalid!(default)
           raise TypeError, "The #{default.inspect} should be" \
-                          " either convertable to proc with no arguments," \
-                          " or respond to #call without arguments."
+                           " either convertable to proc with no arguments," \
+                           " or respond to #call without arguments."
         end
       end
     end

data/lib/dry/initializer/dispatchers/prepare_ivar.rb

@@ -11,7 +11,7 @@ module Dry
         def call(target:, **options)
           ivar = "@#{target}".delete("?").to_sym
 
-          {target: target, ivar: ivar, **options}
+          {target:, ivar:, **options}
         end
       end
     end

data/lib/dry/initializer/dispatchers/prepare_optional.rb

@@ -12,7 +12,7 @@ module Dry
           optional ||= default
           optional &&= !required
 
-          {optional: !!optional, default: default, **options}
+          {optional: !!optional, default:, **options}
         end
       end
     end

data/lib/dry/initializer/dispatchers/prepare_reader.rb

@@ -16,7 +16,7 @@ module Dry
                    else invalid_reader!(target, reader)
                    end
 
-          {target: target, reader: reader, **options}
+          {target:, reader:, **options}
         end
 
         private

data/lib/dry/initializer/dispatchers/prepare_target.rb

@@ -27,7 +27,7 @@ module Dry
           check_ruby_name!(target)
           check_reserved_names!(target)
 
-          {source: source, target: target, **options}
+          {source:, target:, **options}
         end
 
         private

data/lib/dry/initializer/dispatchers/unwrap_type.rb

@@ -15,7 +15,7 @@ module Dry
         def call(type: nil, wrap: 0, **options)
           type, count = unwrap(type, wrap)
 
-          {type: type, wrap: count, **options}
+          {type:, wrap: count, **options}
         end
 
         private

data/lib/dry/initializer/dispatchers.rb

@@ -9,7 +9,7 @@
 # - `:source`   -- the name of source option
 # - `:target`   -- the target name of the reader
 # - `:reader`   -- if the reader's privacy (:public, :protected, :private, nil)
-# - `:ivar`     -- the target nane of the variable
+# - `:ivar`     -- the target name of the variable
 # - `:type`     -- the callable coercer of the source value
 # - `:optional` -- if the argument is optional
 # - `:default`  -- the proc returning the default value of the source value
@@ -88,7 +88,7 @@ module Dry
       # @return [Hash<Symbol, Objct>] normalized set of options
       #
       def call(**options)
-        options = {null: null, **options}
+        options = {null:, **options}
         pipeline.reduce(options) { |opts, dispatcher| dispatcher.call(**opts) }
       end
 

data/lib/dry/initializer/dsl.rb

@@ -25,8 +25,8 @@ module Dry
       # @return [Module]
       # @yield proc defining params and options
       def define(procedure = nil, &block)
-        config = Config.new(null: null)
-        config.instance_exec(&(procedure || block))
+        config = Config.new(null:)
+        config.instance_exec(&procedure || block)
         config.mixin.include Mixin::Root
         config.mixin
       end
@@ -34,7 +34,7 @@ module Dry
       private
 
       def extended(klass)
-        config = Config.new(klass, null: null)
+        config = Config.new(klass, null:)
         klass.send :instance_variable_set, :@dry_initializer, config
         klass.include Mixin::Root
       end

data/lib/dry/initializer/mixin/root.rb

@@ -7,8 +7,8 @@ module Dry
       module Root
         private
 
-        def initialize(...)
-          __dry_initializer_initialize__(...)
+        def initialize(*args, **kwargs)
+          __dry_initializer_initialize__(*args, **kwargs)
         end
       end
     end

data/lib/dry/initializer/mixin.rb

@@ -9,7 +9,7 @@ module Dry
       # @deprecated
       def self.extended(klass)
         warn "[DEPRECATED] Use Dry::Initializer instead of its alias" \
-            " Dry::Initializer::Mixin. The later will be removed in v2.1.0"
+             " Dry::Initializer::Mixin. The later will be removed in v2.1.0"
         super
       end
 

data/lib/dry/initializer/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Initializer
-    VERSION = "3.1.0"
+    VERSION = "3.2.0"
   end
 end

data/lib/dry/initializer.rb

@@ -15,7 +15,6 @@ module Dry
     require_relative "initializer/config"
     require_relative "initializer/mixin"
     require_relative "initializer/dispatchers"
-    require_relative "initializer/errors"
 
     # Adds methods [.[]] and [.define]
     extend DSL

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: dry-initializer
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Vladimir Kochnev (marshall-lee)
 - Andrew Kozin (nepalez)
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-16 00:00:00.000000000 Z
+date: 2025-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -71,7 +71,6 @@ files:
 - lib/dry/initializer/dispatchers/unwrap_type.rb
 - lib/dry/initializer/dispatchers/wrap_type.rb
 - lib/dry/initializer/dsl.rb
-- lib/dry/initializer/errors.rb
 - lib/dry/initializer/mixin.rb
 - lib/dry/initializer/mixin/local.rb
 - lib/dry/initializer/mixin/root.rb
@@ -85,10 +84,10 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-  changelog_uri: https://github.com/dry-rb/dry-initializer/blob/master/CHANGELOG.md
+  changelog_uri: https://github.com/dry-rb/dry-initializer/blob/main/CHANGELOG.md
   source_code_uri: https://github.com/dry-rb/dry-initializer
   bug_tracker_uri: https://github.com/dry-rb/dry-initializer/issues
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -96,15 +95,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.27
+signing_key:
 specification_version: 4
 summary: DSL for declaring params and options of the initializer
 test_files: []

data/lib/dry/initializer/errors.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-module Dry
-  module Initializer
-    class CoercionError < ::StandardError
-      def initialize(constraint_error, field)
-        @constraint_error = constraint_error
-        @field = field
-        super(message)
-      end
-
-      # Ensure that the field name is in the error message
-      def message
-        if @constraint_error.message =~ /#{@field}/
-          @constraint_error.message
-        else
-          "#{@constraint_error.message} for field :#{@field}"
-        end
-      end
-    end
-  end
-end