Subscriptions redesigned

rails_event_store/spec/active_job_scheduler_spec.rb

@@ -54,7 +54,7 @@ module RailsEventStore
     describe "#call" do
       specify do
         scheduler = ActiveJobScheduler.new
-        subscription = RubyEventStore::GlobalSubscription.new(MyAsyncHandler)
+        subscription = RubyEventStore::Subscription.new(MyAsyncHandler)
         scheduler.call(subscription, serialized_event)
 
         enqueued_jobs = ActiveJob::Base.queue_adapter.enqueued_jobs

rails_event_store/spec/after_commit_async_dispatcher_spec.rb

@@ -37,7 +37,7 @@ class DummyRecord < ActiveRecord::Base
 
     it "dispatch job immediately when no transaction is open" do
       expect_to_have_enqueued_job(MyAsyncHandler) do
-        subscription = RubyEventStore::GlobalSubscription.new(MyAsyncHandler)
+        subscription = RubyEventStore::Subscription.new(MyAsyncHandler)
         dispatcher.call(subscription, event, serialized_event)
       end
       expect(MyAsyncHandler.received).to be_nil
@@ -49,7 +49,7 @@ class DummyRecord < ActiveRecord::Base
       expect_to_have_enqueued_job(MyAsyncHandler) do
         ActiveRecord::Base.transaction do
           expect_no_enqueued_job(MyAsyncHandler) do
-            subscription = RubyEventStore::GlobalSubscription.new(MyAsyncHandler)
+            subscription = RubyEventStore::Subscription.new(MyAsyncHandler)
             dispatcher.call(subscription, event, serialized_event)
           end
         end
@@ -63,7 +63,7 @@ class DummyRecord < ActiveRecord::Base
       it "does not dispatch job" do
         expect_no_enqueued_job(MyAsyncHandler) do
           ActiveRecord::Base.transaction do
-            subscription = RubyEventStore::GlobalSubscription.new(MyAsyncHandler)
+            subscription = RubyEventStore::Subscription.new(MyAsyncHandler)
             dispatcher.call(subscription, event, serialized_event)
             raise ActiveRecord::Rollback
           end
@@ -87,7 +87,7 @@ class DummyRecord < ActiveRecord::Base
         it "does not dispatch job" do
           expect_no_enqueued_job(MyAsyncHandler) do
             ActiveRecord::Base.transaction do
-              subscription = RubyEventStore::GlobalSubscription.new(MyAsyncHandler)
+              subscription = RubyEventStore::Subscription.new(MyAsyncHandler)
               dispatcher.call(subscription, event, serialized_event)
               raise ActiveRecord::Rollback
             end
@@ -103,7 +103,7 @@ class DummyRecord < ActiveRecord::Base
         ActiveRecord::Base.transaction do
           expect_no_enqueued_job(MyAsyncHandler) do
             ActiveRecord::Base.transaction(requires_new: false) do
-              subscription = RubyEventStore::GlobalSubscription.new(MyAsyncHandler)
+              subscription = RubyEventStore::Subscription.new(MyAsyncHandler)
               dispatcher.call(subscription, event, serialized_event)
             end
           end
@@ -119,7 +119,7 @@ class DummyRecord < ActiveRecord::Base
         ActiveRecord::Base.transaction do
           expect_no_enqueued_job(MyAsyncHandler) do
             ActiveRecord::Base.transaction(requires_new: true) do
-              subscription = RubyEventStore::GlobalSubscription.new(MyAsyncHandler)
+              subscription = RubyEventStore::Subscription.new(MyAsyncHandler)
               dispatcher.call(subscription, event, serialized_event)
             end
           end
@@ -135,7 +135,7 @@ class DummyRecord < ActiveRecord::Base
         ActiveRecord::Base.transaction do
           expect_no_enqueued_job(MyAsyncHandler) do
             ActiveRecord::Base.transaction(requires_new: true) do
-              subscription = RubyEventStore::GlobalSubscription.new(MyAsyncHandler)
+              subscription = RubyEventStore::Subscription.new(MyAsyncHandler)
               dispatcher.call(subscription, event, serialized_event)
               raise ActiveRecord::Rollback
             end
