pheromone 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 579707010487601af25f633bada8a8ffda541ef5
-  data.tar.gz: c7f027d298ea29b05c4b6ecee8d45dbc3cbbece6
+  metadata.gz: 1f7b989beed62ff229ddb99eadf5e30a40e96442
+  data.tar.gz: 5d3edfdf9e503ac121bac5ee34ca7953f3c2549e
 SHA512:
-  metadata.gz: 59485b3ecea81dbe5a612f3bbea067dea48482c51b9f7f3dbac7d381e2fa5b075b8ceb943a945693ef190165544b425087803f67a015c178cf543693500edd66
-  data.tar.gz: 55215044cf75ca43ef9678cc92be43eaa3f42feddf3606b8638b98e9c4564e786d3b6de6adb95294ca803eeb0c13643da64018bb75be6c18ab72d63f122dc27c
+  metadata.gz: c2f234b68fbf3cd0c7e0e314d8f902e189cb04882661b26c4e5d29aea8a9e3565fd24f596934900f8c2a1699160981d88bdd636d55bd90c0e45d74ece0e41fb0
+  data.tar.gz: 588b6d95467b997f447a217d266cd29d6501275c90a8d5e125bee326fcdf9ab04ae37a2074e72c37d72c3634e56c07aed9692539399647ea3c64e72c600c58b3

data/README.md

@@ -28,22 +28,19 @@ In order to setup `pheromone`, both `waterdrop` and `pheromone` need to be setup
 
     $ bundle exec rails generate pheromone:initializer
 
-This will generate the following file in `config/initializers/pheromone.rb`
+This will generate the following in `config/initializers/pheromone.rb`
 
 ```
-"Pheromone.setup do |pheromone_config|\n"\
-  "  # pheromone_config.background_processor.name = ':resque / :sidekiq'\n"\
-  "  # pheromone_config.background_processor.klass = 'BackgroundWorker'\n"\
-  "  # pheromone_config.timezone = 'UTC'\n"\
-  "  pheromone_config.message_format = :json\n"\
-  "  WaterDrop.setup do |waterdrop_config|\n"\
-  "    waterdrop_config.send_messages = Rails.env.production?\n"\
-  "    waterdrop_config.connection_pool.size = 20\n"\
-  "    waterdrop_config.connection_pool.timeout = 1\n"\
-  "    waterdrop_config.kafka.seed_brokers = [Rails.env.production? ? ENV['KAFKA_HOST'] : 'localhost:9092']\n"\
-  "    waterdrop_config.raise_on_failure = Rails.env.production?\n"\
-  "  end\n"\
-"end"\
+Pheromone.setup do |pheromone_config|
+  # pheromone_config.background_processor.name = ':resque / :sidekiq'
+  # pheromone_config.background_processor.klass = 'BackgroundWorker'
+  # pheromone_config.timezone = 'UTC'
+  pheromone_config.message_format = :json
+    WaterDrop.setup do |waterdrop_config|    
+      waterdrop_config.deliver = Rails.env.production?
+      waterdrop_config.kafka.seed_brokers = [Rails.env.production? ? ENV['KAFKA_HOST'] : 'localhost:9092']
+    end
+end
 ```
 
 Edit this file to modify the default config. The following configuration options are available:
@@ -55,11 +52,6 @@ Edit this file to modify the default config. The following configuration options
 | background_processor.klass    | String        | Background processor class name that sends messages to kafka |
 | timezone_format               | String        | Valid timezone name for timestamps sent to kafka |
 | message_format                | Symbol        | Only supports :json format currently |
-| send_messages                 | Boolean       | Should we send messages to Kafka |
-| 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) |
 
 The timezone setting will transform any timestamp attributes in the message to the specified format.
 
@@ -287,22 +279,9 @@ class PublishableModel < ActiveRecord::Base
       topic: :topic_test,
       message: ->(obj) { { name: obj.name } },
       producer_options: {
-        # The number of retries when attempting to deliver messages. The default is
-        # 2, so 3 attempts in total, but you can configure a higher or lower number:
-        max_retries: 5,
-        # The number of seconds to wait between retries. In order to handle longer
-        # periods of Kafka being unavailable, increase this number. The default is
-        # 1 second.
-        retry_backoff: 5,
-        # number of acknowledgements that the client should write to before returning
-        # possible values are :all, 0 or 1 and default behaviour is :all, requiring all
-        # replicas to acknowledge
-        required_acks: 1,
-        # compression can be enabled in order to improve bandwidth, and a minimum number
-        # of messages that need to be in the buffer before they are compressed can be 
-        # specified using compression threshold
-        compression_codec: :snappy,
-        compression_threshold: 10 
+        key: 'key',
+        partition: 1,
+        partition_key: 'key'
       }
     }
   ]

data/lib/generators/pheromone/initializer_generator.rb

@@ -11,11 +11,8 @@ module Pheromone
           "  # pheromone_config.timezone = 'UTC'\n"\
           "  pheromone_config.message_format = :json\n"\
           "  WaterDrop.setup do |waterdrop_config|\n"\
-          "    waterdrop_config.send_messages = Rails.env.production?\n"\
-          "    waterdrop_config.connection_pool.size = 20\n"\
-          "    waterdrop_config.connection_pool.timeout = 1\n"\
+          "    waterdrop_config.deliver = Rails.env.production?\n"\
           "    waterdrop_config.kafka.seed_brokers = [Rails.env.production? ? ENV['KAFKA_HOST'] : 'localhost:9092']\n"\
-          "    waterdrop_config.raise_on_failure = Rails.env.production?\n"\
           "  end\n"\
           "end"\
       )

data/lib/pheromone/messaging/message.rb

@@ -1,5 +1,3 @@
-require 'waterdrop'
-
 # Encapsulates WaterDrop::Message
 module Pheromone
   module Messaging
@@ -14,11 +12,10 @@ module Pheromone
       attr_reader :topic, :blob, :options, :metadata
 
       def send!
-        ::WaterDrop::Message.new(
-          topic,
+        WaterDrop::SyncProducer.call(
           MessageFormatter.new(full_message).format,
-          options
-        ).send!
+          { topic: topic.to_s }.merge!(options)
+        )
       end
 
       private

data/lib/pheromone/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Pheromone
-  VERSION = '0.3.3'.freeze
+  VERSION = '0.4.0'.freeze
 end

data/lib/pheromone.rb

@@ -1,6 +1,7 @@
 require 'pheromone/publishable'
 require 'pheromone/config'
 require 'pheromone/messaging/message'
+require 'rails/railtie'
 require 'waterdrop'
 
 module Pheromone

data/pheromone.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'activerecord', '>= 4.2.5'
   spec.add_dependency 'bundler', '>= 0'
   spec.add_dependency 'dry-configurable', '>= 0.5'
-  spec.add_dependency 'waterdrop', '>= 0.4'
+  spec.add_dependency 'waterdrop', '>= 1.0'
 
   spec.add_development_dependency 'activesupport', '>= 4.2.5'
   spec.add_development_dependency 'generator_spec', '~> 0.9.3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pheromone
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Ankita Gupta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-19 00:00:00.000000000 Z
+date: 2017-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement