waterdrop 1.2.1 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ca8a589d1b25ca64ff4fe5e0b9b501a73aa70fe14901b6d9a5da7e6792cad89
-  data.tar.gz: bd75fb0f84eab0ebdc69412e72bd7132a327c545585e7ff5c04d0e3771be82dd
+  metadata.gz: 16e9f91529a5da89677a60544ce9155394740a91d6fae583308f3a44b95ab3ff
+  data.tar.gz: 49a4f2d7d76a528c1f51ee53275f85e943128822f3843fd8eace07482a9b5b7a
 SHA512:
-  metadata.gz: c0e6501922e0e3fac96db78e8666b800fb1a8244e136c88b21f8af808803b5aaad81fb24726bb3d84eacba19a933dbde31660c94b3b0d992123cac66d032f824
-  data.tar.gz: f85d2617e9139e84b70b23221f92efa9f04c188da04b0077c945b0da978733aa9f9dbfc87b089c907faadb30b0931cd93bfd099914f9b258a4ab788f0cafcd8e
+  metadata.gz: 9d194a32da0ef7dbdeb14b063dc959a240ac5658a238812046baad037a7e25cff2e9ac8cfe91166cf2e0ad9b3972d78b6760bc2e48ee1c214ed32d25378d5336
+  data.tar.gz: 8b9aa9263ba3774e54692b9baae4839ef8b2689be2687ed0672fa23014ff9bb23437c756bbf07d4d7b38164d8d3a49a8ee17acfb0b1ae193e2279881951cffb4

data/.ruby-version

@@ -1 +1 @@
-2.5.0
+2.5.1

data/.travis.yml

@@ -1,18 +1,21 @@
-language: ruby
+dist: trusty
 sudo: false
+language: ruby
+cache: bundler
+
 rvm:
-  - 2.3.0
-  - 2.3.1
-  - 2.3.2
-  - 2.3.3
-  - 2.3.4
-  - 2.4.0
-  - 2.4.1
-  - 2.4.2
-  - 2.5.0
-  - jruby-head
-script: bundle exec rspec spec/
+  - 2.3.7
+  - 2.4.4
+  - 2.5.1
+  - ruby-head
+  - jruby-9.2.0.0
+
 env:
   global:
     - JRUBY_OPTS='--debug'
-install: bundle install --jobs=3 --retry=3
+
+before_install:
+  - gem install bundler
+  - gem update --system
+
+script: bundle exec rspec

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # WaterDrop changelog
 
+## 1.2.3
+- Lock ruby-kafka to 0.6 (0.7 support targeted for WaterDrop 1.3)
+
+## 1.2.2
+- #55 - Codec settings unification and config applier
+
 ## 1.2.1
 - #54 - compression_codec api sync with king-konf requirements
 

data/Gemfile

@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 
 gemspec
 
-group :development, :test do
+group :test do
   gem 'rspec'
   gem 'simplecov'
 end

data/Gemfile.lock

@@ -1,34 +1,37 @@
 PATH
   remote: .
   specs:
-    waterdrop (1.2.1)
+    waterdrop (1.2.3)
       delivery_boy (~> 0.2)
       dry-configurable (~> 0.7)
       dry-monitor (~> 0.1)
       dry-validation (~> 0.11)
       null-logger (~> 0.1)
+      ruby-kafka (~> 0.6.8)
 
 GEM
   remote: https://rubygems.org/
   specs:
     concurrent-ruby (1.0.5)
-    delivery_boy (0.2.4)
-      king_konf (~> 0.1.8)
-      ruby-kafka (~> 0.5.1)
+    concurrent-ruby (1.0.5-java)
+    delivery_boy (0.2.7)
+      king_konf (~> 0.2)
+      ruby-kafka (~> 0.5)
     diff-lcs (1.3)
-    docile (1.3.0)
+    docile (1.3.1)
     dry-configurable (0.7.0)
       concurrent-ruby (~> 1.0)
     dry-container (0.6.0)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.4.5)