@@ -157,7 +157,7 @@ class DummyRecord < ActiveRecord::Base
             ActiveRecord::Base.transaction do
               DummyRecord.new.save!
               expect_no_enqueued_job(MyAsyncHandler) do
-                subscription = RubyEventStore::GlobalSubscription.new(MyAsyncHandler)
+                subscription = RubyEventStore::Subscription.new(MyAsyncHandler)
                 dispatcher.call(subscription, event, serialized_event)
               end
             end
@@ -189,7 +189,7 @@ class DummyRecord < ActiveRecord::Base
               ActiveRecord::Base.transaction do
                 DummyRecord.new.save!
                 expect_no_enqueued_job(MyAsyncHandler) do
-                  subscription = RubyEventStore::GlobalSubscription.new(MyAsyncHandler)
+                  subscription = RubyEventStore::Subscription.new(MyAsyncHandler)
                   dispatcher.call(subscription, event, serialized_event)
                 end
               end
@@ -214,7 +214,7 @@ class DummyRecord < ActiveRecord::Base
 
       it "dispatches the job" do
         expect_to_have_enqueued_job(MyAsyncHandler) do
-          subscription = RubyEventStore::GlobalSubscription.new(MyAsyncHandler)
+          subscription = RubyEventStore::Subscription.new(MyAsyncHandler)
           dispatcher.call(subscription, event, serialized_event)
         end
       end
@@ -228,7 +228,7 @@ class DummyRecord < ActiveRecord::Base
           expect_no_enqueued_job(MyAsyncHandler) do
             ActiveRecord::Base.transaction do
               expect_no_enqueued_job(MyAsyncHandler) do
-                subscription = RubyEventStore::GlobalSubscription.new(MyAsyncHandler)
+                subscription = RubyEventStore::Subscription.new(MyAsyncHandler)
                 dispatcher.call(subscription, event, serialized_event)
               end
             end
@@ -245,7 +245,7 @@ class DummyRecord < ActiveRecord::Base
           expect_to_have_enqueued_job(MyAsyncHandler) do
             ActiveRecord::Base.transaction do
               expect_no_enqueued_job(MyAsyncHandler) do
-                subscription = RubyEventStore::GlobalSubscription.new(MyAsyncHandler)
+                subscription = RubyEventStore::Subscription.new(MyAsyncHandler)
                 dispatcher.call(subscription, event, serialized_event)
               end
             end

ruby_event_store/lib/ruby_event_store.rb

@@ -2,7 +2,6 @@
 
 require 'ruby_event_store/dispatcher'
 require 'ruby_event_store/subscription'
-require 'ruby_event_store/global_subscription'
 require 'ruby_event_store/in_memory_subscriptions_store'
 require 'ruby_event_store/subscriptions'
 require 'ruby_event_store/broker'

ruby_event_store/lib/ruby_event_store/constants.rb

@@ -2,5 +2,6 @@
 
 module RubyEventStore
   GLOBAL_STREAM = Object.new
+  GLOBAL_SUBSCRIPTION = Object.new
   PAGE_SIZE = 100.freeze
 end

ruby_event_store/lib/ruby_event_store/in_memory_subscriptions_store.rb

@@ -4,22 +4,18 @@ def initialize
       @subscriptions = Hash.new {|hsh, key| hsh[key] = [] }
     end
 
-    def add(subscription, type = nil)
+    def add(subscription, type = GLOBAL_SUBSCRIPTION)
       @subscriptions[type.to_s] << subscription
     end
 
-    def delete(subscription, type = nil)
+    def delete(subscription, type = GLOBAL_SUBSCRIPTION)
       @subscriptions.fetch(type.to_s).delete(subscription)
     end
 
     def all_for(event_type)
       @subscriptions[event_type.to_s]
     end
 
-    def all_global
-      all_for(nil)
-    end
-
     def value
       self
     end

ruby_event_store/lib/ruby_event_store/subscription.rb

