dry-initializer 3.0.2 → 3.0.3

data/dry-initializer.gemspec

@@ -1,20 +1,20 @@
+require File.expand_path('lib/dry/initializer/version', __dir__)
+
 Gem::Specification.new do |gem|
-  gem.name     = "dry-initializer"
-  gem.version  = "3.0.2"
-  gem.author   = ["Vladimir Kochnev (marshall-lee)", "Andrew Kozin (nepalez)"]
-  gem.email    = "andrew.kozin@gmail.com"
-  gem.homepage = "https://github.com/dry-rb/dry-initializer"
-  gem.summary  = "DSL for declaring params and options of the initializer"
-  gem.license  = "MIT"
+  gem.name     = 'dry-initializer'
+  gem.version  = Dry::Initializer::VERSION
+  gem.author   = ['Vladimir Kochnev (marshall-lee)', 'Andrew Kozin (nepalez)']
+  gem.email    = 'andrew.kozin@gmail.com'
+  gem.homepage = 'https://github.com/dry-rb/dry-initializer'
+  gem.summary  = 'DSL for declaring params and options of the initializer'
+  gem.license  = 'MIT'
 
   gem.files            = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   gem.test_files       = gem.files.grep(/^spec/)
-  gem.extra_rdoc_files = Dir["README.md", "LICENSE", "CHANGELOG.md"]
+  gem.extra_rdoc_files = Dir['README.md', 'LICENSE', 'CHANGELOG.md']
 
-  gem.required_ruby_version = ">= 2.3"
+  gem.required_ruby_version = '>= 2.3'
 
-  gem.add_development_dependency "rspec", "~> 3.0"
-  gem.add_development_dependency "rake", "> 10"
-  gem.add_development_dependency "dry-types", "> 0.5.1"
-  gem.add_development_dependency "rubocop", "~> 0.49.0"
+  gem.add_development_dependency 'rspec', '~> 3.0'
+  gem.add_development_dependency 'rake', '> 10'
 end

data/lib/dry-initializer.rb

@@ -1 +1 @@
-require_relative "dry/initializer"
+require_relative 'dry/initializer'

data/lib/dry/initializer.rb

@@ -1,4 +1,4 @@
-require "set"
+require 'set'
 
 # Namespace for gems in a dry-rb community
 module Dry
@@ -6,13 +6,13 @@ module Dry
   # DSL for declaring params and options of class initializers
   #
   module Initializer
-    require_relative "initializer/undefined"
-    require_relative "initializer/dsl"
-    require_relative "initializer/definition"
-    require_relative "initializer/builders"
-    require_relative "initializer/config"
-    require_relative "initializer/mixin"
-    require_relative "initializer/dispatchers"
+    require_relative 'initializer/undefined'
+    require_relative 'initializer/dsl'
+    require_relative 'initializer/definition'
+    require_relative 'initializer/builders'
+    require_relative 'initializer/config'
+    require_relative 'initializer/mixin'
+    require_relative 'initializer/dispatchers'
 
     # Adds methods [.[]] and [.define]
     extend DSL
@@ -56,6 +56,6 @@ module Dry
       dry_initializer.children << config
     end
 
-    require_relative "initializer/struct"
+    require_relative 'initializer/struct'
   end
 end

data/lib/dry/initializer/builders.rb

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

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

@@ -20,17 +20,17 @@ module Dry::Initializer::Builders
       @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
+      @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,
@@ -41,6 +41,7 @@ module Dry::Initializer::Builders
 
     def reader_line
       return unless @option
+
       @optional ? optional_reader : required_reader
     end
 
@@ -55,18 +56,22 @@ module Dry::Initializer::Builders
 
     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.abs == 1
+
+      if arity.abs == 1 || Dry::Types::Type.equal?(@type)
         "#{@val} = #{@item}.type.call(#{@val}) unless #{@null} == #{@val}"
       else
         "#{@val} = #{@item}.type.call(#{@val}, self) unless #{@null} == #{@val}"

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

@@ -1,8 +1,8 @@
 module Dry::Initializer::Builders
   # @private
   class Initializer
-    require_relative "signature"
-    require_relative "attribute"
+    require_relative 'signature'
+    require_relative 'attribute'
 
     def self.[](config)
       new(config).call
@@ -30,8 +30,8 @@ module Dry::Initializer::Builders
     end
 
     def undef_line
-      "undef :__dry_initializer_initialize__" \
-      " if private_method_defined? :__dry_initializer_initialize__"
+      'undef :__dry_initializer_initialize__' \
+      ' if private_method_defined? :__dry_initializer_initialize__'
     end
 
     def define_line
@@ -40,22 +40,18 @@ module Dry::Initializer::Builders
 
     def params_lines
       @definitions.reject(&:option)
