karafka 2.0.0.rc1 → 2.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 506ffb9aef3309eae2ee26e3283b7bc83859b26f4fe41995dca9d8f5e7bf0533
-  data.tar.gz: 14b39f0597676207bf9f2bf10b06c51ba539c3aa01959dfb2378c2e23941d240
+  metadata.gz: f4103f2661316cc4e24aab8bf9715472c04f6911b3e56bb3ecdab775a0e32139
+  data.tar.gz: 0174d1cd163ac4fd046e4d432c0a4e2a07e2d57494ada9846ec61b6c73c2e434
 SHA512:
-  metadata.gz: 4b2ad5ef4eff629abfc0088be0c400bd0f9420d24c05c1414541a4c167e7e6bf2b9735bf0e596358d8e3f3c2392bf2c2b4ba345cdb8f0226b54877ce111fd749
-  data.tar.gz: 93adbc64906ff4a03e67dee646a5fe696d825357753bb804c690036800c947edaa186b67e5da8db115a0cc4a9efa46e6b1e061a608e496255bbfdc6ddeb60c14
+  metadata.gz: b3214a7e89730e932dbfbd3e5463ab0ce592d06589b5940f0987ded07f738d1f13557ae1d8251d8971beae7334c91bc655a8f64dd83049520d7ca889b2519e69
+  data.tar.gz: 803ae22e05ad14025dc4bda185571c586727227154e201d979052223b8270b157d7bd8a9588c0aa074c9d5bf0ef31dba6a1a696c7c392171c585945343d2fd10

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Karafka framework changelog
 
+## 2.0.0.rc2 (2022-07-19)
+- Fix `example_consumer.rb.erb` `#shutdown` and `#revoked` signatures to correct once.
+- Improve the install user experience (print status and created files).
+- Change default `max_wait_time` from 10s to 5s.
+- Remove direct dependency on `dry-configurable` in favour of a home-brew.
+- Remove direct dependency on `dry-validation` in favour of a home-brew.
+
 ## 2.0.0-rc1 (2022-07-08)
 - Extract consumption partitioner out of listener inline code.
 - Introduce virtual partitioner concept for parallel processing of data from a single topic partition.

data/Gemfile.lock

@@ -1,22 +1,20 @@
 PATH
   remote: .
   specs:
-    karafka (2.0.0.rc1)
-      dry-configurable (~> 0.13)
+    karafka (2.0.0.rc2)
       dry-monitor (~> 0.5)
-      dry-validation (~> 1.7)
       rdkafka (>= 0.10)
       thor (>= 0.20)
-      waterdrop (>= 2.3.1, < 3.0.0)
+      waterdrop (>= 2.3.3, < 3.0.0)
       zeitwerk (~> 2.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activejob (7.0.3)
-      activesupport (= 7.0.3)
+    activejob (7.0.3.1)
+      activesupport (= 7.0.3.1)
       globalid (>= 0.3.6)
-    activesupport (7.0.3)
+    activesupport (7.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -28,51 +26,25 @@ GEM
     dry-configurable (0.15.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.6)
-    dry-container (0.9.0)
-      concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.13, >= 0.13.0)
-    dry-core (0.7.1)
+    dry-core (0.8.0)
       concurrent-ruby (~> 1.0)
     dry-events (0.3.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.5, >= 0.5)
-    dry-inflector (0.2.1)
-    dry-initializer (3.1.1)
-    dry-logic (1.2.0)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 0.5, >= 0.5)
-    dry-monitor (0.5.0)
+    dry-monitor (0.6.1)
       dry-configurable (~> 0.13, >= 0.13.0)
       dry-core (~> 0.5, >= 0.5)
       dry-events (~> 0.2)