@@ -1,6 +1,6 @@
 module RubyEventStore
   class Subscription
-    def initialize(subscriber, event_types, store: nil)
+    def initialize(subscriber, event_types = [GLOBAL_SUBSCRIPTION], store: nil)
       @subscriber = subscriber
       @event_types = event_types
       @store = store
@@ -18,7 +18,7 @@ def unsubscribe
     def inspect
       <<~EOS.strip
           #<#{self.class}:0x#{__id__.to_s(16)}>
-            - event types: #{event_types.inspect}
+            - #{ event_types != [GLOBAL_SUBSCRIPTION] ? "event types: #{event_types.inspect}" : "global subscription"}
             - subscriber: #{subscriber.inspect}
       EOS
     end

ruby_event_store/lib/ruby_event_store/subscriptions.rb

@@ -73,11 +73,11 @@ def initialize(store)
       end
 
       def add(subscription)
-        GlobalSubscription.new(subscription, store: @store.value)
+        Subscription.new(subscription, [GLOBAL_SUBSCRIPTION], store: @store.value)
       end
 
       def all_for(_event_type)
-        @store.value.all_global
+        @store.value.all_for(GLOBAL_SUBSCRIPTION)
       end
     end
   end

ruby_event_store/spec/composed_dispatcher_spec.rb

@@ -61,7 +61,7 @@ def verify(_subscriber)
         composed_dispatcher = ComposedDispatcher.new(dispatcher)
         event = instance_double(::RubyEventStore::Event)
         serialized_event = instance_double(::RubyEventStore::SerializedRecord)
-        subscription = GlobalSubscription.new(-> { })
+        subscription = Subscription.new(-> { })
 
         composed_dispatcher.call(subscription, event, serialized_event)
 
@@ -75,7 +75,7 @@ def verify(_subscriber)
         composed_dispatcher = ComposedDispatcher.new(skippy, real)
         event = instance_double(::RubyEventStore::Event)
         serialized_event = instance_double(::RubyEventStore::SerializedRecord)
-        subscription = GlobalSubscription.new(-> { })
+        subscription = Subscription.new(-> { })
 
         composed_dispatcher.call(subscription, event, serialized_event)
 
@@ -89,7 +89,7 @@ def verify(_subscriber)
         composed_dispatcher = ComposedDispatcher.new(real1, real2)
         event = instance_double(::RubyEventStore::Event)
         serialized_event = instance_double(::RubyEventStore::SerializedRecord)
-        subscription = GlobalSubscription.new(-> { })
+        subscription = Subscription.new(-> { })
 
         composed_dispatcher.call(subscription, event, serialized_event)
 

ruby_event_store/spec/dispatcher_spec.rb

@@ -32,14 +32,14 @@ def call
 
     specify "calls subscribed instance" do
       expect(handler).to receive(:call).with(event)
-      subscription = GlobalSubscription.new(handler)
+      subscription = Subscription.new(handler)
       Dispatcher.new.call(subscription, event, serialized_event)
     end
 
     specify "calls subscribed class" do
       expect(HandlerClass).to receive(:new).and_return(handler)
       expect(handler).to receive(:call).with(event)
-      subscription = GlobalSubscription.new(HandlerClass)
+      subscription = Subscription.new(HandlerClass)
       Dispatcher.new.call(subscription, event, serialized_event)
     end
 

ruby_event_store/spec/instrumented_dispatcher_spec.rb

@@ -13,7 +13,7 @@ module RubyEventStore
         event = Object.new
         serialized_event = Object.new
         subscriber = -> { }
-        subscription = GlobalSubscription.new(subscriber)
+        subscription = Subscription.new(subscriber)
 
         instrumented_dispatcher.call(subscription, event, serialized_event)
 
@@ -26,7 +26,7 @@ module RubyEventStore
           event = Object.new
           serialized_event = Object.new
           subscriber = -> { }
-          subscription = GlobalSubscription.new(subscriber)
+          subscription = Subscription.new(subscriber)
 
           instrumented_dispatcher.call(subscription, event, serialized_event)