waterdrop 0.3.2 → 0.3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab65b6b8e98a843a2c27d89bd739cfc3b3d1bce4
-  data.tar.gz: e724e7d3cfb190542fd94143ae02535e143181d8
+  metadata.gz: c8ac470555284f98026eafbe5e1d19e0feb9c3dd
+  data.tar.gz: 4d81437a65a107354a0891a872a6fd865e87cbce
 SHA512:
-  metadata.gz: c5f23ebad58c98bc249e538a90f1fc053ff2539a54d27caaff42101b682435152b49ce6948c66755d41f472b83da72f2f71dbb6c508e0fdc42d43bc5cc2d8d80
-  data.tar.gz: cf4e30a81f495d65a422989163028db62e65e4f3fc28a5a319d8abc2daf89b0c403eadfa1f3f3f50473397326a0f407bcabbaded4a8fe0f42dc698f96a86e5a6
+  metadata.gz: 665b6bb116db059a75f94b27bf7b2e33d09ec3854713f76ebf7c83a850ed47c419a41bccec4dbb431cc2d7d0f82b71092e3ffd9db1064fd40e0decd13eb3e42b
+  data.tar.gz: 7c21c6c9e54da94b7a01f32090f86075cc976a937f84f44bc5e978806748a84c3856140ac81af207856d536e1f91278bb91cc26d45032e068ee8a47ef8c72172

data/CHANGELOG.md

@@ -4,6 +4,7 @@
 - Removed support for Ruby 2.1.*
 - Ruby 2.3.1 as default
 - Gem dump
+- Dry configurable config (#20)
 
 ## 0.3.1
 - Dev tools update

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    waterdrop (0.3.2)
+    waterdrop (0.3.2.1)
       bundler
       connection_pool
+      dry-configurable (~> 0.1.7)
       null-logger
       rake
       ruby-kafka
@@ -38,6 +39,8 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
     docile (1.1.5)
+    dry-configurable (0.1.7)
+      concurrent-ruby (~> 1.0)
     equalizer (0.0.11)
     erubis (2.7.0)
     faker (1.6.6)
@@ -65,7 +68,7 @@ GEM
       addressable (~> 2.3)
     method_source (0.8.2)
     minitest (5.9.0)
-    null-logger (0.1.1)
+    null-logger (0.1.3)
     parser (2.3.1.2)
       ast (~> 2.2)
     path_expander (1.0.0)
@@ -115,7 +118,7 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     rubocop-rspec (1.5.1)
       rubocop (>= 0.41.2)
-    ruby-kafka (0.3.12)
+    ruby-kafka (0.3.15)
     ruby-progressbar (1.8.1)
     ruby_parser (3.8.2)
       sexp_processor (~> 4.1)
@@ -164,4 +167,4 @@ DEPENDENCIES
   waterdrop!
 
 BUNDLED WITH
-   1.11.2
+   1.12.5

data/README.md

@@ -32,7 +32,7 @@ WaterDrop has following configuration options:
 | Option                  | Value type    | Description                      |
 |-------------------------|---------------|----------------------------------|
 | send_messages           | Boolean       | Should we send messages to Kafka |
-| kafka_hosts             | Array<String> | Kafka servers hosts with ports   |
+| kafka.hosts             | Array<String> | Kafka servers hosts with ports   |
 | connection_pool_size    | Integer       | Kafka connection pool size       |
 | connection_pool_timeout | Integer       | Kafka connection pool timeout    |
 | raise_on_failure        | Boolean       | Should we raise an exception when we cannot send message to Kafka - if false will silently ignore failures (will just ignore them) |
@@ -44,7 +44,7 @@ WaterDrop.setup do |config|
   config.send_messages = true
   config.connection_pool_size = 20
   config.connection_pool_timeout = 1
-  config.kafka_hosts = ['localhost:9092']
+  config.kafka.hosts = ['localhost:9092']
   config.raise_on_failure = true
 end
 ```
@@ -56,7 +56,7 @@ WaterDrop.setup do |config|
   config.send_messages = Rails.env.production?
   config.connection_pool_size = 20
   config.connection_pool_timeout = 1
-  config.kafka_hosts = [Rails.env.production? ? 'prod-host:9091' : 'localhost:9092']
+  config.kafka.hosts = [Rails.env.production? ? 'prod-host:9091' : 'localhost:9092']
   config.raise_on_failure = Rails.env.production?
 end
 ```

data/lib/water_drop.rb

@@ -10,6 +10,7 @@
   forwardable
   connection_pool
   null_logger
+  dry-configurable
 ).each { |lib| require lib }
 
 # Internal components

