phobos 1.8.0 → 1.8.1

data/lib/phobos/log.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Phobos
+  module Log
+    def log_info(msg, metadata = {})
+      LoggerHelper.log(:info, msg, metadata)
+    end
+
+    def log_debug(msg, metadata = {})
+      LoggerHelper.log(:debug, msg, metadata)
+    end
+
+    def log_error(msg, metadata)
+      LoggerHelper.log(:error, msg, metadata)
+    end
+  end
+
+  module LoggerHelper
+    def self.log(method, msg, metadata)
+      Phobos.logger.send(method, Hash(message: msg).merge(metadata))
+    end
+  end
+end

data/lib/phobos/producer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Phobos
   module Producer
     def self.included(base)
@@ -13,12 +15,12 @@ module Phobos
         @host_obj = host_obj
       end
 
-      def publish(topic, payload, key = nil)
-        class_producer.publish(topic, payload, key)
+      def publish(topic, payload, key = nil, partition_key = nil)
+        class_producer.publish(topic, payload, key, partition_key)
       end
 
-      def async_publish(topic, payload, key = nil)
-        class_producer.async_publish(topic, payload, key)
+      def async_publish(topic, payload, key = nil, partition_key = nil)
+        class_producer.async_publish(topic, payload, key, partition_key)
       end
 
       # @param messages [Array(Hash(:topic, :payload, :key))]
@@ -49,7 +51,7 @@ module Phobos
 
       class PublicAPI
         NAMESPACE = :phobos_producer_store
-        ASYNC_PRODUCER_PARAMS = %i(max_queue_size delivery_threshold delivery_interval).freeze
+        ASYNC_PRODUCER_PARAMS = [:max_queue_size, :delivery_threshold, :delivery_interval].freeze
 
         # This method configures the kafka client used with publish operations
         # performed by the host class
@@ -65,8 +67,9 @@ module Phobos
           producer_store[:kafka_client]
         end
 
-        def publish(topic, payload, key = nil)
-          publish_list([{ topic: topic, payload: payload, key: key }])
+        def publish(topic, payload, key = nil, partition_key = nil)
+          publish_list([{ topic: topic, payload: payload, key: key,
+                          partition_key: partition_key }])
         end
 
         def publish_list(messages)
@@ -88,8 +91,9 @@ module Phobos
           producer_store[:async_producer]
         end
 
-        def async_publish(topic, payload, key = nil)
-          async_publish_list([{ topic: topic, payload: payload, key: key }])
+        def async_publish(topic, payload, key = nil, partition_key = nil)
+          async_publish_list([{ topic: topic, payload: payload, key: key,
+                                partition_key: partition_key }])
         end
 
         def async_publish_list(messages)
@@ -105,7 +109,7 @@ module Phobos
         end
 
         def regular_configs
-          Phobos.config.producer_hash.reject { |k, _| ASYNC_PRODUCER_PARAMS.include?(k)}
+          Phobos.config.producer_hash.reject { |k, _| ASYNC_PRODUCER_PARAMS.include?(k) }
         end
 
         def async_configs
@@ -116,16 +120,16 @@ module Phobos
 
         def produce_messages(producer, messages)
           messages.each do |message|
+            partition_key = message[:partition_key] || message[:key]
             producer.produce(message[:payload], topic: message[:topic],
                                                 key: message[:key],
-                                                partition_key: message[:key]
-            )
+                                                partition_key: partition_key)
           end
         end
 
         def async_automatic_delivery?
-          async_configs.fetch(:delivery_threshold, 0) > 0 ||
-            async_configs.fetch(:delivery_interval, 0) > 0
+          async_configs.fetch(:delivery_threshold, 0).positive? ||
+            async_configs.fetch(:delivery_interval, 0).positive?
         end
 
         def producer_store

data/lib/phobos/test.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'phobos/test/helper'

data/lib/phobos/test/helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Phobos
   module Test
     module Helper
