dry-initializer 3.0.1 → 3.1.0

data/lib/dry/initializer/dsl.rb

@@ -1,43 +1,51 @@
-module Dry::Initializer
-  # Module-level DSL
-  module DSL
-    # Setting for null (undefined value)
-    # @return [nil, Dry::Initializer::UNDEFINED]
-    attr_reader :null
+# frozen_string_literal: true
 
-    # Returns a version of the module with custom settings
-    # @option settings [Boolean] :undefined
-    #   If unassigned params and options should be treated different from nil
-    # @return [Dry::Initializer]
-    def [](undefined: true, **)
-      null = (undefined == false) ? nil : UNDEFINED
-      Module.new.tap do |mod|
-        mod.extend DSL
-        mod.include self
-        mod.send(:instance_variable_set, :@null, null)
+module Dry
+  module Initializer
+    # Module-level DSL
+    module DSL
+      # Setting for null (undefined value)
+      # @return [nil, Dry::Initializer::UNDEFINED]
+      attr_reader :null
+
+      # Returns a version of the module with custom settings
+      # @option settings [Boolean] :undefined
+      #   If unassigned params and options should be treated different from nil
+      # @return [Dry::Initializer]
+      def [](undefined: true, **)
+        null = undefined == false ? nil : UNDEFINED
+        Module.new.tap do |mod|
+          mod.extend DSL
+          mod.include self
+          mod.send(:instance_variable_set, :@null, null)
+        end
       end
-    end
 
-    # Returns mixin module to be included to target class by hand
-    # @return [Module]
-    # @yield proc defining params and options
-    def define(procedure = nil, &block)
-      config = Config.new(null: null)
-      config.instance_exec(&(procedure || block))
-      config.mixin.include Mixin::Root
-      config.mixin
-    end
+      # Returns mixin module to be included to target class by hand
+      # @return [Module]
+      # @yield proc defining params and options
+      def define(procedure = nil, &block)
+        config = Config.new(null: null)
+        config.instance_exec(&(procedure || block))
+        config.mixin.include Mixin::Root
+        config.mixin
+      end
 
-    private
+      private
 
-    def extended(klass)
-      config = Config.new(klass, null: null)
-      klass.send :instance_variable_set, :@dry_initializer, config
-      klass.include Mixin::Root
-    end
+      def extended(klass)
+        config = Config.new(klass, null: null)
+        klass.send :instance_variable_set, :@dry_initializer, config
+        klass.include Mixin::Root
+      end
 
-    def self.extended(mod)
-      mod.instance_variable_set :@null, UNDEFINED
+      class << self
+        private
+
+        def extended(mod)
+          mod.instance_variable_set :@null, UNDEFINED
+        end
+      end
     end
   end
 end

data/lib/dry/initializer/errors.rb

@@ -0,0 +1,22 @@
+# 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

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

@@ -1,19 +1,25 @@
-module Dry::Initializer::Mixin
-  # @private
-  module Local
-    attr_reader :klass
+# frozen_string_literal: true
 
-    def inspect
-      "Dry::Initializer::Mixin::Local[#{klass}]"
-    end
-    alias to_s   inspect
-    alias to_str inspect
+module Dry
+  module Initializer
+    module Mixin
+      # @private
+      module Local
+        attr_reader :klass
+
+        def inspect
+          "Dry::Initializer::Mixin::Local[#{klass}]"
+        end
+        alias_method :to_s, :inspect
+        alias_method :to_str, :inspect
 
-    private
+        private
 
-    def included(klass)
-      @klass = klass
-      super
+        def included(klass)
+          @klass = klass
+          super
+        end
+      end
     end
   end
 end

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

@@ -1,10 +1,16 @@
-module Dry::Initializer::Mixin
-  # @private
-  module Root
-    private
+# frozen_string_literal: true
 
-    def initialize(*args)
-      __dry_initializer_initialize__(*args)
+module Dry
+  module Initializer
+    module Mixin
+      # @private
+      module Root
+        private
+
+        def initialize(...)
+          __dry_initializer_initialize__(...)
+        end
+      end
     end
   end
 end

data/lib/dry/initializer/mixin.rb

@@ -1,15 +1,20 @@
-module Dry::Initializer
-  # @private
-  module Mixin
-    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"
-      super
-    end
+# frozen_string_literal: true
+
+module Dry
+  module Initializer
+    # @private
+    module Mixin
+      extend  DSL              # @deprecated
+      include Dry::Initializer # @deprecated
+      # @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"
+        super
+      end
 
-    require_relative "mixin/root"
-    require_relative "mixin/local"
+      require_relative "mixin/root"
+      require_relative "mixin/local"
+    end
   end
 end

data/lib/dry/initializer/struct.rb

@@ -1,40 +1,44 @@
-#
+# frozen_string_literal: true
+
 # The nested structure that takes nested hashes with indifferent access
 #
