omnes 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa683052724423d76ee0b417e84e2d0ed954c47b50382eead7e8e85942eea8c0
-  data.tar.gz: e0690f6d8852c9ab3ff1d4e2fb7c6e68f82aca657fe6b684a503f14a085e0efc
+  metadata.gz: eb5f0bfcfdcbaffdfe41c807db505023e8bb84cacdb56378a0851b9effdd51c1
+  data.tar.gz: 4b2bb740f6525c96651912a88f7738b04ceeca699a4af7b3f883f68a3e60eb55
 SHA512:
-  metadata.gz: 41a41801b5b133640bca4c98f004163382fe6747848595a70fa1404c9638cca304cb8e95c0f7b6b81ebcebe15df1df32a4c28274b252d38d8d66fac572d988dd
-  data.tar.gz: 76a23f76d4a007cfadcf59140168934f2653804f65c7cbdad21a70e3dcd71177438b4eb2174da4b421d07fe694d793da271a5e40c2e61a2d5b77bd915e8869ce
+  metadata.gz: 55b5fe1e1bc4fd5cd10e6683ff7539be5dec727f4399758d7fcfe3fd3d485d30fe4d99e8c2f1354bf1aef28f3efffd991573a89d827edf3839827c6fcfcd71d8
+  data.tar.gz: cc1c6c69c4e98442abad019ffac4dfa56221924182fd041d9830d7c72660eec09b4173c812e90969fb49f28cd7968acaeb91ab89c94bb8a9efb96e3bbe5626e7

data/.gitignore

@@ -6,6 +6,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+Gemfile.lock
 
 # rspec failure tracking
 .rspec_status

data/CHANGELOG.md