-    dry-schema (1.9.3)
-      concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.13, >= 0.13.0)
-      dry-core (~> 0.5, >= 0.5)
-      dry-initializer (~> 3.0)
-      dry-logic (~> 1.0)
-      dry-types (~> 1.5)
-    dry-types (1.5.1)
-      concurrent-ruby (~> 1.0)
-      dry-container (~> 0.3)
-      dry-core (~> 0.5, >= 0.5)
-      dry-inflector (~> 0.1, >= 0.1.2)
-      dry-logic (~> 1.0, >= 1.0.2)
-    dry-validation (1.8.1)
-      concurrent-ruby (~> 1.0)
-      dry-container (~> 0.7, >= 0.7.1)
-      dry-core (~> 0.5, >= 0.5)
-      dry-initializer (~> 3.0)
-      dry-schema (~> 1.8, >= 1.8.0)
+      zeitwerk (~> 2.5)
     factory_bot (6.2.1)
       activesupport (>= 5.0.0)
     ffi (1.15.5)
     globalid (1.0.0)
       activesupport (>= 5.0)
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     mini_portile2 (2.8.0)
-    minitest (5.15.0)
+    minitest (5.16.2)
     rake (13.0.6)
     rdkafka (0.12.0)
       ffi (~> 1.15)
@@ -100,11 +72,9 @@ GEM
     thor (1.2.1)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    waterdrop (2.3.1)
+    waterdrop (2.3.3)
       concurrent-ruby (>= 1.1)
-      dry-configurable (~> 0.13)
       dry-monitor (~> 0.5)
-      dry-validation (~> 1.7)
       rdkafka (>= 0.10)
       zeitwerk (~> 2.3)
     zeitwerk (2.6.0)
@@ -121,4 +91,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   2.3.11
+   2.3.15

data/README.md

