karafka 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a96aaf1f1cc1fadbeb09477a107efc11319f288b0e5d94f959813d7f85d295bf
-  data.tar.gz: b0db0711ceb51856771ba6906c0868f51637d78bd785c25005408449d32a3302
+  metadata.gz: 440133344045600ff04e132d48e16b83ce492d06616383f02f3c282ec28cd239
+  data.tar.gz: e12def9a87bf4e731bc049f15352c86ed95bdcd970ac4081cc720bd268e99d26
 SHA512:
-  metadata.gz: 7c37db7c2de5b131f34c08fe73e4453ea81d0ec99b4a5764b41ca98c7c8ff064b1b9f8bfee5e26bbae267ca77b3b5e72d72d90c9b4e034c6ead0d90b931f1fa9
-  data.tar.gz: 55131983670c0454f3f5a23df2b0d90b8718455f8f331ee660cd20dd3f131540188149f36efbb7842fe1561de4cb7f85d8892477deefbd1eb0c071722f2ffa72
+  metadata.gz: 2c9deb6fdd1172e4a40828d8650d016e0cd660e3c3f4a98ab9bf6abcb2ce77179206e7d898ddfce4379fea994c4f7e3840a2a5b768648f13aa11504efd55feb0
+  data.tar.gz: 3543d19c5066d144d0d9a15d366d522e5b0134a3df601ef01e416659d71d07d977fef2e71d170dfa5382f8ce496ed554dd004b45bf936d472b2aab75ef473ac5

data/.github/workflows/ci.yml

@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -39,7 +39,7 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Run Karafka license checksum verification
@@ -55,7 +55,7 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Run Coditsu
@@ -82,7 +82,7 @@ jobs:
           - ruby: '3.2'
             coverage: 'true'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install package dependencies
         run: "[ -e $APT_DEPS ] || sudo apt-get install -y --no-install-recommends $APT_DEPS"
 
@@ -117,7 +117,7 @@ jobs:
           - ruby: '3.2'
             coverage: 'true'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install package dependencies
         run: "[ -e $APT_DEPS ] || sudo apt-get install -y --no-install-recommends $APT_DEPS"
 

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Karafka framework changelog
 
+## 2.2.2 (2023-09-11)
+- [Feature] Provide ability to define routing defaults.
+- [Maintenance] Require `karafka-core` `>=` `2.2.2`
+
 ## 2.2.1 (2023-09-01)
 - [Fix] Fix insufficient validation of named patterns
 - [Maintenance] Rely on `2.2.x` `karafka-core`.

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    karafka (2.2.1)
-      karafka-core (>= 2.2.0, < 2.3.0)
+    karafka (2.2.2)
+      karafka-core (>= 2.2.2, < 2.3.0)
       thor (>= 0.20)
       waterdrop (>= 2.6.6, < 3.0.0)
       zeitwerk (~> 2.3)
@@ -30,7 +30,7 @@ GEM
       activesupport (>= 5.0)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    karafka-core (2.2.0)
+    karafka-core (2.2.2)
       concurrent-ruby (>= 1.1)
       karafka-rdkafka (>= 0.13.1, < 0.14.0)
     karafka-rdkafka (0.13.4)

data/karafka.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
     without having to focus on things that are not your business domain.
   DESC
 
-  spec.add_dependency 'karafka-core', '>= 2.2.0', '< 2.3.0'
+  spec.add_dependency 'karafka-core', '>= 2.2.2', '< 2.3.0'
   spec.add_dependency 'thor', '>= 0.20'
   spec.add_dependency 'waterdrop', '>= 2.6.6', '< 3.0.0'
   spec.add_dependency 'zeitwerk', '~> 2.3'

data/lib/karafka/routing/builder.rb

@@ -10,8 +10,14 @@ module Karafka
     #     end
     #   end
     class Builder < Concurrent::Array
+      # Empty default per-topic config
+      EMPTY_DEFAULTS = ->(_) {}.freeze
+
+      private_constant :EMPTY_DEFAULTS
+
       def initialize
         @draws = Concurrent::Array.new
