sidekiq-eventbus 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7061dd705796ed74b0ee5cf0728d269b06ac341e
-  data.tar.gz: 1f44778cbd38de46eb79f8e2f291da182d2f4f20
+SHA256:
+  metadata.gz: e246cbcc36a0dd6d362dc9c5d505094ecd66bf11e620334cd80ca3e1b9042b97
+  data.tar.gz: ba94de9927238c7d79c018d3c4776f1c7ca35eb0f989a5994c6a2c71d5f3a888
 SHA512:
-  metadata.gz: b98e138821232d05837624b86c653de82af593d7678139a9071f91963760ea647f0447c11fbe3f8da08101406707edd0bbaa4b752c6471dfc1fd6cb35de900b4
-  data.tar.gz: aea550b45556040b2dee7d0dbd0c6a7baeb8626f45c6dcf962d370aca66549aad390295da83e0cc22323a7a8ac5ff2932ad8126fd87875e0b4d193b5719bd5b6
+  metadata.gz: c2265fdd50b3c914024bada3ee1012044d6eb2f7aca03c3961940e07e814a01b18717124aa8fabe0d19b48a4d1b6a0e40e4d537778cf062299feb7a85219a7f2
+  data.tar.gz: f7ab5f88503302c094bd0616c60db5fd5d9d2b7b63dc7c216239e18ea1c7f920d85b1343a12f25275c93dcd13ee9e26c083429b73f4b3c12b1b3de73cd31e790

data/lib/sidekiq/event_bus.rb

@@ -8,7 +8,6 @@ module Sidekiq
     autoload :Consumer,         'sidekiq/event_bus/consumer'
     autoload :Producer,         'sidekiq/event_bus/producer'
 
-    autoload :TopicMiddleware,  'sidekiq/event_bus/topic_middleware'
     autoload :EventWorker,      'sidekiq/event_bus/event_worker'
 
     module Adapters
@@ -32,9 +31,3 @@ module Sidekiq
     end
   end
 end
-
-Sidekiq.configure_server do |config|
-  config.server_middleware do |chain|
-    chain.add Sidekiq::EventBus::TopicMiddleware
-  end
-end

data/lib/sidekiq/event_bus/adapters/buffered.rb

@@ -6,12 +6,12 @@ class Sidekiq::EventBus::Adapters::Buffered
     @bufferes = Concurrent::Map.new
   end
 
-  def push topic, event, payload
+  def push event, payload
     if is_buffered?
-      event_buffer << [ topic, event, payload ]
+      event_buffer << [ event, payload ]
       nil
     else
-      @adapter.push(topic, event, payload)
+      @adapter.push(event, payload)
     end
   end
 
@@ -38,8 +38,8 @@ class Sidekiq::EventBus::Adapters::Buffered
   end
 
   def flush!
-    event_buffer.map do |topic, event, payload|
-      @adapter.push(topic, event, payload)
+    event_buffer.map do |event, payload|
+      @adapter.push(event, payload)
     end
   end
 
@@ -50,4 +50,4 @@ class Sidekiq::EventBus::Adapters::Buffered
   def buffer_key
     Thread.current.object_id
   end
-end
+end

data/lib/sidekiq/event_bus/adapters/default.rb

@@ -1,9 +1,8 @@
 class Sidekiq::EventBus::Adapters::Default
-  def push topic, event, payload
+  def push event, payload
     Sidekiq::Client.push({
       'class' => Sidekiq::EventBus::EventWorker,
-      'args'  => [ event, payload ],
-      'queue' => topic,
+      'args'  => [ event, payload ]
     })
   end
-end
+end

data/lib/sidekiq/event_bus/adapters/inline.rb

@@ -1,6 +1,6 @@
 class Sidekiq::EventBus::Adapters::Inline
-  def push topic, event, payload
-    Sidekiq::EventBus.utils.handle_event(topic, event, payload)
+  def push event, payload
+    Sidekiq::EventBus.utils.handle_event(event, payload)
     SecureRandom.hex(8)
   end
-end
+end

data/lib/sidekiq/event_bus/adapters/log.rb

@@ -1,7 +1,7 @@
 class Sidekiq::EventBus::Adapters::Log
-  def push topic, event, payload
+  def push event, payload
     id = SecureRandom.hex(8)
-    puts "topic=#{topic}  event=#{event}  id=#{id}  payload=#{payload.to_json}"
+    puts "event=#{event}  id=#{id}  payload=#{payload.to_json}"
     id
   end
-end
+end

data/lib/sidekiq/event_bus/adapters/test.rb

@@ -1,14 +1,13 @@
 class Sidekiq::EventBus::Adapters::Test
-  attr_accessor :topics
+  attr_accessor :events
 
   def initialize
-    self.topics = Hash.new{ |hash, key| hash[key] = [] }
+    self.events = []
   end
 
-  def push topic, event, payload
+  def push event, payload
     id = SecureRandom.hex(8)
