dry-initializer 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49644712268c1c8896eb7b9d067d5f3abf65789330d465f0acad780a4f50644e
-  data.tar.gz: 102ef164a75b9d4849400753a21046d5753217806de6c8963476ef8fafeb780d
+  metadata.gz: 6f8c224268e3e35d66bade7dde3eaa5cf3423d931e0755930f5086c2151ccfc1
+  data.tar.gz: 07275ac52d641a42609e47472c47b2f2e643e97e41a338ca4365ee2074ef8356
 SHA512:
-  metadata.gz: '07780a5de808586056b92a3b9a2f1169f5fea4d7879abd1080fc27a7e6123b22d2a07878e9ca9203995c9f01c3e5a47b030b5dc7004d67a4a540413aabdb5890'
-  data.tar.gz: e352bf6de1a4aae2cf183be62ef4f64a4c70daf0f329122b0d6cd00a7e6081767aa745e938ae4464e52d322bfb08ce943a3312b4f92e02d87c1b968edf0498c4
+  metadata.gz: 7e1275ca3ad8bec808814d88c3217ba8dd81e70a1c6de0a089560737edc2531f9aa9180fef77be430501ede727e414b9addc0cf4fd1345705923a7d729a0c6cb
+  data.tar.gz: afb4438bb4a9e26ea815166764a12c34309c1bbe53322a948dae9851c983d74f6e5e0696715ab2a7108552e1e3436123c4bb652aad74ba1a441aba4728cd970f

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
+## 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/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

@@ -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/dispatchers/prepare_default.rb

@@ -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/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.1.1"
   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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-initializer
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Vladimir Kochnev (marshall-lee)
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-16 00:00:00.000000000 Z
+date: 2022-01-19 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

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