+    dry-core (0.4.7)
       concurrent-ruby (~> 1.0)
-    dry-equalizer (0.2.0)
+    dry-equalizer (0.2.1)
     dry-events (0.1.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.4)
       dry-equalizer (~> 0.2)
+    dry-inflector (0.1.2)
     dry-logic (0.4.2)
       dry-container (~> 0.2, >= 0.2.6)
       dry-core (~> 0.2)
@@ -38,40 +41,39 @@ GEM
       dry-equalizer (~> 0.2)
       dry-events (~> 0.1)
       rouge (~> 2.0, >= 2.2.1)
-    dry-types (0.12.2)
+    dry-types (0.13.2)
       concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.1)
       dry-container (~> 0.3)
-      dry-core (~> 0.2, >= 0.2.1)
+      dry-core (~> 0.4, >= 0.4.4)
       dry-equalizer (~> 0.2)
+      dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 0.4, >= 0.4.2)
-      inflecto (~> 0.0.0, >= 0.0.2)
-    dry-validation (0.11.1)
+    dry-validation (0.12.1)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
       dry-core (~> 0.2, >= 0.2.1)
       dry-equalizer (~> 0.2)
       dry-logic (~> 0.4, >= 0.4.0)
-      dry-types (~> 0.12.0)
-    inflecto (0.0.2)
+      dry-types (~> 0.13.1)
     json (2.1.0)
-    king_konf (0.1.10)
+    json (2.1.0-java)
+    king_konf (0.3.6)
     null-logger (0.1.5)
     rouge (2.2.1)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    ruby-kafka (0.5.4)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    ruby-kafka (0.6.8)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -79,6 +81,7 @@ GEM
     simplecov-html (0.10.2)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
@@ -87,4 +90,4 @@ DEPENDENCIES
   waterdrop!
 
 BUNDLED WITH
-   1.16.1
+   1.16.3

data/lib/water_drop.rb

@@ -23,22 +23,8 @@ module WaterDrop
     # @param [Block] block configuration block
     def setup(&block)
       Config.setup(&block)
-
       DeliveryBoy.logger = self.logger = config.logger
-
-      # Recursive lambda for mapping config down to delivery boy
-      applier = lambda { |db_config, h|
-        h.each do |k, v|
-          applier.call(db_config, v) && next if v.is_a?(Hash)
-          next unless db_config.respond_to?(:"#{k}=")
-          db_config.public_send(:"#{k}=", v)
-        end
-      }
-
-      DeliveryBoy.config.tap do |config|
-        config.brokers = Config.config.kafka.seed_brokers
-        applier.call(config, Config.config.to_h)
-      end
+      ConfigApplier.call(DeliveryBoy.config, Config.config.to_h)
     end
 
     # @return [WaterDrop::Config] config instance
@@ -65,6 +51,7 @@ end
   schemas/message_options
   schemas/config
   config
+  config_applier
   errors
   base_producer
   sync_producer

data/lib/water_drop/config.rb

@@ -110,17 +110,6 @@ module WaterDrop
       setting :sasl_scram_mechanism, nil
     end
 
-    # option producer [Hash] - optional - producer configuration options
-    setting :producer do
-      # option compression_codec [Symbol] Sets producer compression codec
-      # More: https://github.com/zendesk/ruby-kafka#compression
-      # More: https://github.com/zendesk/ruby-kafka/blob/master/lib/kafka/compression.rb
-      setting :compression_codec, nil
-      # option compression_codec [Integer] Sets producer compression threshold
-      # More: https://github.com/zendesk/ruby-kafka#compression
-      setting :compression_threshold, 1
-    end
-
     class << self
       # Configurating method
       # @yield Runs a block of code providing a config singleton instance to it