-class Dry::Initializer::Struct
-  extend Dry::Initializer
+module Dry
+  module Initializer
+    class Struct
+      extend ::Dry::Initializer
 
-  class << self
-    undef_method :param
+      class << self
+        undef_method :param
 
-    def new(options)
-      super Hash(options).transform_keys(&:to_sym)
-    end
-    alias call new
-  end
+        def new(options)
+          super(**Hash(options).each_with_object({}) { |(k, v), h| h[k.to_sym] = v })
+        end
+        alias_method :call, :new
+      end
 
-  #
-  # Represents event data as a nested hash with deeply stringified keys
-  # @return [Hash<String, ...>]
-  #
-  def to_h
-    self
-      .class
-      .dry_initializer
-      .attributes(self)
-      .transform_values { |v| __hashify(v) }
-      .stringify_keys
-  end
+      #
+      # Represents event data as a nested hash with deeply stringified keys
+      # @return [Hash<String, ...>]
+      #
+      def to_h
+        self
+          .class
+          .dry_initializer
+          .attributes(self)
+          .each_with_object({}) { |(k, v), h| h[k.to_s] = __hashify(v) }
+      end
 
-  private
+      private
 
-  def __hashify(value)
-    case value
-    when Hash
-      value.each_with_object({}) { |(k, v), obj| obj[k.to_s] = __hashify(v) }
-    when Array then value.map { |v| __hashify(v) }
-    when Dry::Initializer::Struct then value.to_h
-    else value
+      def __hashify(value)
+        case value
+        when Hash
+          value.each_with_object({}) { |(k, v), obj| obj[k.to_s] = __hashify(v) }
+        when Array then value.map { |v| __hashify(v) }
+        when Dry::Initializer::Struct then value.to_h
+        else value
+        end
+      end
     end
   end
 end

data/lib/dry/initializer/undefined.rb

@@ -1,2 +1,8 @@
-module Dry::Initializer::UNDEFINED
+# frozen_string_literal: true
+
+module Dry
+  module Initializer
+    module UNDEFINED
+    end
+  end
 end

data/lib/dry/initializer/version.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Dry
+  module Initializer
+    VERSION = "3.1.0"
+  end
+end

data/lib/dry/initializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "set"
 
 # Namespace for gems in a dry-rb community
@@ -13,6 +15,7 @@ module Dry
     require_relative "initializer/config"
     require_relative "initializer/mixin"
     require_relative "initializer/dispatchers"
+    require_relative "initializer/errors"
 
     # Adds methods [.[]] and [.define]
     extend DSL

data/lib/dry-initializer.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require_relative "dry/initializer"

data/lib/tasks/benchmark.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 namespace :benchmark do
   desc "Runs benchmarks for plain params"
   task :plain_params do

data/lib/tasks/profile.rake

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+# rubocop: disable Lint/ConstantDefinitionInBlock
 namespace :profile do
   def profile(name, execution, &definition)
     require "dry-initializer"
@@ -76,3 +79,4 @@ task profile: %i[
   profile:coercion
   profile:default_coercion
 ]
+# rubocop: enable Lint/ConstantDefinitionInBlock

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-initializer
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.0
 platform: ruby
 authors:
 - Vladimir Kochnev (marshall-lee)
@@ -9,89 +9,46 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-15 00:00:00.000000000 Z
+date: 2022-01-16 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '10'
-- !ruby/object:Gem::Dependency
-  name: dry-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.49.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.49.0
-description: 
-email: andrew.kozin@gmail.com
+        version: '0'
+description: DSL for declaring params and options of the initializer
+email:
+- andrew.kozin@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- README.md
-- CHANGELOG.md
+extra_rdoc_files: []
 files:
-- ".codeclimate.yml"
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
-- Gemfile
-- Guardfile
-- LICENSE.txt
+- LICENSE
 - README.md
-- Rakefile
-- benchmarks/compare_several_defaults.rb
-- benchmarks/plain_options.rb
-- benchmarks/plain_params.rb
-- benchmarks/with_coercion.rb
-- benchmarks/with_defaults.rb
-- benchmarks/with_defaults_and_coercion.rb
 - dry-initializer.gemspec
 - lib/dry-initializer.rb
 - lib/dry/initializer.rb
@@ -114,38 +71,23 @@ 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
 - lib/dry/initializer/struct.rb
 - lib/dry/initializer/undefined.rb
+- lib/dry/initializer/version.rb
 - lib/tasks/benchmark.rake
 - lib/tasks/profile.rake
