sidekiq-eventbus 0.0.2 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 08e5b4cf0e6ab67f298d005fe238b18504b83b56
-  data.tar.gz: 1c333e9f8a673cd70abae2d3a170ecfe57f29350
+SHA256:
+  metadata.gz: 9eaab7d24f9c7b4c0c99abba98571139000d64f3ada45407715da23db8c98098
+  data.tar.gz: e0a830587be3568625753368fab690eae383f03a547d553c71030090daea9499
 SHA512:
-  metadata.gz: 6872239db41e62e1993ce91134adecdba84b6388a52c5ce456ee6e68e12bbd6284418b962c24cfffed9412dde5090ec47b66ef1ad291e7e41db80135a7440724
-  data.tar.gz: db02caf8fb432a9e88f1e9678304b95a7f0da799d599f6ba4e497267b04e7a49a6869ce472352f560d61c77baefddd94251fcd14c8df9bb2228067fcebd814be
+  metadata.gz: e2544bded9aff5a1e694e786b6a8406cfb985f0d9ec191f140fe8d5dddbb861fedcb9c214f30069dc205a87c7a0908b5da5ff11b50fe71b608baa5506cd80ff2
+  data.tar.gz: 115b47ceda5d54b64125b9e9a61dc32ccad32be24c99b0da4aa40e4967b80b3985680e7c2e3933ad48a02a965d6faeded6a3c8c7d0b83553d2bf0bf134668192

data/README.md

@@ -0,0 +1,4 @@
+# sidekiq-eventbus
+
+A simple event bus implementation written to offload event handling via Sidekiq.
+

data/lib/sidekiq/event_bus.rb

@@ -8,14 +8,14 @@ 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
       autoload :Default,        'sidekiq/event_bus/adapters/default'
+      autoload :Buffered,       'sidekiq/event_bus/adapters/buffered'
       autoload :Inline,         'sidekiq/event_bus/adapters/inline'
       autoload :Test,           'sidekiq/event_bus/adapters/test'
-      autoload :Log,           'sidekiq/event_bus/adapters/log'
+      autoload :Log,            'sidekiq/event_bus/adapters/log'
     end
 
     def self.config
@@ -23,7 +23,7 @@ module Sidekiq
     end
 
     def self.utils
-      @utils ||= Utils.new(config)
+      @utils ||= Utils.new
     end
 
     def self.configure
@@ -31,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

@@ -0,0 +1,53 @@
+require 'concurrent'
+
+class Sidekiq::EventBus::Adapters::Buffered
+  def initialize adapter: Sidekiq::EventBus::Adapters::Default.new
+    @adapter  = adapter
+    @bufferes = Concurrent::Map.new
+  end
+
+  def push event, payload
+    if is_buffered?
+      event_buffer << [ event, payload ]
+      nil
+    else
+      @adapter.push(event, payload)
+    end
+  end
+
+  def buffered
+    buffer!
+    begin
+      yield
+      flush!
+    ensure
+      clear!
+    end
+  end
+
+  def event_buffer
+    @bufferes[buffer_key] ||= Array.new
+  end
+
+  def is_buffered?
+    @bufferes.key?(buffer_key)
+  end
+
+  def buffer!
+    @bufferes[buffer_key] ||= Array.new
+  end
+
+  def flush!
+    event_buffer.map do |event, payload|
+      @adapter.push(event, payload)
+    end
+  end
+
+  def clear!
+    @bufferes.delete(buffer_key)
+  end
+
+  def buffer_key
+    Thread.current.object_id
+  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

@@ -1,13 +1,14 @@
 class Sidekiq::EventBus::Configuration
-  attr_accessor :adapter, :consumers, :sidekiq_worker_options
+  attr_accessor :adapter, :consumers, :sidekiq_worker_options, :error_handler
+
   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 }
@@ -22,22 +18,27 @@ class Sidekiq::EventBus::Consumer
     end
   end
 
+  PAYLOAD_WITH_INDIFFERENT_ACCESS = defined?(ActiveSupport::HashWithIndifferentAccess)
 
-  def consume topic, event, payload
-    _payload = payload.merge('topic'.freeze => topic, 'event'.freeze => event).freeze
+  def consume event, payload
+    if self.class.handlers.key? event
+      _payload = payload.merge('event'.freeze => event).freeze
+
+      if PAYLOAD_WITH_INDIFFERENT_ACCESS
+        _payload = ActiveSupport::HashWithIndifferentAccess.new(_payload)
+      end
 
-    self.class.handlers[event].each do |handler|
-      begin
-        if handler.is_a? Proc
-          instance_exec( _payload.dup, &handler )
-        else
-          handler.call( _payload.dup )
+      self.class.handlers[event].each do |handler|
+        begin
+          if handler.is_a? Proc
+            instance_exec( _payload.dup, &handler )
+          else
+            handler.call( _payload.dup )
+          end
+        rescue => e
+          Sidekiq::EventBus.utils.handle_error(e)
         end
-      rescue => e
-        puts "OH NO!!!"
-        puts e.inspect
-        puts e.backtrace
       end
     end
   end
-end
+end

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: nil, 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

@@ -1,19 +1,19 @@
 class Sidekiq::EventBus::Utils
-  attr_reader :config
-
-  def initialize config
-    @config = config
+  def consumers
+    Sidekiq::EventBus.config.consumers.map do |klass_name|
+      klass_name.constantize.new
+    end
   end
 
-  def consumers_for topic
-    config.consumers[topic].map do |klass_name|
-      klass_name.constantize.new
+  def handle_event event, payload
+    consumers.each do |consumer|
+      consumer.consume(event, payload)
     end
   end
 
-  def handle_event topic, event, payload
-    consumers_for(topic).each do |consumer|
-      consumer.consume(topic, event, payload)
+  def handle_error exception
+    unless Sidekiq::EventBus.config.error_handler.nil?
+      Sidekiq::EventBus.config.error_handler.call(exception)
     end
   end
-end
+end

data/lib/sidekiq/event_bus/version.rb

@@ -0,0 +1,5 @@
+module Sidekiq
+  module EventBus
+    VERSION = '0.1.1'
+  end
+end

metadata

@@ -1,16 +1,76 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-eventbus
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.1
 platform: ruby
 authors:
 - Phil Monroe
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-01-21 00:00:00.000000000 Z
-dependencies: []
-description: A simple Producer/Consumer event bus extension for Sidekiq
+date: 2020-10-26 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
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+description: A simple asynchronous Producer/Consumer event bus extension for Sidekiq
 email: phil@rakefire.io
 executables: []
 extensions: []
@@ -21,6 +81,7 @@ files:
 - README.md
 - lib/sidekiq-eventbus.rb
 - lib/sidekiq/event_bus.rb
+- lib/sidekiq/event_bus/adapters/buffered.rb
 - lib/sidekiq/event_bus/adapters/default.rb
 - lib/sidekiq/event_bus/adapters/inline.rb
 - lib/sidekiq/event_bus/adapters/log.rb
@@ -29,13 +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
@@ -50,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: A simple Producer/Consumer event bus extension for Sidekiq
+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