dry-initializer 3.0.1 → 3.0.2

data/dry-initializer.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name     = "dry-initializer"
-  gem.version  = "3.0.1"
+  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"

data/lib/dry/initializer/config.rb

@@ -58,7 +58,7 @@ module Dry::Initializer
     # @option opts [true, false, :protected, :public, :private] :reader
     # @return [self] itself
     def param(name, type = nil, **opts, &block)
-      add_definition(false, name, type, block, opts)
+      add_definition(false, name, type, block, **opts)
     end
 
     # Adds or redefines an option of [#dry_initializer]
@@ -68,7 +68,7 @@ module Dry::Initializer
     # @return (see #param)
     #
     def option(name, type = nil, **opts, &block)
-      add_definition(true, name, type, block, opts)
+      add_definition(true, name, type, block, **opts)
     end
 
     # The hash of public attributes for an instance of the [#extended_class]
@@ -142,11 +142,11 @@ module Dry::Initializer
         source: name,
         type:   type,
         block:  block,
-        **opts,
+        **opts
       }
 
-      options = Dispatchers.call(opts)
-      definition = Definition.new(options)
+      options = Dispatchers.call(**opts)
+      definition = Definition.new(**options)
       definitions[definition.source] = definition
       finalize
       mixin.class_eval definition.code

data/lib/dry/initializer/dispatchers.rb

@@ -85,8 +85,8 @@ module Dry::Initializer::Dispatchers
   # @return [Hash<Symbol, Objct>] normalized set of options
   #
   def call(**options)
-    options = { null: null }.merge(options)
-    pipeline.reduce(options) { |opts, dispatcher| dispatcher.call(opts) }
+    options = { null: null, **options }
+    pipeline.reduce(options) { |opts, dispatcher| dispatcher.call(**opts) }
   end
 
   private

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

@@ -6,5 +6,6 @@ module Dry::Initializer::Mixin
     def initialize(*args)
       __dry_initializer_initialize__(*args)
     end
+    ruby2_keywords(:initialize) if respond_to?(:ruby2_keywords, true)
   end
 end

data/lib/dry/initializer/struct.rb

@@ -8,7 +8,7 @@ class Dry::Initializer::Struct
     undef_method :param
 
     def new(options)
-      super Hash(options).transform_keys(&:to_sym)
+      super(**Hash(options).each_with_object({}) { |(k, v), h| h[k.to_sym] = v })
     end
     alias call new
   end
@@ -22,8 +22,7 @@ class Dry::Initializer::Struct
       .class
       .dry_initializer
       .attributes(self)
-      .transform_values { |v| __hashify(v) }
-      .stringify_keys
+      .each_with_object({}) { |(k, v), h| h[k.to_s] = __hashify(v) }
   end
 
   private

data/spec/nested_type_spec.rb

@@ -18,6 +18,10 @@ describe "nested type argument" do
     it "builds the type" do
       expect(subject.x.y.z).to eq "42"
     end
+
+    it "converts the nested type to hash" do
+      expect(subject.x.to_h).to eq("y" => { "z" => "42" })
+    end
   end
 
   context "with nested and wrapped definitions" do

data/spec/spec_helper.rb

@@ -1,3 +1,10 @@
+if ENV['COVERAGE'] == 'true'
+  require 'simplecov'
+  SimpleCov.start do
+    add_filter '/spec/'
+  end
+end
+
 require "dry/initializer"
 
 begin

data/spec/type_argument_spec.rb

@@ -13,7 +13,7 @@ describe "type argument" do
     subject { Test::Foo.new 1, bar: "2" }
 
     it "raises TypeError" do
-      expect { subject }.to raise_error TypeError, /1/
+      expect { subject }.to raise_error Dry::Types::ConstraintError, /1/
     end
   end
 
@@ -21,7 +21,7 @@ describe "type argument" do
     subject { Test::Foo.new "1", bar: 2 }
 
     it "raises TypeError" do
-      expect { subject }.to raise_error TypeError, /2/
+      expect { subject }.to raise_error Dry::Types::ConstraintError, /2/
     end
   end
 

data/spec/type_constraint_spec.rb

@@ -43,7 +43,7 @@ describe "type constraint" do
       subject { Test::Foo.new 1 }
 
       it "raises ArgumentError" do
-        expect { subject }.to raise_error TypeError, /1/
+        expect { subject }.to raise_error Dry::Types::ConstraintError, /1/
       end
     end
 

data/spec/value_coercion_via_dry_types_spec.rb

@@ -3,7 +3,7 @@ require "dry-types"
 describe "value coercion via dry-types" do
   before do
     module Test::Types
-      include Dry::Types.module
+      include Dry.Types
     end
 
     class Test::Foo

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-initializer
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Vladimir Kochnev (marshall-lee)
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-15 00:00:00.000000000 Z
+date: 2019-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -73,16 +73,25 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - README.md
+- LICENSE
 - CHANGELOG.md
 files:
 - ".codeclimate.yml"
+- ".github/ISSUE_TEMPLATE/----please-don-t-ask-for-support-via-issues.md"
+- ".github/ISSUE_TEMPLATE/---bug-report.md"
+- ".github/ISSUE_TEMPLATE/---feature-request.md"
+- ".github/workflows/custom_ci.yml"
+- ".github/workflows/docsite.yml"
+- ".github/workflows/sync_configs.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
+- CODE_OF_CONDUCT.md
+- CONTRIBUTING.md
 - Gemfile
 - Guardfile
+- LICENSE
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -92,6 +101,17 @@ files:
 - benchmarks/with_coercion.rb
 - benchmarks/with_defaults.rb
 - benchmarks/with_defaults_and_coercion.rb
+- docsite/source/attributes.html.md
+- docsite/source/container-version.html.md
+- docsite/source/index.html.md
+- docsite/source/inheritance.html.md
+- docsite/source/optionals-and-defaults.html.md
+- docsite/source/options-tolerance.html.md
+- docsite/source/params-and-options.html.md
+- docsite/source/rails-support.html.md
+- docsite/source/readers.html.md
+- docsite/source/skip-undefined.html.md
+- docsite/source/type-constraints.html.md
 - dry-initializer.gemspec
 - lib/dry-initializer.rb
 - lib/dry/initializer.rb
@@ -161,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: DSL for declaring params and options of the initializer

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