+        @defaults = EMPTY_DEFAULTS
         super
       end
 
@@ -55,10 +61,19 @@ module Karafka
 
       # Clears the builder and the draws memory
       def clear
+        @defaults = EMPTY_DEFAULTS
         @draws.clear
         super
       end
 
+      # @param block [Proc] block with per-topic evaluated defaults
+      # @return [Proc] defaults that should be evaluated per topic
+      def defaults(&block)
+        return @defaults unless block
+
+        @defaults = block
+      end
+
       private
 
       # Builds and saves given consumer group

data/lib/karafka/routing/consumer_group.rb

@@ -22,7 +22,7 @@ module Karafka
       #   kafka and don't understand the concept of consumer groups.
       def initialize(name)
         @name = name.to_s
-        @id = Karafka::App.config.consumer_mapper.call(name)
+        @id = config.consumer_mapper.call(name)
         @topics = Topics.new([])
         # Initialize the subscription group so there's always a value for it, since even if not
         # defined directly, a subscription group will be created
@@ -31,7 +31,7 @@ module Karafka
 
       # @return [Boolean] true if this consumer group should be active in our current process
       def active?
-        Karafka::App.config.internal.routing.activity_manager.active?(:consumer_groups, name)
+        config.internal.routing.activity_manager.active?(:consumer_groups, name)
       end
 
       # Builds a topic representation inside of a current consumer group route
@@ -40,7 +40,11 @@ module Karafka
       # @return [Karafka::Routing::Topic] newly built topic instance
       def topic=(name, &block)
         topic = Topic.new(name, self)
-        @topics << Proxy.new(topic, &block).target
+        @topics << Proxy.new(
+          topic,
+          config.internal.routing.builder.defaults,
+          &block
+        ).target
         built_topic = @topics.last
         # We overwrite it conditionally in case it was not set by the user inline in the topic
         # block definition
@@ -67,8 +71,7 @@ module Karafka
       # @return [Array<Routing::SubscriptionGroup>] all the subscription groups build based on
       #   the consumer group topics
       def subscription_groups
-        @subscription_groups ||= App
-                                 .config
+        @subscription_groups ||= config
                                  .internal
                                  .routing
                                  .subscription_groups_builder
@@ -84,6 +87,13 @@ module Karafka
           id: id
         }.freeze
       end
+
+      private
+
+      # @return [Karafka::Core::Configurable::Node] root node config
+      def config
+        ::Karafka::App.config
+      end
     end
   end
 end

data/lib/karafka/routing/proxy.rb

@@ -8,10 +8,13 @@ module Karafka
       attr_reader :target
 
       # @param target [Object] target object to which we proxy any DSL call
+      # @param defaults [Proc] defaults for target that should be applicable after the proper
+      #   proxy context (if needed)
       # @param block [Proc] block that we want to evaluate in the proxy context
-      def initialize(target, &block)
+      def initialize(target, defaults = ->(_) {}, &block)
         @target = target
         instance_eval(&block)
+        instance_eval(&defaults)
       end
 
       # Ruby 2.7.0 to 2.7.2 do not have arg forwarding, so we fallback to the old way

data/lib/karafka/version.rb

@@ -3,5 +3,5 @@
 # Main module namespace
 module Karafka
   # Current Karafka version
-  VERSION = '2.2.1'
+  VERSION = '2.2.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: karafka
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Maciej Mensfeld
@@ -35,7 +35,7 @@ cert_chain:
   AnG1dJU+yL2BK7vaVytLTstJME5mepSZ46qqIJXMuWob/YPDmVaBF39TDSG9e34s
   msG3BiCqgOgHAnL23+CN3Rt8MsuRfEtoTKpJVcCfoEoNHOkc
   -----END CERTIFICATE-----
-date: 2023-09-01 00:00:00.000000000 Z
+date: 2023-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: karafka-core
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.2
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.3.0
@@ -53,7 +53,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.2
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.3.0