-    self.topics[topic].push({
-      topic:    topic,
+    self.events.push({
       event:    event,
       payload:  payload,
       id:       id
@@ -18,6 +17,6 @@ class Sidekiq::EventBus::Adapters::Test
   end
 
   def clear!
-    self.topics.clear
+    self.events.clear
   end
-end
+end

data/lib/sidekiq/event_bus/configuration.rb

@@ -3,12 +3,12 @@ class Sidekiq::EventBus::Configuration
 
   def initialize
     self.adapter                = Sidekiq::EventBus::Adapters::Default.new
-    self.consumers              = Hash.new { |hash, key| hash[key] = Set.new }
+    self.consumers              = Set.new
     self.sidekiq_worker_options = { retry: 0, dead: true }
   end
 
-  def register_consumer topic, klass
+  def register_consumer klass
     klass = klass.name unless klass.is_a?(String)
-    consumers[topic] << klass
+    consumers << klass
   end
-end
+end

data/lib/sidekiq/event_bus/consumer.rb

@@ -1,12 +1,8 @@
 class Sidekiq::EventBus::Consumer
-  # Register Consumer with the EventBus for a particular topic
-  def self.topic *topics
-    Array(topics).each do |topic|
-      Sidekiq::EventBus.config.register_consumer(topic, self)
-    end
+  def self.register_consumer!
+    Sidekiq::EventBus.config.register_consumer(self)
   end
 
-
   # Store handlers for this consumer
   def self.handlers
     @handlers ||= Hash.new { |hash, key| hash[key] = Array.new }
@@ -24,9 +20,9 @@ class Sidekiq::EventBus::Consumer
 
   PAYLOAD_WITH_INDIFFERENT_ACCESS = defined?(ActiveSupport::HashWithIndifferentAccess)
 
-  def consume topic, event, payload
+  def consume event, payload
     if self.class.handlers.key? event
-      _payload = payload.merge('topic'.freeze => topic, 'event'.freeze => event).freeze
+      _payload = payload.merge('event'.freeze => event).freeze
 
       if PAYLOAD_WITH_INDIFFERENT_ACCESS
         _payload = ActiveSupport::HashWithIndifferentAccess.new(_payload)

data/lib/sidekiq/event_bus/event_worker.rb

@@ -1,11 +1,9 @@
 class Sidekiq::EventBus::EventWorker
   include Sidekiq::Worker
 
-  attr_accessor :topic
-
   sidekiq_options Sidekiq::EventBus.config.sidekiq_worker_options
 
   def perform(event, payload)
-    Sidekiq::EventBus.utils.handle_event(topic, event, payload)
+    Sidekiq::EventBus.utils.handle_event(event, payload)
   end
-end
+end

data/lib/sidekiq/event_bus/producer.rb

@@ -1,14 +1,11 @@
 class Sidekiq::EventBus::Producer
-  attr_reader :topics, :adapter
+  attr_reader :adapter
 
-  def initialize topics:, adapter: Sidekiq::EventBus.config.adapter
-    @topics  = Array(topics)
+  def initialize adapter: Sidekiq::EventBus.config.adapter
     @adapter = adapter
   end
 
   def publish event, payload
-    topics.map do |topic|
-      adapter.push topic, event, payload
-    end
+    adapter.push event, payload
   end
-end
+end

data/lib/sidekiq/event_bus/utils.rb

@@ -5,15 +5,15 @@ class Sidekiq::EventBus::Utils
     @config = config
   end
 
-  def consumers_for topic
-    config.consumers[topic].map do |klass_name|
+  def consumers
+    config.consumers.map do |klass_name|
       klass_name.constantize.new
     end
   end
 
-  def handle_event topic, event, payload
-    consumers_for(topic).each do |consumer|
-      consumer.consume(topic, event, payload)
+  def handle_event event, payload
+    consumers.each do |consumer|
+      consumer.consume(event, payload)
     end
   end
 
@@ -22,4 +22,4 @@ class Sidekiq::EventBus::Utils
       config.error_handler.call(exception)
     end
   end
-end
+end

data/lib/sidekiq/event_bus/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module EventBus
-    VERSION = '0.0.6'
+    VERSION = '0.1.0'
   end
 end

metadata

@@ -1,15 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-eventbus
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - Phil Monroe
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-06-04 00:00:00.000000000 Z
+date: 2020-10-23 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
@@ -19,7 +39,7 @@ dependencies:
         version: 4.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +49,7 @@ dependencies:
         version: 4.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -70,14 +90,13 @@ files:
 - lib/sidekiq/event_bus/consumer.rb
 - lib/sidekiq/event_bus/event_worker.rb
 - lib/sidekiq/event_bus/producer.rb
-- lib/sidekiq/event_bus/topic_middleware.rb
 - lib/sidekiq/event_bus/utils.rb
 - lib/sidekiq/event_bus/version.rb
 homepage: https://github.com/Rakefire/sidekiq-eventbus
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -92,9 +111,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Producer/Consumer event bus via Sidekiq
 test_files: []

data/lib/sidekiq/event_bus/topic_middleware.rb

@@ -1,9 +0,0 @@
-class Sidekiq::EventBus::TopicMiddleware
-  def initialize(options=nil)
-  end
-
-  def call(worker, msg, queue)
-    worker.topic = queue if worker.respond_to?("topic=")
-    yield
-  end
-end