-                  .flat_map { |item| Attribute[item] }
-                  .map { |line| "  " << line }
+        .flat_map { |item| Attribute[item] }
+        .map { |line| '  ' << line }
     end
 
     def options_lines
       @definitions.select(&:option)
-                  .flat_map { |item| Attribute[item] }
-                  .map { |line| "  " << line }
+        .flat_map { |item| Attribute[item] }
+        .map { |line| '  ' << line }
     end
 
     def end_line
-      "end"
-    end
-
-    def private_line
-      "private :__dry_initializer_initialize__"
+      'end'
     end
   end
 end

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

@@ -30,16 +30,18 @@ module Dry::Initializer::Builders
 
     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'
       ]
     end
 

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

@@ -6,7 +6,7 @@ module Dry::Initializer::Builders
     end
 
     def call
-      [*required_params, *optional_params, "*", options].compact.join(", ")
+      [*required_params, *optional_params, '*', options].compact.join(', ')
     end
 
     private
@@ -14,7 +14,7 @@ module Dry::Initializer::Builders
     def initialize(config)
       @config  = config
       @options = config.options.any?
-      @null    = config.null ? "Dry::Initializer::UNDEFINED" : "nil"
+      @null    = config.null ? 'Dry::Initializer::UNDEFINED' : 'nil'
     end
 
     def required_params
@@ -26,7 +26,7 @@ module Dry::Initializer::Builders
     end
 
     def options
-      "**__dry_initializer_options__" if @options
+      '**__dry_initializer_options__' if @options
     end
   end
 end

data/lib/dry/initializer/config.rb

@@ -78,6 +78,7 @@ module Dry::Initializer
       definitions.values.each_with_object({}) do |item, obj|
         key = item.target
         next unless instance.respond_to? key
+
         val = instance.send(key)
         obj[key] = val unless null == val
       end
@@ -114,7 +115,7 @@ module Dry::Initializer
     # @return [String]
     def inch
       line  =  Builders::Signature[self]
-      line  =  line.gsub("__dry_initializer_options__", "options")
+      line  =  line.gsub('__dry_initializer_options__', 'options')
       lines =  ["@!method initialize(#{line})"]
       lines += ["Initializes an instance of #{extended_class}"]
       lines += definitions.values.map(&:inch)
@@ -138,10 +139,10 @@ module Dry::Initializer
       opts = {
         parent: extended_class,
         option: option,
-        null:   null,
+        null: null,
         source: name,
-        type:   type,
-        block:  block,
+        type: type,
+        block: block,
         **opts
       }
 
@@ -163,6 +164,7 @@ module Dry::Initializer
     def check_type(previous, current)
       return current unless previous
       return current if previous.option == current.option
+
       raise SyntaxError,
             "cannot reload #{previous} of #{extended_class.superclass}" \
             " by #{current} of its subclass #{extended_class}"

data/lib/dry/initializer/definition.rb

@@ -14,17 +14,17 @@ module Dry::Initializer
 
     def options
       {
-        as:       target,
-        type:     type,
+        as: target,
+        type: type,
         optional: optional,
-        default:  default,
-        reader:   reader,
-        desc:     desc
+        default: default,
+        reader: reader,
+        desc: desc
       }.reject { |_, value| value.nil? }
     end
 
     def name
-      @name ||= (option ? "option" : "parameter") << " '#{source}'"
+      @name ||= (option ? 'option' : 'parameter') << " '#{source}'"
     end
     alias to_s    name
     alias to_str  name
@@ -39,10 +39,10 @@ module Dry::Initializer
     end
 
     def inch
-      @inch ||= (option ? "@option" : "@param ").tap do |text|
-        text << " [Object]"
+      @inch ||= (option ? '@option' : '@param ').tap do |text|
+        text << ' [Object]'
         text << (option ? " :#{source}" : " #{source}")
-        text << (optional ? " (optional)" : " (required)")
+        text << (optional ? ' (optional)' : ' (required)')
         text << " #{desc}" if desc
       end
     end

data/lib/dry/initializer/dispatchers.rb

@@ -91,16 +91,16 @@ module Dry::Initializer::Dispatchers
 
   private
 
-  require_relative "dispatchers/build_nested_type"
-  require_relative "dispatchers/check_type"
-  require_relative "dispatchers/prepare_default"
-  require_relative "dispatchers/prepare_ivar"
-  require_relative "dispatchers/prepare_optional"
-  require_relative "dispatchers/prepare_reader"
-  require_relative "dispatchers/prepare_source"
-  require_relative "dispatchers/prepare_target"
-  require_relative "dispatchers/unwrap_type"
-  require_relative "dispatchers/wrap_type"
+  require_relative 'dispatchers/build_nested_type'
+  require_relative 'dispatchers/check_type'
+  require_relative 'dispatchers/prepare_default'
+  require_relative 'dispatchers/prepare_ivar'
+  require_relative 'dispatchers/prepare_optional'
+  require_relative 'dispatchers/prepare_reader'
+  require_relative 'dispatchers/prepare_source'
+  require_relative 'dispatchers/prepare_target'
+  require_relative 'dispatchers/unwrap_type'
+  require_relative 'dispatchers/wrap_type'
 
   def pipeline
     @pipeline ||= [

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

@@ -34,7 +34,7 @@ module Dry::Initializer::Dispatchers::PrepareDefault
 
   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

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

@@ -5,7 +5,7 @@ module Dry::Initializer::Dispatchers::PrepareIvar
   module_function
 
   def call(target:, **options)
-    ivar = "@#{target}".delete("?").to_sym
+    ivar = "@#{target}".delete('?').to_sym
 
     { target: target, ivar: ivar, **options }
   end

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

@@ -6,9 +6,9 @@ module Dry::Initializer::Dispatchers::PrepareReader
 
   def call(target: nil, reader: :public, **options)
     reader = case reader.to_s
-             when "false", ""                      then nil
-             when "true"                           then :public
-             when "public", "private", "protected" then reader.to_sym
+             when 'false', ''                      then nil
+             when 'true'                           then :public
+             when 'public', 'private', 'protected' then reader.to_sym
              else invalid_reader!(target, reader)
              end
 

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

@@ -21,6 +21,7 @@ module Dry::Initializer::Dispatchers::WrapType
       type ? type.call(value) : value
     else
       return [wrap_value(value, count - 1, type)] unless value.is_a?(Array)
+
       value.map { |item| wrap_value(item, count - 1, type) }
     end
   end

data/lib/dry/initializer/mixin.rb

@@ -4,12 +4,12 @@ module Dry::Initializer
     extend  DSL              # @deprecated
     include Dry::Initializer # @deprecated
     def self.extended(klass) # @deprecated
-      warn "[DEPRECATED] Use Dry::Initializer instead of its alias" \
-           " Dry::Initializer::Mixin. The later will be removed in v2.1.0"
+      warn '[DEPRECATED] Use Dry::Initializer instead of its alias' \
+           ' Dry::Initializer::Mixin. The later will be removed in v2.1.0'
       super
     end
 
-    require_relative "mixin/root"
-    require_relative "mixin/local"
+    require_relative 'mixin/root'
+    require_relative 'mixin/local'
   end
 end

data/lib/dry/initializer/version.rb

@@ -0,0 +1,5 @@
+module Dry
+  module Initializer
+    VERSION = '3.0.3'.freeze
+  end
+end

data/lib/tasks/benchmark.rake

@@ -1,36 +1,36 @@
 namespace :benchmark do
-  desc "Runs benchmarks for plain params"
+  desc 'Runs benchmarks for plain params'
   task :plain_params do
-    system "ruby benchmarks/plain_params.rb"
+    system 'ruby benchmarks/plain_params.rb'
   end
 
-  desc "Runs benchmarks for plain options"
+  desc 'Runs benchmarks for plain options'
   task :plain_options do
-    system "ruby benchmarks/plain_options.rb"
+    system 'ruby benchmarks/plain_options.rb'
   end
 
-  desc "Runs benchmarks for value coercion"
+  desc 'Runs benchmarks for value coercion'
   task :with_coercion do
-    system "ruby benchmarks/with_coercion.rb"
+    system 'ruby benchmarks/with_coercion.rb'
   end
 
-  desc "Runs benchmarks with defaults"
+  desc 'Runs benchmarks with defaults'
   task :with_defaults do
-    system "ruby benchmarks/with_defaults.rb"
+    system 'ruby benchmarks/with_defaults.rb'
   end
 
-  desc "Runs benchmarks with defaults and coercion"
+  desc 'Runs benchmarks with defaults and coercion'
   task :with_defaults_and_coercion do
-    system "ruby benchmarks/with_defaults_and_coercion.rb"
+    system 'ruby benchmarks/with_defaults_and_coercion.rb'
   end
 
-  desc "Runs benchmarks for several defaults"
+  desc 'Runs benchmarks for several defaults'
   task :compare_several_defaults do
-    system "ruby benchmarks/with_several_defaults.rb"
+    system 'ruby benchmarks/with_several_defaults.rb'
   end
 end
 
-desc "Runs all benchmarks"
+desc 'Runs all benchmarks'
 task benchmark: %i[
   benchmark:plain_params
   benchmark:plain_options