@@ -28,8 +28,6 @@ class EventsConsumer < ApplicationConsumer
 end
 ```
 
-Karafka allows you to capture everything that happens in your systems in large scale, providing you with a seamless and stable core for consuming, processing and producing data, without having to focus on things that are not your business domain.
-
 Karafka **uses** threads to handle many messages at the same time in the same process. It does not require Rails but will integrate tightly with any Ruby on Rails applications to make event processing dead simple.
 
 ## Getting started

data/config/errors.yml

@@ -1,9 +1,52 @@
 en:
-  dry_validation:
-    errors:
+  validations:
+    config:
+      missing: needs to be present
+      client_id_format: 'needs to be a string with a Kafka accepted format'
+      license.entity_format: needs to be a string
+      license.token_format: needs to be either false or a string
+      license.expires_on_format: needs to be a valid date
+      concurrency_format: needs to be an integer bigger than 0
+      consumer_mapper_format: needs to be present
+      consumer_persistence_format: needs to be either true or false
+      pause_timeout_format: needs to be an integer bigger than 0
+      pause_max_timeout_format: needs to be an integer bigger than 0
+      pause_with_exponential_backoff_format: needs to be either true or false
+      shutdown_timeout_format: needs to be an integer bigger than 0
+      max_wait_time_format: needs to be an integer bigger than 0
+      kafka_format: needs to be a filled hash
+      internal.status_format: needs to be present
+      internal.process_format: needs to be present
+      internal.routing.builder_format: needs to be present
+      internal.routing.subscription_groups_builder_format: needs to be present
+      key_must_be_a_symbol: All keys under the kafka settings scope need to be symbols
       max_timeout_vs_pause_max_timeout: pause_timeout must be less or equal to pause_max_timeout
       shutdown_timeout_vs_max_wait_time: shutdown_timeout must be more than max_wait_time
-      topics_names_not_unique: all topic names within a single consumer group must be unique
-      required_usage_count: Given topic must be used at least once
+
+    server_cli_options:
+      missing: needs to be present
       consumer_groups_inclusion: Unknown consumer group
-      kafka_key_must_be_a_symbol: All keys under the kafka settings scope need to be symbols
+
+    consumer_group_topic:
+      missing: needs to be present
+      name_format: 'needs to be a string with a Kafka accepted format'
+      deserializer_format: needs to be present
+      manual_offset_management_format: needs to be either true or false
+      consumer_format: needs to be present
+      id_format: 'needs to be a string with a Kafka accepted format'
+      initial_offset_format: needs to be either earliest or latest
+
+    consumer_group:
+      missing: needs to be present
+      topics_names_not_unique: all topic names within a single consumer group must be unique
+      id_format: 'needs to be a string with a Kafka accepted format'
+      topics_format: needs to be a non-empty array
+
+    job_options:
+      missing: needs to be present
+      dispatch_method_format: needs to be either :produce_async or :produce_sync
+      partitioner_format: 'needs to respond to #call'
+
+    test:
+      missing: needs to be present
+      id_format: needs to be a String

data/karafka.gemspec

@@ -12,16 +12,14 @@ Gem::Specification.new do |spec|
   spec.authors     = ['Maciej Mensfeld']
   spec.email       = %w[maciej@mensfeld.pl]
   spec.homepage    = 'https://karafka.io'
-  spec.summary     = 'Ruby based framework for working with Apache Kafka'
+  spec.summary     = 'Ruby framework for working with Apache Kafka'
   spec.description = 'Framework used to simplify Apache Kafka based Ruby applications development'
   spec.licenses    = ['LGPL-3.0', 'Commercial']
 
-  spec.add_dependency 'dry-configurable', '~> 0.13'
   spec.add_dependency 'dry-monitor', '~> 0.5'
-  spec.add_dependency 'dry-validation', '~> 1.7'
   spec.add_dependency 'rdkafka', '>= 0.10'
   spec.add_dependency 'thor', '>= 0.20'
-  spec.add_dependency 'waterdrop', '>= 2.3.1', '< 3.0.0'
+  spec.add_dependency 'waterdrop', '>= 2.3.3', '< 3.0.0'
   spec.add_dependency 'zeitwerk', '~> 2.3'
 
   spec.required_ruby_version = '>= 2.6.0'

data/lib/karafka/active_job/job_options_contract.rb

@@ -7,9 +7,15 @@ module Karafka
     #   we want to keep ActiveJob related Karafka components outside of the core Karafka code and
     #   all in the same place
     class JobOptionsContract < Contracts::Base
-      params do
-        optional(:dispatch_method).value(included_in?: %i[produce_async produce_sync])
+      configure do |config|
+        config.error_messages = YAML.safe_load(
+          File.read(
+            File.join(Karafka.gem_root, 'config', 'errors.yml')
+          )
+        ).fetch('en').fetch('validations').fetch('job_options')
       end
+
+      optional(:dispatch_method) { |val| %i[produce_async produce_sync].include?(val) }
     end
   end
 end

data/lib/karafka/cli/install.rb

@@ -7,6 +7,8 @@ module Karafka
   class Cli < Thor
     # Install Karafka Cli action
     class Install < Base
+      include Helpers::Colorize
+
       desc 'Install all required things for Karafka application in current directory'
 
       # Directories created by default
@@ -42,14 +44,25 @@ module Karafka
           FileUtils.mkdir_p Karafka.root.join(dir)
         end
 
+        puts
+        puts 'Installing Karafka framework...'
+        puts 'Ruby on Rails detected...' if rails?
+        puts
+
         INSTALL_FILES_MAP.each do |source, target|
-          target = Karafka.root.join(target)
+          pathed_target = Karafka.root.join(target)
 
           template = File.read(Karafka.core_root.join("templates/#{source}"))
           render = ::ERB.new(template, trim_mode: '-').result(binding)
 
-          File.open(target, 'w') { |file| file.write(render) }
+          File.open(pathed_target, 'w') { |file| file.write(render) }
+
+          puts "#{green('Created')} #{target}"
         end
+
+        puts
+        puts("Installation #{green('completed')}. Have fun!")
+        puts
       end
 
       # @return [Boolean] true if we have Rails loaded

data/lib/karafka/cli/server.rb

@@ -5,6 +5,8 @@ module Karafka
   class Cli < Thor
     # Server Karafka Cli action
     class Server < Base
+      include Helpers::Colorize
+
       desc 'Start the Karafka server (short-cut alias: "s")'
       option aliases: 's'
       option :consumer_groups, type: :array, default: nil, aliases: :g
@@ -31,11 +33,11 @@ module Karafka
 
         if Karafka.pro?
           Karafka.logger.info(
-            "\033[0;32mThank you for investing in the Karafka Pro subscription!\033[0m\n"
+            green('Thank you for investing in the Karafka Pro subscription!')
           )
         else
           Karafka.logger.info(
-            "\033[0;31mYou like Karafka? Please consider getting a Pro subscription!\033[0m\n"
+            red('You like Karafka? Please consider getting a Pro version!')
           )
         end
       end

data/lib/karafka/contracts/base.rb

@@ -3,20 +3,14 @@
 module Karafka
   module Contracts
     # Base contract for all Karafka contracts
-    class Base < Dry::Validation::Contract
-      config.messages.load_paths << File.join(Karafka.gem_root, 'config', 'errors.yml')
-
+    class Base < ::WaterDrop::Contractable::Contract
       # @param data [Hash] data for validation
       # @return [Boolean] true if all good
       # @raise [Errors::InvalidConfigurationError] invalid configuration error
       # @note We use contracts only in the config validation context, so no need to add support
       #   for multiple error classes. It will be added when it will be needed.
       def validate!(data)
-        result = call(data)
-
-        return true if result.success?
-
-        raise Errors::InvalidConfigurationError, result.errors.to_h
+        super(data, Errors::InvalidConfigurationError)
       end
     end
   end

data/lib/karafka/contracts/config.rb

@@ -9,71 +9,90 @@ module Karafka
     #   validated per each route (topic + consumer_group) because they can be overwritten,
     #   so we validate all of that once all the routes are defined and ready.
     class Config < Base
-      params do
-        # License validity happens in the licenser. Here we do only the simple consistency checks
-        required(:license).schema do
-          required(:token) { bool? | str? }
-          required(:entity) { str? }
-          required(:expires_on) { date? }
+      configure do |config|
+        config.error_messages = YAML.safe_load(
+          File.read(
+            File.join(Karafka.gem_root, 'config', 'errors.yml')
+          )
+        ).fetch('en').fetch('validations').fetch('config')
+      end
+
+      # License validity happens in the licenser. Here we do only the simple consistency checks
+      nested(:license) do
+        required(:token) { |val| [true, false].include?(val) || val.is_a?(String) }
+        required(:entity) { |val| val.is_a?(String) }
+        required(:expires_on) { |val| val.is_a?(Date) }
+      end
+
+      required(:client_id) { |val| val.is_a?(String) && Contracts::TOPIC_REGEXP.match?(val) }
+      required(:concurrency) { |val| val.is_a?(Integer) && val.positive? }
+      required(:consumer_mapper) { |val| !val.nil? }
+      required(:consumer_persistence) { |val| [true, false].include?(val) }
+      required(:pause_timeout) { |val| val.is_a?(Integer) && val.positive? }
+      required(:pause_max_timeout) { |val| val.is_a?(Integer) && val.positive? }
+      required(:pause_with_exponential_backoff) { |val| [true, false].include?(val) }
+      required(:shutdown_timeout) { |val| val.is_a?(Integer) && val.positive? }
+      required(:max_wait_time) { |val| val.is_a?(Integer) && val.positive? }
+      required(:kafka) { |val| val.is_a?(Hash) && !val.empty? }
+
+      # We validate internals just to be sure, that they are present and working
+      nested(:internal) do
+        required(:status) { |val| !val.nil? }
+        required(:process) { |val| !val.nil? }
+
+        nested(:routing) do
+          required(:builder) { |val| !val.nil? }
+          required(:subscription_groups_builder) { |val| !val.nil? }
+        end
+
+        nested(:processing) do
+          required(:jobs_builder) { |val| !val.nil? }
+          required(:scheduler) { |val| !val.nil? }
+          required(:coordinator_class) { |val| !val.nil? }
+          required(:partitioner_class) { |val| !val.nil? }
         end
 
-        required(:client_id).filled(:str?, format?: Karafka::Contracts::TOPIC_REGEXP)
-        required(:concurrency) { int? & gt?(0) }
-        required(:consumer_mapper).filled
-        required(:consumer_persistence).filled(:bool?)
-        required(:pause_timeout) { int? & gt?(0) }
-        required(:pause_max_timeout) { int? & gt?(0) }
-        required(:pause_with_exponential_backoff).filled(:bool?)
-        required(:shutdown_timeout) { int? & gt?(0) }
-        required(:max_wait_time) { int? & gt?(0) }
-        required(:kafka).filled(:hash)
-
-        # We validate internals just to be sure, that they are present and working
-        required(:internal).schema do
-          required(:status)
-          required(:process)
-
-          required(:routing).schema do
-            required(:builder)
-            required(:subscription_groups_builder)
-          end
-
-          required(:processing).schema do
-            required(:jobs_builder)
-            required(:scheduler)
-            required(:coordinator_class)
-            required(:partitioner_class)
-          end
-
-          required(:active_job).schema do
-            required(:dispatcher)
-            required(:job_options_contract)
-            required(:consumer_class)
-          end
+        nested(:active_job) do
+          required(:dispatcher) { |val| !val.nil? }
+          required(:job_options_contract) { |val| !val.nil? }
+          required(:consumer_class) { |val| !val.nil? }
         end
       end
 
-      # rdkafka requires all the keys to be strings, so we ensure that
-      rule(:kafka) do
-        next unless value.is_a?(Hash)
+      virtual do |data, errors|
+        next unless errors.empty?
+
+        detected_errors = []
 
-        value.each_key do |key|
+        data.fetch(:kafka).each_key do |key|
           next if key.is_a?(Symbol)
 
-          key(:"kafka.#{key}").failure(:kafka_key_must_be_a_symbol)
+          detected_errors << [[:kafka, key], :key_must_be_a_symbol]
         end
+
+        detected_errors
       end
 
-      rule(:pause_timeout, :pause_max_timeout) do
-        if values[:pause_timeout].to_i > values[:pause_max_timeout].to_i
-          key(:pause_timeout).failure(:max_timeout_vs_pause_max_timeout)
-        end
+      virtual do |data, errors|
+        next unless errors.empty?
+
+        pause_timeout = data.fetch(:pause_timeout)
+        pause_max_timeout = data.fetch(:pause_max_timeout)
+
+        next if pause_timeout <= pause_max_timeout
+
+        [[%i[pause_timeout], :max_timeout_vs_pause_max_timeout]]
       end
 
-      rule(:shutdown_timeout, :max_wait_time) do
-        if values[:max_wait_time].to_i >= values[:shutdown_timeout].to_i
-          key(:shutdown_timeout).failure(:shutdown_timeout_vs_max_wait_time)
-        end
+      virtual do |data, errors|
+        next unless errors.empty?
+
+        shutdown_timeout = data.fetch(:shutdown_timeout)
+        max_wait_time = data.fetch(:max_wait_time)
+
+        next if max_wait_time < shutdown_timeout
+
+        [[%i[shutdown_timeout], :shutdown_timeout_vs_max_wait_time]]
       end
     end
   end

data/lib/karafka/contracts/consumer_group.rb

@@ -4,32 +4,39 @@ module Karafka
   module Contracts
     # Contract for single full route (consumer group + topics) validation.
     class ConsumerGroup < Base
-      # Internal contract for sub-validating topics schema
-      TOPIC_CONTRACT = ConsumerGroupTopic.new.freeze
+      configure do |config|
+        config.error_messages = YAML.safe_load(
+          File.read(
+            File.join(Karafka.gem_root, 'config', 'errors.yml')
+          )
+        ).fetch('en').fetch('validations').fetch('consumer_group')
+      end
 
-      private_constant :TOPIC_CONTRACT
+      required(:id) { |id| id.is_a?(String) && Contracts::TOPIC_REGEXP.match?(id) }
+      required(:topics) { |topics| topics.is_a?(Array) && !topics.empty? }
 
-      params do
-        required(:id).filled(:str?, format?: Karafka::Contracts::TOPIC_REGEXP)
-        required(:topics).value(:array, :filled?)
-      end
+      virtual do |data, errors|
+        next unless errors.empty?
 
-      rule(:topics) do
-        if value.is_a?(Array)
-          names = value.map { |topic| topic[:name] }
+        names = data.fetch(:topics).map { |topic| topic[:name] }
 
-          key.failure(:topics_names_not_unique) if names.size != names.uniq.size
-        end
+        next if names.size == names.uniq.size
+
+        [[%i[topics], :names_not_unique]]
       end
 
-      rule(:topics) do
-        if value.is_a?(Array)
-          value.each_with_index do |topic, index|
-            TOPIC_CONTRACT.call(topic).errors.each do |error|
-              key([:topics, index, error.path[0]]).failure(error.text)
-            end
+      virtual do |data, errors|
+        next unless errors.empty?
+
+        fetched_errors = []
+
+        data.fetch(:topics).each do |topic|
+          ConsumerGroupTopic.new.call(topic).errors.each do |key, value|
+            fetched_errors << [[topic, key].flatten, value]
           end
         end
+
+        fetched_errors
       end
     end
   end

data/lib/karafka/contracts/consumer_group_topic.rb

@@ -4,24 +4,38 @@ module Karafka
   module Contracts
     # Consumer group topic validation rules.
     class ConsumerGroupTopic < Base
-      params do
-        required(:consumer).filled
-        required(:deserializer).filled
-        required(:id).filled(:str?, format?: Karafka::Contracts::TOPIC_REGEXP)
-        required(:kafka).filled
-        required(:max_messages) { int? & gteq?(1) }
-        required(:initial_offset).filled(included_in?: %w[earliest latest])
-        required(:max_wait_time).filled { int? & gteq?(10) }
-        required(:manual_offset_management).filled(:bool?)
-        required(:name).filled(:str?, format?: Karafka::Contracts::TOPIC_REGEXP)
+      configure do |config|
+        config.error_messages = YAML.safe_load(
+          File.read(
+            File.join(Karafka.gem_root, 'config', 'errors.yml')
+          )
+        ).fetch('en').fetch('validations').fetch('consumer_group_topic')
       end
 
-      rule(:kafka) do
-        # This will trigger rdkafka validations that we catch and re-map the info and use dry
-        # compatible format
-        Rdkafka::Config.new(value).send(:native_config)
-      rescue Rdkafka::Config::ConfigError => e
-        key(:kafka).failure(e.message)
+      required(:consumer) { |consumer_group| !consumer_group.nil? }
+      required(:deserializer) { |deserializer| !deserializer.nil? }
+      required(:id) { |id| id.is_a?(String) && Contracts::TOPIC_REGEXP.match?(id) }
+      required(:kafka) { |kafka| kafka.is_a?(Hash) && !kafka.empty? }
+      required(:max_messages) { |mm| mm.is_a?(Integer) && mm >= 1 }
+      required(:initial_offset) { |io| %w[earliest latest].include?(io) }
+      required(:max_wait_time) { |mwt| mwt.is_a?(Integer) && mwt >= 10 }
+      required(:manual_offset_management) { |mmm| [true, false].include?(mmm) }
+      required(:name) { |name| name.is_a?(String) && Contracts::TOPIC_REGEXP.match?(name) }
+
+      virtual do |data, errors|
+        next unless errors.empty?
+
+        value = data.fetch(:kafka)
+
+        begin
+          # This will trigger rdkafka validations that we catch and re-map the info and use dry
+          # compatible format
+          Rdkafka::Config.new(value).send(:native_config)
+
+          nil
+        rescue Rdkafka::Config::ConfigError => e
+          [[%w[kafka], e.message]]
+        end
       end
     end
   end

data/lib/karafka/contracts/server_cli_options.rb

@@ -4,17 +4,28 @@ module Karafka
   module Contracts
     # Contract for validating correctness of the server cli command options.
     class ServerCliOptions < Base
-      params do
-        optional(:consumer_groups).value(:array, :filled?)
+      configure do |config|
+        config.error_messages = YAML.safe_load(
+          File.read(
+            File.join(Karafka.gem_root, 'config', 'errors.yml')
+          )
+        ).fetch('en').fetch('validations').fetch('server_cli_options')
       end
 
-      rule(:consumer_groups) do
+      optional(:consumer_groups) { |cg| cg.is_a?(Array) && !cg.empty? }
+
+      virtual do |data, errors|
+        next unless errors.empty?
+        next unless data.key?(:consumer_groups)
+
+        value = data.fetch(:consumer_groups)
+
         # If there were no consumer_groups declared in the server cli, it means that we will
         # run all of them and no need to validate them here at all
-        if !value.nil? &&
-           !(value - Karafka::App.config.internal.routing.builder.map(&:name)).empty?
-          key(:consumer_groups).failure(:consumer_groups_inclusion)
-        end
+        next if value.nil?
+        next if (value - Karafka::App.config.internal.routing.builder.map(&:name)).empty?
+
+        [[%i[consumer_groups], :consumer_groups_inclusion]]
       end
     end
   end

data/lib/karafka/helpers/colorize.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Karafka
+  module Helpers
+    # Simple wrapper for adding colors to strings
+    module Colorize
+      # @param string [String] string we want to have in green
+      # @return [String] green string
+      def green(string)
+        "\033[0;32m#{string}\033[0m"
+      end
+
+      # @param string [String] string we want to have in red
+      # @return [String] red string
+      def red(string)
+        "\033[0;31m#{string}\033[0m"
+      end
+    end
+  end
+end

data/lib/karafka/pro/active_job/job_options_contract.rb

@@ -14,13 +14,17 @@ module Karafka
     module ActiveJob
       # Contract for validating the options that can be altered with `#karafka_options` per job
       # class that works with Pro features.