data/lib/water_drop/config.rb

@@ -1,40 +1,33 @@
 module WaterDrop
   # Configurator for setting up all options required by WaterDrop
   class Config
-    class << self
-      attr_accessor :config
-    end
+    extend Dry::Configurable
 
     # Available options
-    # @option connection_pool_size [Fixnum] The number of connections to pool.
     # @option connection_pool_timeout [Fixnum] Amount of time in seconds to wait for a connection
     #         if none currently available.
-    # @option kafka_hosts [Array<String>] Array that contains Kafka hosts with ports
+    setting :connection_pool_timeout
     # @option send_messages [Boolean] boolean value to define whether messages should be sent
+    setting :send_messages
     # @option raise_on_failure [Boolean] Should raise error when failed to deliver a message
-    OPTIONS = %i(
-      connection_pool_size
-      connection_pool_timeout
-      kafka_hosts
-      send_messages
-      raise_on_failure
-    ).freeze
-
-    OPTIONS.each do |attr_name|
-      attr_accessor attr_name
-
-      # @return [Boolean] is given command enabled
-      define_method :"#{attr_name}?" do
-        public_send(attr_name) == true
-      end
+    setting :raise_on_failure
+    # @option connection_pool_size [Fixnum] The number of connections to pool.
+    setting :connection_pool_size
+    # option kafka [Hash] - optional - kafka configuration options (hosts)
+    setting :kafka do
+      # @option hosts [Array<String>] Array that contains Kafka hosts with ports
+      setting :hosts
     end
 
-    # Configurating method
-    def self.setup(&block)
-      self.config = new
-
-      block.call(config)
-      config.freeze
+    class << self
+      # Configurating method
+      # @yield Runs a block of code providing a config singleton instance to it
+      # @yieldparam [WaterDrop::Config] WaterDrop config instance
+      def setup
+        configure do |config|
+          yield(config)
+        end
+      end
     end
   end
 end

data/lib/water_drop/message.rb

@@ -21,7 +21,7 @@ module WaterDrop
     # @example Set a message
     #   WaterDrop::Message.new(topic, message).send!
     def send!
-      return true unless ::WaterDrop.config.send_messages?
+      return true unless ::WaterDrop.config.send_messages
 
       Pool.with { |producer| producer.send_message(self) }
 
@@ -31,7 +31,7 @@ module WaterDrop
       ::WaterDrop.logger.error(e)
       # Reraise if we want to raise on failure
       # Ignore if we dont want to know that something went wrong
-      return unless ::WaterDrop.config.raise_on_failure?
+      return unless ::WaterDrop.config.raise_on_failure
       raise(e)
     end
   end

data/lib/water_drop/producer_proxy.rb

@@ -54,7 +54,7 @@ module WaterDrop
     # @return [Kafka::Producer] producer instance to which we can forward method requests
     def producer
       reload! if dead?
-      @producer ||= Kafka.new(seed_brokers: ::WaterDrop.config.kafka_hosts).producer
+      @producer ||= Kafka.new(seed_brokers: ::WaterDrop.config.kafka.hosts).producer
     end
 
     # @return [Boolean] true if we cannot use producer anymore because it was not used for a

data/lib/water_drop/version.rb

@@ -2,5 +2,5 @@
 # WaterDrop library
 module WaterDrop
   # Current WaterDrop version
-  VERSION = '0.3.2'
+  VERSION = '0.3.2.1'
 end

data/waterdrop.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'ruby-kafka', '>= 0'
   spec.add_dependency 'connection_pool', '>= 0'
   spec.add_dependency 'null-logger'
+  spec.add_dependency 'dry-configurable', '~> 0.1.7'
   spec.required_ruby_version = '>= 2.2.0'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(spec)/}) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: waterdrop
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.2.1
 platform: ruby
 authors:
 - Maciej Mensfeld
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-28 00:00:00.000000000 Z
+date: 2016-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,6 +81,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dry-configurable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.7
 description: Kafka messaging made easy!
 email:
 - maciej@mensfeld.pl