-- spec/attributes_spec.rb
-- spec/coercion_of_nil_spec.rb
-- spec/custom_dispatchers_spec.rb
-- spec/custom_initializer_spec.rb
-- spec/default_values_spec.rb
-- spec/definition_spec.rb
-- spec/invalid_default_spec.rb
-- spec/list_type_spec.rb
-- spec/missed_default_spec.rb
-- spec/nested_type_spec.rb
-- spec/optional_spec.rb
-- spec/options_tolerance_spec.rb
-- spec/public_attributes_utility_spec.rb
-- spec/reader_spec.rb
-- spec/repetitive_definitions_spec.rb
-- spec/several_assignments_spec.rb
-- spec/spec_helper.rb
-- spec/subclassing_spec.rb
-- spec/type_argument_spec.rb
-- spec/type_constraint_spec.rb
-- spec/value_coercion_via_dry_types_spec.rb
-homepage: https://github.com/dry-rb/dry-initializer
+homepage: https://dry-rb.org/gems/dry-initializer
 licenses:
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
+  changelog_uri: https://github.com/dry-rb/dry-initializer/blob/master/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: 
 rdoc_options: []
 require_paths:
@@ -154,36 +96,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: DSL for declaring params and options of the initializer
-test_files:
-- spec/attributes_spec.rb
-- spec/coercion_of_nil_spec.rb
-- spec/custom_dispatchers_spec.rb
-- spec/custom_initializer_spec.rb
-- spec/default_values_spec.rb
-- spec/definition_spec.rb
-- spec/invalid_default_spec.rb
-- spec/list_type_spec.rb
-- spec/missed_default_spec.rb
-- spec/nested_type_spec.rb
-- spec/optional_spec.rb
-- spec/options_tolerance_spec.rb
-- spec/public_attributes_utility_spec.rb
-- spec/reader_spec.rb
-- spec/repetitive_definitions_spec.rb
-- spec/several_assignments_spec.rb
-- spec/spec_helper.rb
-- spec/subclassing_spec.rb
-- spec/type_argument_spec.rb
-- spec/type_constraint_spec.rb
-- spec/value_coercion_via_dry_types_spec.rb
+test_files: []

data/.codeclimate.yml

@@ -1,23 +0,0 @@
----
-engines:
-  rubocop:
-    enabled: true
-    checks:
-      Rubocop/Style/FrozenStringLiteralComment:
-        enabled: false
-      Rubocop/Style/PercentLiteralDelimiters:
-        enabled: false
-      Rubocop/Lint/UnderscorePrefixedVariableName:
-        enabled: false
-  duplication:
-    enabled: true
-    config:
-      languages:
-        - ruby
-exclude_paths:
-- "benchmarks/**/*"
-- "spec/**/*"
-- "lib/tasks/**/*"
-ratings:
-   paths:
-   - "lib/**/*"

data/.gitignore

@@ -1,10 +0,0 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-/*.gem

data/.rspec

@@ -1,4 +0,0 @@
---format documentation
---color
---require spec_helper
---warnings

data/.rubocop.yml

@@ -1,51 +0,0 @@
----
-AllCops:
-  DisplayCopNames:    true
-  DisplayStyleGuide:  true
-  StyleGuideCopsOnly: true
-  TargetRubyVersion:  2.3
-  Exclude:
-    - lib/tasks/*.rake
-
-Bundler/DuplicatedGem:
-  Enabled: false
-
-Naming/FileName:
-  Exclude:
-    - lib/dry-initializer.rb
-
-Style/CaseEquality:
-  Enabled: false
-
-Style/ClassAndModuleChildren:
-  Enabled: false
-
-Style/ClassVars:
-  Enabled: false
-
-Style/Documentation:
-  Enabled: false
-
-Style/DoubleNegation:
-  Enabled: false
-
-Style/Lambda:
-  Exclude:
-    - spec/**/*.rb
-
-Style/LambdaCall:
-  Enabled: false
-
-Style/RescueModifier:
-  Exclude:
-    - spec/**/*.rb
-
-Style/Semicolon:
-  Exclude:
-    - spec/**/*.rb
-
-Style/StringLiterals:
-  EnforcedStyle: double_quotes
-
-Style/StringLiteralsInInterpolation:
-  EnforcedStyle: double_quotes

data/.travis.yml

@@ -1,28 +0,0 @@
----
-language: ruby
-cache: bundler
-bundler_args: --without benchmarks tools
-script:
-  - bundle exec rake spec
-rvm:
-  - 2.3.8
-  - 2.4.6
-  - 2.5.5
-  - 2.6.2
-  - jruby-9.2.7.0
-  - jruby-9000
-  - rbx-3
-  - ruby-head
-  - truffleruby
-env:
-  global:
-    - JRUBY_OPTS='--dev -J-Xmx1024M'
-matrix:
-  allow_failures:
-    - rvm: rbx-3
-    - rvm: ruby-head
-    - rvm: jruby-head
-    - rvm: truffleruby
-  include:
-    - rvm: jruby-head
-      before_install: gem install bundler --no-document