-      class JobOptionsContract < ::Karafka::ActiveJob::JobOptionsContract
-        # Dry types
-        Types = include Dry.Types()
-
-        params do
-          optional(:partitioner).value(Types.Interface(:call))
+      class JobOptionsContract < Contracts::Base
+        configure do |config|
+          config.error_messages = YAML.safe_load(
+            File.read(
+              File.join(Karafka.gem_root, 'config', 'errors.yml')
+            )
+          ).fetch('en').fetch('validations').fetch('job_options')
         end
+
+        optional(:dispatch_method) { |val| %i[produce_async produce_sync].include?(val) }
+        optional(:partitioner) { |val| val.respond_to?(:call) }
       end
     end
   end

data/lib/karafka/setup/config.rb

@@ -12,7 +12,7 @@ module Karafka
     #   enough and will still keep the code simple
     # @see Karafka::Setup::Configurators::Base for more details about configurators api
     class Config
-      extend Dry::Configurable
+      extend ::WaterDrop::Configurable
 
       # Defaults for kafka settings, that will be overwritten only if not present already
       KAFKA_DEFAULTS = {
@@ -62,7 +62,7 @@ module Karafka
       # options max_messages [Integer] how many messages do we want to fetch from Kafka in one go
       setting :max_messages, default: 1_000
       # option [Integer] number of milliseconds we can wait while fetching data
-      setting :max_wait_time, default: 10_000
+      setting :max_wait_time, default: 5_000
       # option shutdown_timeout [Integer] the number of milliseconds after which Karafka no
       #   longer waits for the consumers to stop gracefully but instead we force terminate
       #   everything.
@@ -123,6 +123,10 @@ module Karafka
         end
       end
 
+      # This will load all the defaults that can be later overwritten.
+      # Thanks to that we have an initial state out of the box.
+      configure
+
       class << self
         # Configuring method
         # @param block [Proc] block we want to execute with the config instance

data/lib/karafka/templates/example_consumer.rb.erb

@@ -7,10 +7,10 @@ class ExampleConsumer < ApplicationConsumer
   end
 
   # Run anything upon partition being revoked
-  # def on_revoked
+  # def revoked
   # end
 
   # Define here any teardown things you want when Karafka server stops
-  # def on_shutdown
+  # def shutdown
   # end
 end

data/lib/karafka/version.rb

@@ -3,5 +3,5 @@
 # Main module namespace
 module Karafka
   # Current Karafka version
-  VERSION = '2.0.0.rc1'
+  VERSION = '2.0.0.rc2'
 end

data/lib/karafka.rb

@@ -12,8 +12,6 @@
   openssl
   base64
   date
-  dry-configurable
-  dry-validation
   dry/events/publisher
   dry/monitor/notifications
   zeitwerk

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: karafka
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
+  version: 2.0.0.rc2
 platform: ruby
 authors:
 - Maciej Mensfeld
@@ -34,22 +34,8 @@ cert_chain:
   R2P11bWoCtr70BsccVrN8jEhzwXngMyI2gVt750Y+dbTu1KgRqZKp/ECe7ZzPzXj
   pIy9vHxTANKYVyI4qj8OrFdEM5BQNu8oQpL0iQ==
   -----END CERTIFICATE-----
-date: 2022-07-08 00:00:00.000000000 Z
+date: 2022-07-19 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: dry-configurable
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.13'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: dry-monitor
   requirement: !ruby/object:Gem::Requirement
@@ -64,20 +50,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
-- !ruby/object:Gem::Dependency
-  name: dry-validation
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rdkafka
   requirement: !ruby/object:Gem::Requirement
@@ -112,7 +84,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: 2.3.3
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -122,7 +94,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: 2.3.3
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -212,6 +184,7 @@ files:
 - lib/karafka/env.rb
 - lib/karafka/errors.rb
 - lib/karafka/helpers/async.rb
+- lib/karafka/helpers/colorize.rb
 - lib/karafka/helpers/multi_delegator.rb
 - lib/karafka/instrumentation.rb
 - lib/karafka/instrumentation/callbacks/error.rb
@@ -308,5 +281,5 @@ requirements: []
 rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
-summary: Ruby based framework for working with Apache Kafka
+summary: Ruby framework for working with Apache Kafka
 test_files: []