karafka-core 2.0.5 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e11bdb1c5a745e22d10b63dff4b2fb0a7a30dd1812aa8f7d3ad555d061dd451
-  data.tar.gz: 27d163cb019a0b57109bb4e6d53f3adce889a1d315f708f4100ffcee4d4885f8
+  metadata.gz: 158fcf590bf58fc10f8c47c5f9b9e8a256db4df8bfa842780cd20b6859c82392
+  data.tar.gz: 33025b3aaae92b63dffd21bf1820937d768cae4f8103701c963903e2add50fa6
 SHA512:
-  metadata.gz: d838c690a75dd37b1a15b666df8eafbe38c5f8cd95a38db9d7350a0753220b1c168d9ab153284b2dc5947d920ea26b0056871879cb2ca8bc8fba65f09920304b
-  data.tar.gz: ec6a1bd9ba1734975d8bafb0d57009e87101de8821caf96d30aa14e358169c0042f9744e7b1db951da959d7bcae19e4a202ad6c2f997bf5e40d6a7cceb1f75c1
+  metadata.gz: ebd3106bfe9f3ee67c1fca1ed6c871a2b7d18d03bb6a1dd9be4922777cb0bed1362047550a1a146491e9402fd9da61d6a37baf6aef99d6e303410702e7cedb3b
+  data.tar.gz: 89fab64ee5a909d0e05fbf179b690cc4fa75153d13cdbfe06e22d8b2d66b11fe4484641897ce95cb1a21e48e05746e29313a0d4157cc0a38d5dbe169d21ecc7f

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Karafka core changelog
 
+## 2.0.7 (2022-12-18)
+- Allow for recompilation of config upon injecting new config nodes.
+- Compile given config scope automatically after it is defined.
+- Support sub-config merging via their nested definitions.
+
+## 2.0.6 (2022-12-07)
+- Reverse node compilation state tracking removal.
+
 ## 2.0.5 (2022-12-07)
 - Move `librdkafka` generic (producer and consumer) patches from WaterDrop here.
 - Move dependency on `librdkafka` here from both Karafka and WaterDrop to unify management.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    karafka-core (2.0.5)
+    karafka-core (2.0.7)
       concurrent-ruby (>= 1.1)
       rdkafka (>= 0.12)
 

data/lib/karafka/core/configurable/leaf.rb

@@ -4,7 +4,12 @@ module Karafka
   module Core
     module Configurable
       # Single end config value representation
-      Leaf = Struct.new(:name, :default, :constructor)
+      Leaf = Struct.new(:name, :default, :constructor, :compiled) do
+        # @return [Boolean] true if already compiled
+        def compiled?
+          compiled
+        end
+      end
     end
   end
 end

data/lib/karafka/core/configurable/node.rb

@@ -21,6 +21,7 @@ module Karafka
           @name = name
           @children = []
           @nestings = nestings
+          @compiled = false
           instance_eval(&nestings)
         end
 
@@ -34,8 +35,10 @@ module Karafka
           @children << if block
                          Node.new(name, block)
                        else
-                         Leaf.new(name, default, constructor)
+                         Leaf.new(name, default, constructor, false)
                        end
+
+          compile
         end
 
         # Allows for the configuration and setup of the settings
@@ -43,7 +46,7 @@ module Karafka
         # Compile settings, allow for overrides via yielding
         # @return [Node] returns self after configuration
         def configure
-          compile
+          compile if !@compiled || name == :root
           yield(self) if block_given?
           self
         end
@@ -54,7 +57,10 @@ module Karafka
 
           @children.each do |value|
             config[value.name] = if value.is_a?(Leaf)
-                                   public_send(value.name)
+                                   result = public_send(value.name)
+                                   # We need to check if value is not a result node for cases where
+                                   # we merge additional config
+                                   result.is_a?(Node) ? result.to_h : result
                                  else
                                    value.to_h
                                  end
@@ -70,7 +76,14 @@ module Karafka
           dupped = Node.new(name, nestings)
 
           dupped.children += children.map do |value|
-            value.is_a?(Leaf) ? value.dup : value.deep_dup
+            if value.is_a?(Leaf)
+              # After inheritance we need to reload the state so the leafs are recompiled again
+              value = value.dup
+              value.compiled = false
+              value
+            else
+              value.deep_dup
+            end
           end
 
           dupped
@@ -89,6 +102,9 @@ module Karafka
             next if skippable
 
             initialized = if value.is_a?(Leaf)
+                            next if value.compiled?
+
+                            value.compiled = true
                             value.constructor ? value.constructor.call(value.default) : value.default
                           else
                             value.compile
@@ -97,6 +113,8 @@ module Karafka
 
             public_send("#{value.name}=", initialized)
           end
+
+          @compiled = true
         end
       end
     end

data/lib/karafka/core/version.rb

@@ -4,6 +4,6 @@ module Karafka
   module Core
     # Current Karafka::Core version
     # We follow the versioning schema of given Karafka version
-    VERSION = '2.0.5'
+    VERSION = '2.0.7'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: karafka-core
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.7
 platform: ruby
 authors:
 - Maciej Mensfeld
@@ -35,7 +35,7 @@ cert_chain:
   Qf04B9ceLUaC4fPVEz10FyobjaFoY4i32xRto3XnrzeAgfEe4swLq8bQsR3w/EF3
   MGU0FeSV2Yj7Xc2x/7BzLK8xQn5l7Yy75iPF+KP3vVmDHnNl
   -----END CERTIFICATE-----
-date: 2022-12-07 00:00:00.000000000 Z
+date: 2022-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby

metadata.gz.sig

@@ -1,2 +1,4 @@
-'��y�o���s�SE��CiہJ�!H��1O�:�u�š �?4
���Xt�x��J�۝Tm���,����e��@�Kߎ��_(�+ˋ��Żgl��Ū�-�8�>I.��p����aj�����k�Q�P)Zȍ'�%��
-��7q���� �=i=����p�$�T�����;%4o5�"��������\Y~'-�:�?��"֓Hut�>+�D�����T����T=�����LB �r��I�}���&t��\���Q����?-�W�G�iWǨ*@D��c�{��n�f�����u���
z�'�ua�CwA���
+�#f�餐

Ѡ^�N���-X�hˬ�t�n���9_�Y뾁����,C�iЛ
"{���SI,F�=ã�l�Zw���*�YKj�i���rz�3��
��ϝG;D���᪯�����7������-V;<%���\&��vJ5>�{���s*v�}�-���Rb�&ۇ�x��.5`��^�v��,��E9�X��˞����.�����}ǿ-5���HI˒�2���_�*Ia��$�*�a��
+�2
+6�$6��7[z7�%؍9�Ts���x�=;ïҧo��[���A�|x',�J���R��)Z�\l�����挏B?푹�z�������m�i
+���J]L��o(Ms��4zɜ�]B>�W�N'���]d��Q�Z