data/lib/water_drop/config_applier.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module WaterDrop
+  # Engine used to propagate config application to DeliveryBoy with corner case handling
+  module ConfigApplier
+    class << self
+      # @param delivery_boy_config [DeliveryBoy::Config] delivery boy config instance
+      # @param settings [Hash] hash with WaterDrop settings
+      def call(delivery_boy_config, settings)
+        # Recursive lambda for mapping config down to delivery boy
+        settings.each do |key, value|
+          call(delivery_boy_config, value) && next if value.is_a?(Hash)
+
+          # If this is a special case that needs manual setup instead of a direct reassignment
+          if respond_to?(key, true)
+            send(key, delivery_boy_config, value)
+          else
+            # If this setting is our internal one, we should not sync it with the delivery boy
+            next unless delivery_boy_config.respond_to?(:"#{key}=")
+
+            delivery_boy_config.public_send(:"#{key}=", value)
+          end
+        end
+      end
+
+      private
+
+      # Extra setup for the compression codec as it behaves differently than other settings
+      # that are ported 1:1 from ruby-kafka
+      # For some crazy reason, delivery boy requires compression codec as a string, when
+      # ruby-kafka as a symbol. We follow ruby-kafka internal design, so we had to mimic
+      # that by assigning a stringified version that down the road will be symbolized again
+      # by delivery boy
+      # @param delivery_boy_config [DeliveryBoy::Config] delivery boy config instance
+      # @param codec_name [Symbol] codec name as a symbol
+      def compression_codec(delivery_boy_config, codec_name)
+        # If there is no compression codec, we don't apply anything
+        return unless codec_name
+        delivery_boy_config.compression_codec = codec_name.to_s
+      end
+
+      # We use the "seed_brokers" name and DeliveryBoy uses "brokers" so we pass the values
+      #   manually
+      # @param delivery_boy_config [DeliveryBoy::Config] delivery boy config instance
+      # @param seed_brokers [Array<String>] kafka seed brokers
+      def seed_brokers(delivery_boy_config, seed_brokers)
+        delivery_boy_config.brokers = seed_brokers
+      end
+    end
+  end
+end

data/lib/water_drop/schemas/config.rb

@@ -37,10 +37,10 @@ module WaterDrop
 
       required(:kafka).schema do
         required(:seed_brokers).filled { each(:broker_schema?) }
-        required(:connect_timeout).filled { (int? | float?) & gt?(0) }
-        required(:socket_timeout).filled { (int? | float?) & gt?(0) }
+        required(:connect_timeout).filled(:int?, gt?: 0)
+        required(:socket_timeout).filled(:int?, gt?: 0)
         required(:compression_threshold).filled(:int?, gteq?: 1)
-        optional(:compression_codec).maybe(included_in?: %w[snappy gzip lz4])
+        optional(:compression_codec).maybe(included_in?: %i[snappy gzip lz4])
 
         required(:max_buffer_bytesize).filled(:int?, gt?: 0)
         required(:max_buffer_size).filled(:int?, gt?: 0)

data/lib/water_drop/version.rb

@@ -3,5 +3,5 @@
 # WaterDrop library
 module WaterDrop
   # Current WaterDrop version
-  VERSION = '1.2.1'
+  VERSION = '1.2.3'
 end

data/waterdrop.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'dry-monitor', '~> 0.1'
   spec.add_dependency 'dry-validation', '~> 0.11'
   spec.add_dependency 'null-logger', '~> 0.1'
+  spec.add_dependency 'ruby-kafka', '~> 0.6.8'
 
   spec.required_ruby_version = '>= 2.2.0'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waterdrop
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.3
 platform: ruby
 authors:
 - Maciej Mensfeld
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-26 00:00:00.000000000 Z
+date: 2018-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: delivery_boy
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: ruby-kafka
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.8
 description: Kafka messaging made easy!
 email:
 - maciej@mensfeld.pl
@@ -102,6 +116,7 @@ files:
 - lib/water_drop/async_producer.rb
 - lib/water_drop/base_producer.rb
 - lib/water_drop/config.rb
+- lib/water_drop/config_applier.rb
 - lib/water_drop/errors.rb
 - lib/water_drop/instrumentation/listener.rb
 - lib/water_drop/instrumentation/monitor.rb
@@ -131,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Kafka messaging made easy!