@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+
+## [0.2.1] - 2022-04-19
+
+### Added
+- Added `Omnes::Bus#clear` for autoloading [#4](https://github.com/nebulab/omnes/pull/4).
+
+### Changed
+- Fix re-adding autodiscovered subscriptions on subsequent calls [#5](https://github.com/nebulab/omnes/pull/5).
+
 ## [0.2.0] - 2022-04-15
 
 ### Added
@@ -13,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [0.1.0] - 2022-03-23
 
-[Unreleased]: https://github.com/nebulab/omnes/compare/v0.2.0...HEAD
+[Unreleased]: https://github.com/nebulab/omnes/compare/v0.2.1...HEAD
+[0.2.1]: https://github.com/nebulab/omnes/compare/v0.2.0...v0.2.1
 [0.2.0]: https://github.com/nebulab/omnes/compare/v0.1.0...v0.2.0
 [0.1.0]: https://github.com/nebulab/omnes/releases/tag/v0.1.0

data/README.md

@@ -476,18 +476,29 @@ handle :order_created, with: ThreadAdapter.new(:order_created)
 # ...
 ```
 
-## Debugging
-
-### Unsubscribing
+## Unsubscribing & clearing
 
 You can unsubscribe a given subscription by passing its
-[reference](#referencing-subscriptions) to `Omnes::Bus#unsubscribe`:
+[reference](#referencing-subscriptions) to `Omnes::Bus#unsubscribe` (see how to
+[reference subscriptions](#referencing-subscriptions)):
 
 ```ruby
 subscription = bus.subscribe(:order_created, OrderCreationEmailSubscription.new)
 bus.unsubscribe(subscription)
 ```
 
+Sometimes you might need to leave your bus in a pristine state, with no events
+registered or active subscriptions. That can be useful for autoloading in
+development:
+
+```ruby
+bus.clear
+bus.registry.event_names # => []
+bus.subscriptions # => []
+```
+
+## Debugging
+
 ### Registration
 
 Whenever you register an event, you get back an [`Omnes::Registry::Registration`](lib/omnes/registry.rb)
@@ -629,9 +640,14 @@ require "omnes"
 Omnes.config.subscriber.autodiscover = true
 
 Bus = Omnes::Bus.new
-Bus.register(:order_created)
 
-OrderCreationEmailSubscriber.new.subscribe_to(Bus)
+Rails.application.config.to_prepare do
+  Bus.clear
+
+  Bus.register(:order_created)
+
+  OrderCreationEmailSubscriber.new.subscribe_to(Bus)
+end
 ```
 
 We can define `OrderCreationEmailSubscriber` in

data/lib/omnes/bus.rb

@@ -287,6 +287,18 @@ module Omnes
       subscriptions.find { |subscription| subscription.id == id }
     end
 
+    # Clears all registered events and subscriptions
+    #
+    # Useful for code reloading.
+    #
+    # @return [Omnes::Bus]
+    def clear
+      tap do
+        @subscriptions = []
+        @registry = Registry.new
+      end
+    end
+
     private
 
     def execute_subscriptions_for_event(event, publication_context)

data/lib/omnes/subscriber/state.rb

@@ -24,9 +24,9 @@ module Omnes
       def call(bus, instance)
         raise MultipleSubscriberSubscriptionAttemptError if already_called?(bus, instance)
 
-        autodiscover_subscription_definitions(bus, instance) unless autodiscover_strategy.nil?
+        all_subscription_definitions = subscription_definitions + autodiscovered_subscription_definitions(bus, instance)
 
-        definitions = subscription_definitions.map { |defn| defn.(bus, instance) }
+        definitions = all_subscription_definitions.map { |defn| defn.(bus, instance) }
 
         subscribe_definitions(definitions, bus, instance).tap do
           mark_as_called(bus, instance)
@@ -47,21 +47,32 @@ module Omnes
         @calling_cache << [bus, instance]
       end
 
-      def autodiscover_subscription_definitions(bus, instance)
-        bus.registry.event_names.each do |event_name|
-          method_name = autodiscover_strategy.(event_name)
-          next unless instance.respond_to?(method_name, true)
+      def autodiscovered_subscription_definitions(bus, instance)
+        return [] unless autodiscover_strategy
 
-          add_subscription_definition do |_bus|
+        bus.registry.event_names.reduce([]) do |defs, event_name|
+          method_name = autodiscover_strategy.(event_name)
+          if instance.respond_to?(method_name, true)
             [
-              Subscription::SINGLE_EVENT_MATCHER.curry[event_name],
-              Adapter.Type(Adapter::Method.new(method_name)),
-              Subscription.random_id
+              *defs,
+              autodiscovered_subscription_definition(event_name, method_name)
             ]
+          else
+            defs
           end
         end
       end
 
+      def autodiscovered_subscription_definition(event_name, method_name)
+        lambda do |_bus, _instance|
+          [
+            Subscription::SINGLE_EVENT_MATCHER.curry[event_name],
+            Adapter.Type(Adapter::Method.new(method_name)),
+            Subscription.random_id
+          ]
+        end
+      end
+
       def subscribe_definitions(definitions, bus, instance)
         matcher_with_callbacks = definitions.map do |(matcher, adapter, id)|
           [matcher, adapter.curry[instance], id]

data/lib/omnes/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Omnes
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omnes
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Marc Busqué
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-15 00:00:00.000000000 Z
+date: 2022-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -87,7 +87,6 @@ files:
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile

data/Gemfile.lock

@@ -1,86 +0,0 @@
-PATH
-  remote: .
-  specs:
-    omnes (0.1.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activejob (7.0.2.3)
-      activesupport (= 7.0.2.3)
-      globalid (>= 0.3.6)
-    activesupport (7.0.2.3)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-    ast (2.4.2)
-    concurrent-ruby (1.1.9)
-    connection_pool (2.2.5)
-    diff-lcs (1.5.0)
-    globalid (1.0.0)
-      activesupport (>= 5.0)
-    i18n (1.10.0)
-      concurrent-ruby (~> 1.0)
-    minitest (5.15.0)
-    parallel (1.21.0)
-    parser (3.1.1.0)
-      ast (~> 2.4.1)
-    rack (2.2.3)
-    rainbow (3.1.1)
-    rake (12.3.3)
-    redcarpet (3.5.1)
-    redis (4.6.0)
-    regexp_parser (2.2.1)
-    rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    rubocop (1.25.1)
-      parallel (~> 1.10)
-      parser (>= 3.1.0.0)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.15.1, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.16.0)
-      parser (>= 3.1.1.0)
-    ruby-progressbar (1.11.0)
-    sidekiq (6.4.1)
-      connection_pool (>= 2.2.2)
-      rack (~> 2.0)
-      redis (>= 4.2.0)
-    tzinfo (2.0.4)
-      concurrent-ruby (~> 1.0)
-    unicode-display_width (2.1.0)
-    webrick (1.7.0)
-    yard (0.9.27)
-      webrick (~> 1.7.0)
-
-PLATFORMS
-  x86_64-linux
-
-DEPENDENCIES
-  activejob (~> 7.0)
-  omnes!
-  rake (~> 12.0)
-  redcarpet (~> 3.5)
-  rspec (~> 3.0)
-  rubocop (~> 1.25)
-  sidekiq (~> 6.4)
-  yard (~> 0.9)
-
-BUNDLED WITH
-   2.2.3