@@ -8,14 +10,12 @@ module Phobos
         listener = Phobos::Listener.new(
           handler: handler,
           group_id: GROUP,
-          topic: TOPIC,
-          force_encoding: force_encoding
+          topic: TOPIC, force_encoding: force_encoding
         )
 
         message = Kafka::FetchedMessage.new(
           message: Kafka::Protocol::Message.new(value: payload, key: nil, offset: 13),
-          topic: TOPIC,
-          partition: 0
+          topic: TOPIC, partition: 0
         )
 
         Phobos::Actions::ProcessMessage.new(

data/lib/phobos/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Phobos
-  VERSION = '1.8.0'
+  VERSION = '1.8.1'
 end

data/phobos.gemspec

@@ -1,5 +1,6 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'phobos/version'
 
@@ -15,7 +16,7 @@ Gem::Specification.new do |spec|
     'Francisco Juan',
     'Tommy Gustafsson'
   ]
-  spec.email         = [
+  spec.email = [
     'ornelas.tulio@gmail.com',
     'mathias.klippinge@gmail.com',
     'sergey.evstifeev@gmail.com',
@@ -25,37 +26,43 @@ Gem::Specification.new do |spec|
     'tommydgustafsson@gmail.com'
   ]
 
-  spec.summary       = %q{Simplifying Kafka for ruby apps}
-  spec.description   = %q{Phobos is a microframework and library for kafka based applications, it wraps common behaviors needed by consumers/producers in an easy an convenient API. It uses ruby-kafka as its kafka client and core component.}
+  spec.summary       = 'Simplifying Kafka for ruby apps'
+  spec.description   = 'Phobos is a microframework and library for kafka based applications, '\
+    'it wraps common behaviors needed by consumers/producers in an easy an convenient API. '\
+    'It uses ruby-kafka as its kafka client and core component.'
   spec.homepage      = 'https://github.com/klarna/phobos'
   spec.license       = 'Apache License Version 2.0'
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
-  if spec.respond_to?(:metadata)
-    spec.metadata['allowed_push_host'] = 'https://rubygems.org'
-  else
-    raise 'RubyGems 2.0 or newer is required to protect against public gem pushes.'
+  unless spec.respond_to?(:metadata)
+    raise('RubyGems 2.0 or newer is required to protect against public gem pushes.')
   end
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.metadata['allowed_push_host'] = 'https://rubygems.org'
+
+  spec.files = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features)/})
+  end
   spec.bindir        = 'bin'
   spec.executables   = spec.files.grep(%r{^bin/phobos}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
   spec.required_ruby_version = '>= 2.3'
 
   spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'rake', '~> 12.3'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'pry-byebug'
+  spec.add_development_dependency 'rubocop', '0.60.0'
+  spec.add_development_dependency 'rubocop_rules'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'timecop'
 
-  spec.add_dependency 'ruby-kafka', '>= 0.3.14'
+  spec.add_dependency 'activesupport', '>= 3.0.0'
   spec.add_dependency 'concurrent-ruby', '>= 1.0.2'
   spec.add_dependency 'concurrent-ruby-ext', '>= 1.0.2'
-  spec.add_dependency 'activesupport', '>= 3.0.0'
-  spec.add_dependency 'logging'
   spec.add_dependency 'exponential-backoff'
+  spec.add_dependency 'logging'
+  spec.add_dependency 'ruby-kafka'
   spec.add_dependency 'thor'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phobos
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Túlio Ornelas
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-22 00:00:00.000000000 Z
+date: 2018-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,6 +30,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -59,7 +73,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.60.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.60.0
+- !ruby/object:Gem::Dependency
+  name: rubocop_rules
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -101,19 +129,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby-kafka
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.14
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.14
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -143,19 +171,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.2
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: exponential-backoff
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: logging
   requirement: !ruby/object:Gem::Requirement
@@ -171,7 +199,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: exponential-backoff
+  name: ruby-kafka
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -218,6 +246,10 @@ files:
 - ".env"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".rubocop_common.yml"
+- ".rubocop_todo.yml"
+- ".rubosync.yml"
 - ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
@@ -240,6 +272,7 @@ files:
 - lib/phobos/cli.rb
 - lib/phobos/cli/runner.rb
 - lib/phobos/cli/start.rb
+- lib/phobos/constants.rb
 - lib/phobos/deep_struct.rb
 - lib/phobos/echo_handler.rb
 - lib/phobos/errors.rb
@@ -247,6 +280,7 @@ files:
 - lib/phobos/handler.rb
 - lib/phobos/instrumentation.rb
 - lib/phobos/listener.rb
+- lib/phobos/log.rb
 - lib/phobos/producer.rb
 - lib/phobos/test.rb
 - lib/phobos/test/helper.rb