Subscriptions redesigned

ruby_event_store/lib/ruby_event_store/global_subscription.rb

@@ -1,17 +1,17 @@
 module RubyEventStore
   class GlobalSubscription
-    def initialize(subscriber, store)
+    def initialize(subscriber, store: nil)
       @subscriber = subscriber
       @store = store
-      @store.add(self)
+      @store.add(self) if @store
     end
 
     def call(event)
       (Class === subscriber ? subscriber.new : subscriber).call(event)
     end
 
     def unsubscribe
-      @store.delete(self)
+      @store.delete(self) if @store
     end
 
     def inspect

ruby_event_store/lib/ruby_event_store/subscription.rb

@@ -1,18 +1,18 @@
 module RubyEventStore
   class Subscription
-    def initialize(subscriber, event_types, store)
+    def initialize(subscriber, event_types, store: nil)
       @subscriber = subscriber
-      @store = store
       @event_types = event_types
-      event_types.each{ |type| @store.add(type, self) }
+      @store = store
+      event_types.each{ |type| @store.add(type, self) } if @store
     end
 
     def call(event)
       (Class === subscriber ? subscriber.new : subscriber).call(event)
     end
 
     def unsubscribe
-      event_types.each{ |type| @store.delete(type, self) }
+      event_types.each{ |type| @store.delete(type, self) } if @store
     end
 
     def inspect

ruby_event_store/lib/ruby_event_store/subscriptions.rb

@@ -103,7 +103,7 @@ def initialize(store)
       end
 
       def add(subscription, event_types)
-        Subscription.new(subscription, event_types, @store.value)
+        Subscription.new(subscription, event_types, store: @store.value)
       end
 
       def all_for(event_type)
@@ -117,7 +117,7 @@ def initialize(store)
       end
 
       def add(subscription)
-        GlobalSubscription.new(subscription, @store.value)
+        GlobalSubscription.new(subscription, store: @store.value)
       end
 
       def all_for(_event_type)

ruby_event_store/spec/dispatcher_spec.rb

@@ -32,18 +32,14 @@ def call
 
     specify "calls subscribed instance" do
       expect(handler).to receive(:call).with(event)
-      store = double(:store)
-      allow(store).to receive(:add)
-      subscription = GlobalSubscription.new(handler, store)
+      subscription = GlobalSubscription.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)
-      store = double(:store)
-      allow(store).to receive(:add)
-      subscription = GlobalSubscription.new(HandlerClass, store)
+      subscription = GlobalSubscription.new(HandlerClass)
       Dispatcher.new.call(subscription, event, serialized_event)
     end