dry-initializer 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e6ae766c1972fc5888ab780a91efb1e819b328a
-  data.tar.gz: 6810b441c5758b0fee5efadda4616b2b67d8c6d8
+  metadata.gz: 6ceae8e2fd7db0c6573d23b4fc02b3a28c87899b
+  data.tar.gz: a9535d4a290c5d1fff4172d0a3189e657c408a0a
 SHA512:
-  metadata.gz: 6e3e5809a583a299986ed3624d5baa905816bd518d20bb0a5870a9efdda9ddf41388c239a9d5aab6e1027adfbe1abacaa643d2075e1f202d3f1a0b20f5b305d6
-  data.tar.gz: f6f9c2dd66ed22efc7e53677256b884082dc86a3fac923dd35dc7fbd480252ce8f0f800665d9e49520c803cd541c44120832ec888f63e0203866f90faef4dd1d
+  metadata.gz: c09a05a65e40b00ad7b1e31fa3bdc0f0960b36cd1a8fca69826ba9ed706e8c16861a627fe12229f86282aa044d7f1aec77bc7b0fd630d6d7daf7e8d15b8bd208
+  data.tar.gz: 9e956de0414155a0b0350a93641925bc972992aa4f0344bc841cc1c808f7b35129c2844cff14205d05fba6f3045bb8c4b99469ff4fe0450593fb388a261999c8

