dry-initializer 3.0.4 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d1722e29cdab2ffcf349bc159451afb795aa399c91e0ebae2296318a5b3b166
-  data.tar.gz: 4e6a589a9898e6701dcadbd321d78041da27e58f783bfbfa566d828134f6c081
+  metadata.gz: 49644712268c1c8896eb7b9d067d5f3abf65789330d465f0acad780a4f50644e
+  data.tar.gz: 102ef164a75b9d4849400753a21046d5753217806de6c8963476ef8fafeb780d
 SHA512:
-  metadata.gz: 66596268197d4fc509eb9cc5dfd738af4d3d4f6c33a861cc4877328817d7a28155de3987c8df3b6fdc868bfec346a3e8dd67891f702ead9e47142c756ad306bf
-  data.tar.gz: c4f91414ec4798759ed48b783974f922d598c01e613116c8fd077ed3c886a376c0ba260928ef3788ff0f7984cdc086cc03d3404052a97f2cb8c1658c7913cc69
+  metadata.gz: '07780a5de808586056b92a3b9a2f1169f5fea4d7879abd1080fc27a7e6123b22d2a07878e9ca9203995c9f01c3e5a47b030b5dc7004d67a4a540413aabdb5890'
+  data.tar.gz: e352bf6de1a4aae2cf183be62ef4f64a4c70daf0f329122b0d6cd00a7e6081767aa745e938ae4464e52d322bfb08ce943a3312b4f92e02d87c1b968edf0498c4

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+<!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
+
+## 3.1.0 2022-01-16
+
+
+### Changed
+
+- Improved error messages on type mismatch (@swerling)
+- [BREAKING] Minimal supported Ruby version is 2.7 (@flash-gordon)
+
+[Compare v3.0.4...v3.1.0](https://github.com/dry-rb/dry-initializer/compare/v3.0.4...v3.1.0)
+
 ## 3.0.4 2020-09-29
 
 

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2020 dry-rb team
+Copyright (c) 2015-2021 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,3 +1,4 @@
+<!--- 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
@@ -14,15 +15,15 @@
 
 ## Links
 
-* [User documentation](http://dry-rb.org/gems/dry-initializer)
+* [User documentation](https://dry-rb.org/gems/dry-initializer)
 * [API documentation](http://rubydoc.info/gems/dry-initializer)
 
 ## Supported Ruby versions
 
 This library officially supports the following Ruby versions:
 
-* MRI >= `2.4`
-* jruby >= `9.2`
+* MRI `>= 2.7.0`
+* jruby `>= 9.3` (postponed until 2.7 is supported)
 
 ## License
 

data/dry-initializer.gemspec

@@ -1,33 +1,35 @@
 # frozen_string_literal: true
-# this file is managed by dry-rb/devtools project
 
-lib = File.expand_path('lib', __dir__)
+# this file is synced from dry-rb/template-gem project
+
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'dry/initializer/version'
+require "dry/initializer/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'dry-initializer'
+  spec.name          = "dry-initializer"
   spec.authors       = ["Vladimir Kochnev (marshall-lee)", "Andrew Kozin (nepalez)"]
   spec.email         = ["andrew.kozin@gmail.com"]
-  spec.license       = 'MIT'
+  spec.license       = "MIT"
   spec.version       = Dry::Initializer::VERSION.dup
 
   spec.summary       = "DSL for declaring params and options of the initializer"
   spec.description   = spec.summary
-  spec.homepage      = 'https://dry-rb.org/gems/dry-initializer'
+  spec.homepage      = "https://dry-rb.org/gems/dry-initializer"
   spec.files         = Dir["CHANGELOG.md", "LICENSE", "README.md", "dry-initializer.gemspec", "lib/**/*"]
-  spec.bindir        = 'bin'
+  spec.bindir        = "bin"
   spec.executables   = []
-  spec.require_paths = ['lib']
+  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['source_code_uri']   = 'https://github.com/dry-rb/dry-initializer'
-  spec.metadata['bug_tracker_uri']   = 'https://github.com/dry-rb/dry-initializer/issues'
+  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["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.4.0"
+  spec.required_ruby_version = ">= 2.7.0"
 
   # to update dependencies edit project.yml
+
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
 end

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

@@ -1,86 +1,96 @@
-module Dry::Initializer::Builders
-  # @private
-  class Attribute
-    def self.[](definition)
-      new(definition).call
-    end
-
-    def call
-      lines.compact
-    end
-
-    private
-
-    # rubocop: disable Metrics/MethodLength
-    def initialize(definition)
-      @definition = definition
-      @option     = definition.option
-      @type       = definition.type
-      @optional   = definition.optional
-      @default    = definition.default
-      @source     = definition.source
-      @ivar       = definition.ivar
-      @null       = definition.null ? 'Dry::Initializer::UNDEFINED' : 'nil'
-      @opts       = '__dry_initializer_options__'
-      @congif     = '__dry_initializer_config__'
-      @item       = '__dry_initializer_definition__'
-      @val        = @option ? '__dry_initializer_value__' : @source
-    end
-    # rubocop: enable Metrics/MethodLength
-
-    def lines
-      [
-        '',
-        definition_line,
-        reader_line,
-        default_line,
-        coercion_line,
-        assignment_line
-      ]
-    end
-
-    def reader_line
-      return unless @option
-
-      @optional ? optional_reader : required_reader
-    end
-
-    def optional_reader
-      "#{@val} = #{@opts}.fetch(:'#{@source}', #{@null})"
-    end
-
-    def required_reader
-      "#{@val} = #{@opts}.fetch(:'#{@source}')" \
-      " { raise KeyError, \"\#{self.class}: #{@definition} is required\" }"
-    end
-
-    def definition_line
-      return unless @type || @default
-
-      "#{@item} = __dry_initializer_config__.definitions[:'#{@source}']"
-    end
-
-    def default_line
-      return unless @default
-
-      "#{@val} = instance_exec(&#{@item}.default) if #{@null} == #{@val}"
-    end
-
-    def coercion_line
-      return unless @type
-
-      arity = @type.is_a?(Proc) ? @type.arity : @type.method(:call).arity
-
-      if arity.equal?(1) || arity.negative?
-        "#{@val} = #{@item}.type.call(#{@val}) unless #{@null} == #{@val}"
-      else
-        "#{@val} = #{@item}.type.call(#{@val}, self) unless #{@null} == #{@val}"
+# frozen_string_literal: true
+
+module Dry
+  module Initializer
+    module Builders
+      # @private
+      class Attribute
+        def self.[](definition)
+          new(definition).call
+        end
+
+        def call
+          lines.compact
+        end
+
+        private
+
+        def initialize(definition)
+          @definition = definition
+          @option     = definition.option
+          @type       = definition.type
+          @optional   = definition.optional
+          @default    = definition.default
+          @source     = definition.source
+          @ivar       = definition.ivar
+          @null       = definition.null ? "Dry::Initializer::UNDEFINED" : "nil"
+          @opts       = "__dry_initializer_options__"
+          @congif     = "__dry_initializer_config__"
+          @item       = "__dry_initializer_definition__"
+          @val        = @option ? "__dry_initializer_value__" : @source
+        end
+
+        def lines
+          [
+            "",
+            definition_line,
+            reader_line,
+            default_line,
+            coercion_line,
+            assignment_line
+          ]
+        end
+
+        def reader_line
+          return unless @option
+
+          @optional ? optional_reader : required_reader
+        end
+
+        def optional_reader
+          "#{@val} = #{@opts}.fetch(:'#{@source}', #{@null})"
+        end
+
+        def required_reader
+          "#{@val} = #{@opts}.fetch(:'#{@source}')" \
+          " { raise KeyError, \"\#{self.class}: #{@definition} is required\" }"
+        end
+
+        def definition_line
+          return unless @type || @default
+
+          "#{@item} = __dry_initializer_config__.definitions[:'#{@source}']"
+        end
+
+        def default_line
+          return unless @default
+
+          "#{@val} = instance_exec(&#{@item}.default) if #{@null} == #{@val}"
+        end
+
+        def coercion_line
+          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
+        end
+
+        def assignment_line
+          "#{@ivar} = #{@val}" \
+          " unless #{@null} == #{@val} && instance_variable_defined?(:#{@ivar})"
+        end
       end
     end
-
-    def assignment_line
-      "#{@ivar} = #{@val}" \
-      " unless #{@null} == #{@val} && instance_variable_defined?(:#{@ivar})"
-    end
   end
 end

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

@@ -1,57 +1,59 @@
-module Dry::Initializer::Builders
-  # @private
-  class Initializer
-    require_relative 'signature'
-    require_relative 'attribute'
-
-    def self.[](config)
-      new(config).call
-    end
-
-    def call
-      lines.flatten.compact.join("\n")
-    end
-
-    private
-
-    def initialize(config)
-      @config = config
-      @definitions = config.definitions.values
-    end
-
-    def lines
-      [
-        undef_line,
-        define_line,
-        params_lines,
-        options_lines,
-        end_line
-      ]
-    end
-
-    def undef_line
-      'undef :__dry_initializer_initialize__' \
-      ' if private_method_defined? :__dry_initializer_initialize__'
-    end
-
-    def define_line
-      "private def __dry_initializer_initialize__(#{Signature[@config]})"
-    end
-
-    def params_lines
-      @definitions.reject(&:option)
-        .flat_map { |item| Attribute[item] }
-        .map { |line| '  ' << line }
-    end
-
-    def options_lines
-      @definitions.select(&:option)
-        .flat_map { |item| Attribute[item] }
-        .map { |line| '  ' << line }
-    end
-
-    def end_line
-      'end'
+# frozen_string_literal: true
+
+module Dry
+  module Initializer
+    module Builders
+      # @private
+      class Initializer
+        require_relative "signature"
+        require_relative "attribute"
+
+        def self.[](config)
+          new(config).call
+        end
+
+        def call
+          lines.flatten.compact.join("\n")
+        end
+
+        private
+
+        def initialize(config)
+          @config = config
+          @definitions = config.definitions.values
+        end
+
+        def lines
+          [
+            undef_line,
+            define_line,
+            params_lines,
+            options_lines,
+            end_line
+          ]
+        end
+
+        def undef_line
+          "undef :__dry_initializer_initialize__" \
+          " if private_method_defined? :__dry_initializer_initialize__"
+        end
+
+        def define_line
+          "private def __dry_initializer_initialize__(#{Signature[@config]})"
+        end
+
+        def params_lines
+          @definitions.reject(&:option).flat_map { Attribute[_1] }.map { "  #{_1}" }
+        end
+
+        def options_lines
+          @definitions.select(&:option).flat_map { Attribute[_1] }.map { "  #{_1}" }
+        end
+
+        def end_line
+          "end"
+        end
+      end
     end
   end
 end

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

@@ -1,52 +1,58 @@
-module Dry::Initializer::Builders
-  # @private
-  class Reader
-    def self.[](definition)
-      new(definition).call
-    end
-
-    def call
-      lines.flatten.compact.join("\n")
-    end
-
-    private
-
-    def initialize(definition)
-      @target = definition.target
-      @ivar   = definition.ivar
-      @null   = definition.null
-      @reader = definition.reader
-    end
-
-    def lines
-      [undef_line, attribute_line, method_lines, type_line]
-    end
-
-    def undef_line
-      "undef :#{@target} if method_defined?(:#{@target})" \
-      "  || private_method_defined?(:#{@target})" \
-      "  || protected_method_defined?(:#{@target})"
-    end
-
-    def attribute_line
-      return unless @reader
-
-      "attr_reader :#{@target}" unless @null
-    end
-
-    def method_lines
-      return unless @reader
-      return unless @null
-
-      [
-        "def #{@target}",
-        "  #{@ivar} unless Dry::Initializer::UNDEFINED == #{@ivar}",
-        'end'
-      ]
-    end
-
-    def type_line
-      "#{@reader} :#{@target}" if %i[private protected].include? @reader
+# frozen_string_literal: true
+
+module Dry
+  module Initializer
+    module Builders
+      # @private
+      class Reader
+        def self.[](definition)
+          new(definition).call
+        end
+
+        def call
+          lines.flatten.compact.join("\n")
+        end
+
+        private
+
+        def initialize(definition)
+          @target = definition.target
+          @ivar   = definition.ivar
+          @null   = definition.null
+          @reader = definition.reader
+        end
+
+        def lines
+          [undef_line, attribute_line, method_lines, type_line]
+        end
+
+        def undef_line
+          "undef :#{@target} if method_defined?(:#{@target})" \
+          "  || private_method_defined?(:#{@target})" \
+          "  || protected_method_defined?(:#{@target})"
+        end
+
+        def attribute_line
+          return unless @reader
+
+          "attr_reader :#{@target}" unless @null
+        end
+
+        def method_lines
+          return unless @reader
+          return unless @null
+
+          [
+            "def #{@target}",
+            "  #{@ivar} unless Dry::Initializer::UNDEFINED == #{@ivar}",
+            "end"
+          ]
+        end
+
+        def type_line
+          "#{@reader} :#{@target}" if %i[private protected].include? @reader
+        end
+      end
     end
   end
 end

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

@@ -1,32 +1,38 @@
-module Dry::Initializer::Builders
-  # @private
-  class Signature
-    def self.[](config)
-      new(config).call
-    end
+# frozen_string_literal: true
 
-    def call
-      [*required_params, *optional_params, '*', options].compact.join(', ')
-    end
+module Dry
+  module Initializer
+    module Builders
+      # @private
+      class Signature
+        def self.[](config)
+          new(config).call
+        end
 
-    private
+        def call
+          [*required_params, *optional_params, "*", options].compact.join(", ")
+        end
 
-    def initialize(config)
-      @config  = config
-      @options = config.options.any?
-      @null    = config.null ? 'Dry::Initializer::UNDEFINED' : 'nil'
-    end
+        private
 
-    def required_params
-      @config.params.reject(&:optional).map(&:source)
-    end
+        def initialize(config)
+          @config  = config
+          @options = config.options.any?
+          @null    = config.null ? "Dry::Initializer::UNDEFINED" : "nil"
+        end
 
-    def optional_params
-      @config.params.select(&:optional).map { |rec| "#{rec.source} = #{@null}" }
-    end
+        def required_params
+          @config.params.reject(&:optional).map(&:source)
+        end
+
+        def optional_params
+          @config.params.select(&:optional).map { |rec| "#{rec.source} = #{@null}" }
+        end
 
-    def options
-      '**__dry_initializer_options__' if @options
+        def options
+          "**__dry_initializer_options__" if @options
+        end
+      end
     end
   end
 end

data/lib/dry/initializer/builders.rb

@@ -1,7 +1,11 @@
-module Dry::Initializer
-  # @private
-  module Builders
-    require_relative 'builders/reader'
-    require_relative 'builders/initializer'
+# frozen_string_literal: true
+
+module Dry
+  module Initializer
+    # @private
+    module Builders
+      require_relative "builders/reader"
+      require_relative "builders/initializer"
+    end
   end
 end