dry-initializer 0.10.2 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70dd3563c6e88c6c72a33f017f43655723faed0b
-  data.tar.gz: 4639b3b06c099d2a87cc8eab77cd2f27bdd33cd9
+  metadata.gz: 604898d7c7112e84b0e097a2913e81ba54918e25
+  data.tar.gz: 417c9a1e41b76162b12d7ce36dd19a156ca408e2
 SHA512:
-  metadata.gz: 8ef004b40f895bc06e9b0f38a1b1ccca77edd54ffd8945ceb85707f29ef166d7cb9e941ebbffa7f6df969291fe94ea259545a33aa0069f8a11faf3b0469250d9
-  data.tar.gz: 697b5ed22e837011fa847c9e56081ea00b67f6486f97432b08482b43e98a528d7d4e60d6cf8671413938a01c18d08bb88d7751d961b269808008c99df8eff7f8
+  metadata.gz: aec2d5e6f46522584d247e1c106eaab9bcec8b2787c4a827ddb24e1f533c81b242b3c04796207f97c4cb0a179d7581146e94495296f995e31b5a9e0a6c269ccf
+  data.tar.gz: 0ee2c8d900d400312a8c8ddae17648e1b37d28edb61034a76b0c01e87b2ed740cb135281f391f2e3d3f6170ece71faa977772e463ed5603d8c7a1039d51a0948

data/CHANGELOG.md

@@ -1,3 +1,38 @@
+## v0.11.0 2017-01-02
+
+### Added
+
+* Support of reloading `#initializer` with `super` (@nepalez)
+
+### Internal
+
+* Refactor the way [#initializer] method is (re)defined (@nepalez)
+  
+  When you extend class with `Dry::Initializer::Mixin`, the initializer is
+  defined not "inside" the class per se, but inside the included module. The
+  reference to that module is stored as class-level `__initializer_mixin__`.
+
+  Mixin method [#initialize] calls another private method [#__initialize__].
+  It is this method to be reloaded every time you envoke a helper
+  `option` or `product`.
+
+  When new subclass is inherited, new mixin is added to chain of accessors,
+  but this time it does reload `__initialize__` only, not the `initialize`.
+  That is how you can safely reload initializer using `super`, but at the same
+  time use the whole power of dry-initializer DSL both in parent class and its
+  subclasses.
+
+  The whole stack of accessors looks like the following:
+  - Parent class mixin: `initialize` --> `__initialize__`
+                             ^
+  - Parent class:       `initialize`
+  - Subclass mixin:          ^           `__initialize__`
+  - Subclass:           `initialize`
+
+  See specification `spec/custom_initializer_spec.rb` to see how this works.
+
+[Compare v0.10.2...v0.11.0](https://github.com/dry-rb/dry-initializer/compare/v0.10.2...v0.11.0)
+
 ## v0.10.2 2016-12-31
 
 ### Added

data/dry-initializer.gemspec

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

@@ -77,12 +77,14 @@ module Dry::Initializer
 
     def reload_initializer(mixin)
       mixin.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-        def initialize(#{@signature.call})
+        def __initialize__(#{@signature.call})
           @__options__ = __options__
           #{@parts.select { |part| String === part }.join("\n")}
           __after_initialize__
         end
       RUBY
+
+      mixin.send :private, :__initialize__
     end
 
     def reload_callback(mixin)

data/lib/dry/initializer/mixin.rb

@@ -14,8 +14,8 @@ module Dry::Initializer
     def param(name, type = nil, **options)
       options[:type]   = type if type
       options[:option] = false
-      @initializer_builder = initializer_builder.define(name, **options)
-      initializer_builder.call(self)
+      @__initializer_builder__ = __initializer_builder__.define(name, **options)
+      __initializer_builder__.call(__initializer_mixin__)
     end
 
     # Declares a named argument
@@ -27,8 +27,8 @@ module Dry::Initializer
     def option(name, type = nil, **options)
       options[:type]   = type if type
       options[:option] = true
-      @initializer_builder = initializer_builder.define(name, **options)
-      initializer_builder.call(self)
+      @__initializer_builder__ = __initializer_builder__.define(name, **options)
+      __initializer_builder__.call(__initializer_mixin__)
     end
 
     # Adds new plugin to the builder
@@ -37,24 +37,41 @@ module Dry::Initializer
     # @return [self] itself
     #
     def register_initializer_plugin(plugin)
-      @initializer_builder = initializer_builder.register(plugin)
-      initializer_builder.call(self)
+      @__initializer_builder__ = __initializer_builder__.register(plugin)
+      __initializer_builder__.call(__initializer_mixin__)
     end
 
     private
 
-    def initializer_builder
-      @initializer_builder ||= Builder.new
+    def __initializer_mixin__
+      @__initializer_mixin__ ||= Module.new do
+        def initialize(*args)
+          __initialize__(*args)
+        end
+      end
+    end
+
+    def __initializer_builder__
+      @__initializer_builder__ ||= Builder.new
     end
 
     def inherited(klass)
-      klass.instance_variable_set :@initializer_builder, initializer_builder.dup
+      new_builder = __initializer_builder__.dup
+      klass.instance_variable_set :@__initializer_builder__, new_builder
+
+      new_mixin = Module.new
+      new_builder.call(new_mixin)
+      klass.instance_variable_set :@__initializer_mixin__, new_mixin
+      klass.include new_mixin
 
       super
     end
 
     def self.extended(klass)
-      klass.send(:initializer_builder).call(klass)
+      super
+      mixin = klass.send(:__initializer_mixin__)
+      klass.send(:__initializer_builder__).call(mixin)
+      klass.include mixin
     end
   end
 end

data/spec/custom_initializer_spec.rb

@@ -0,0 +1,30 @@
+describe "custom initializer" do
+  before do
+    class Test::Foo
+      extend Dry::Initializer::Mixin
+
+      param :bar
+
+      def initialize(*args)
+        super
+        @bar *= 3
+      end
+    end
+
+    class Test::Baz < Test::Foo
+      param :qux
+
+      def initialize(*args)
+        super
+        @qux += 1
+      end
+    end
+  end
+
+  it "reloads the initializer" do
+    baz = Test::Baz.new(5, 5)
+
+    expect(baz.bar).to eq 15 # 5 * 3
+    expect(baz.qux).to eq 6  # 5 + 1
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-initializer
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.11.0
 platform: ruby
 authors:
 - Vladimir Kochnev (marshall-lee)
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-31 00:00:00.000000000 Z
+date: 2017-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -116,6 +116,7 @@ files:
 - lib/dry/initializer/signature.rb
 - spec/base_spec.rb
 - spec/container_spec.rb
+- spec/custom_initializer_spec.rb
 - spec/default_nil_spec.rb
 - spec/default_values_spec.rb
 - spec/invalid_default_spec.rb
@@ -158,6 +159,7 @@ summary: DSL for declaring params and options of the initializer
 test_files:
 - spec/base_spec.rb
 - spec/container_spec.rb
+- spec/custom_initializer_spec.rb
 - spec/default_nil_spec.rb
 - spec/default_values_spec.rb
 - spec/invalid_default_spec.rb