data/.rspec

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

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## v1.4.1 2017-04-05
+
+### Fixed
+- Warning about redefined `#initialize` in case the method reloaded in a klass
+  that extends the module (nepalez, sergey-chechaev)
+
+### Internals
+- Rename `Dry::Initializer::DSL` -> `Dry::Initializer::ClassDSL` (nepalez)
+- Add `Dry::Initializer::InstanceDSL` (nepalez)
+
+[Compare v1.4.0...v1.4.1](https://github.com/dry-rb/dry-initializer/compare/v1.4.0...v1.4.1)
+
 ## v1.4.0 2017-03-08
 
 ### Changed (backward-incompatible)

data/dry-initializer.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name     = "dry-initializer"
-  gem.version  = "1.4.0"
+  gem.version  = "1.4.1"
   gem.author   = ["Vladimir Kochnev (marshall-lee)", "Andrew Kozin (nepalez)"]
   gem.email    = ["hashtable@yandex.ru", "andrew.kozin@gmail.com"]
   gem.homepage = "https://github.com/dryrb/dry-initializer"

data/lib/dry/initializer.rb

@@ -8,7 +8,8 @@ module Dry
     require_relative "initializer/param"
     require_relative "initializer/option"
     require_relative "initializer/builder"
-    require_relative "initializer/dsl"
+    require_relative "initializer/instance_dsl"
+    require_relative "initializer/class_dsl"
 
     # rubocop: disable Style/ConstantName
     Mixin = self # for compatibility to versions below 0.12
@@ -18,7 +19,7 @@ module Dry
       obj.define_singleton_method(:inspect) { "Dry::Initializer::UNDEFINED" }
     end.freeze
 
-    extend Dry::Initializer::DSL
+    extend Dry::Initializer::ClassDSL
 
     def param(*args)
       __initializer_builder__.param(*args).call(__initializer_mixin__)
@@ -31,11 +32,7 @@ module Dry
     private
 
     def __initializer_mixin__
-      @__initializer_mixin__ ||= Module.new do
-        def initialize(*args)
-          __initialize__(*args)
-        end
-      end
+      @__initializer_mixin__ ||= Module.new
     end
 
     def __initializer_builder__(**settings)

data/lib/dry/initializer/{dsl.rb → class_dsl.rb}

@@ -1,22 +1,17 @@
 module Dry::Initializer
-  module DSL
+  module ClassDSL
     attr_reader :config
 
     def [](**settings)
       Module.new do
-        extend  Dry::Initializer::DSL
+        extend  Dry::Initializer::ClassDSL
         include Dry::Initializer
         @config = settings
       end
     end
 
     def define(fn = nil, &block)
-      mixin = Module.new do
-        def initialize(*args)
-          __initialize__(*args)
-        end
-      end
-
+      mixin   = Module.new { include InstanceDSL }
       builder = Builder.new Hash(config)
       builder.instance_exec(&(fn || block))
       builder.call(mixin)
@@ -29,12 +24,10 @@ module Dry::Initializer
       super
       mixin   = klass.send(:__initializer_mixin__)
       builder = klass.send(:__initializer_builder__, Hash(config))
-
       builder.call(mixin)
-      klass.include(mixin)
-      klass.send(:define_method, :initialize) do |*args|
-        __initialize__(*args)
-      end
+
+      klass.include(InstanceDSL) # defines #initialize
+      klass.include(mixin)       # defines #__initialize__ (to be redefined)
     end
 
     def mixin(fn = nil, &block)

data/lib/dry/initializer/instance_dsl.rb

@@ -0,0 +1,15 @@
+module Dry::Initializer
+  module InstanceDSL
+    private
+
+    # The method is reloaded explicitly
+    # in a class that extend [Dry::Initializer], or in its subclasses.
+    def initialize(*args)
+      __initialize__(*args)
+    end
+
+    # The method is redefined implicitly every time
+    # a `param` or `option` is invoked.
+    def __initialize__(*); end
+  end
+end

data/spec/definition_spec.rb

@@ -2,13 +2,13 @@ describe "definition" do
   shared_examples :initializer do |in_context|
     subject { Test::Foo.new(1, bar: 2) }
 
-    it "sets variables when defined by #{in_context}" do
+    it "sets variables when defined via `#{in_context}`" do
       expect(subject.instance_variable_get(:@foo)).to eql 1
       expect(subject.instance_variable_get(:@bar)).to eql 2
     end
   end
 
-  it_behaves_like :initializer, "extending Dry::Initializer" do
+  it_behaves_like :initializer, "extend Dry::Initializer" do
     before do
       class Test::Foo
         extend Dry::Initializer
@@ -18,7 +18,7 @@ describe "definition" do
     end
   end
 
-  it_behaves_like :initializer, "extending Dry::Initializer::Mixin" do
+  it_behaves_like :initializer, "extend Dry::Initializer::Mixin" do
     before do
       class Test::Foo
         extend Dry::Initializer::Mixin
@@ -28,7 +28,7 @@ describe "definition" do
     end
   end
 
-  it_behaves_like :initializer, "extending Dry::Initializer[undefined: false]" do
+  it_behaves_like :initializer, "extend Dry::Initializer[undefined: false]" do
     before do
       class Test::Foo
         extend Dry::Initializer[undefined: false]
@@ -38,7 +38,7 @@ describe "definition" do
     end
   end
 
-  it_behaves_like :initializer, "including Dry::Initializer with block" do
+  it_behaves_like :initializer, "include Dry::Initializer with block" do
     before do
       class Test::Foo
         include Dry::Initializer.define {
@@ -49,7 +49,7 @@ describe "definition" do
     end
   end
 
-  it_behaves_like :initializer, "including Dry::Initializer with lambda" do
+  it_behaves_like :initializer, "include Dry::Initializer with lambda" do
     before do
       class Test::Foo
         include Dry::Initializer.define -> do
@@ -60,7 +60,7 @@ describe "definition" do
     end
   end
 
-  it_behaves_like :initializer, "including Dry::Initializer[undefined: false]" do
+  it_behaves_like :initializer, "include Dry::Initializer[undefined: false]" do
     before do
       class Test::Foo
         include Dry::Initializer[undefined: false].define {
@@ -71,7 +71,7 @@ describe "definition" do
     end
   end
 
-  it_behaves_like :initializer, "including Dry::Initializer::Mixin" do
+  it_behaves_like :initializer, "include Dry::Initializer::Mixin" do
     before do
       class Test::Foo
         include Dry::Initializer::Mixin.define {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-initializer
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Vladimir Kochnev (marshall-lee)
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-02 00:00:00.000000000 Z
+date: 2017-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -102,10 +102,11 @@ files:
 - lib/dry/initializer.rb
 - lib/dry/initializer/attribute.rb
 - lib/dry/initializer/builder.rb
-- lib/dry/initializer/dsl.rb
+- lib/dry/initializer/class_dsl.rb
 - lib/dry/initializer/exceptions/default_value_error.rb
 - lib/dry/initializer/exceptions/params_order_error.rb
 - lib/dry/initializer/exceptions/type_constraint_error.rb
+- lib/dry/initializer/instance_dsl.rb
 - lib/dry/initializer/option.rb
 - lib/dry/initializer/param.rb
 - spec/custom_initializer_spec.rb