Merge pull request #95 from Extrys/master

Abstract Signals Bugs Fixed

Author: Mathijs-Bakker

Documentation/Signals.md

@@ -482,8 +482,7 @@ When event driven program is abused, it is possible to find yourself in "callbac
 
 ## <a id="abstract-signals"></a>Abstract Signals
 
-One of the problems of the signals is that when subscribe to their concrete types
-you are coupling your concrete signal types to the subscribers
+One of the problems of the signals is that when you subscribe to their types you are coupling your concrete signal types to the subscribers
 
 For example, Lets say I have a player and i want to save the game when i finish a level.
 Ok easy, I create ``SignalLevelCompleted`` and then I subscribe it to my ``SaveGameSystem``

UnityProject/Assets/Plugins/Zenject/OptionalExtras/Signals/Internal/SignalDeclaration.cs

@@ -41,6 +41,8 @@ public IObservable<object> Stream
         }
 #endif
 
+		public List<SignalSubscription> Subscriptions => _subscriptions;
+
         public int TickPriority
         {
             get; private set;

UnityProject/Assets/Plugins/Zenject/OptionalExtras/Signals/Main/SignalBus.cs

@@ -11,7 +11,7 @@ namespace Zenject
     public class SignalBus : ILateDisposable
     {
         readonly SignalSubscription.Pool _subscriptionPool;
-        readonly Dictionary<BindingId, SignalDeclaration> _localDeclarationMap;
+        readonly Dictionary<BindingId, SignalDeclaration> _localDeclarationMap = new Dictionary<BindingId, SignalDeclaration>();
         readonly SignalBus _parentBus;
         readonly Dictionary<SignalSubscriptionId, SignalSubscription> _subscriptionMap = new Dictionary<SignalSubscriptionId, SignalSubscription>();
         readonly ZenjectSettings.SignalSettings _settings;
@@ -35,7 +35,14 @@ public SignalBus(
             _signalDeclarationFactory = signalDeclarationFactory;
             _container = container;
 
-            _localDeclarationMap = signalDeclarations.ToDictionary(x => x.BindingId, x => x);
+           signalDeclarations.ForEach(x =>
+			{
+				if (!_localDeclarationMap.ContainsKey(x.BindingId))
+				{
+					_localDeclarationMap.Add(x.BindingId, x);
+				}
+				else _localDeclarationMap[x.BindingId].Subscriptions.AllocFreeAddRange(x.Subscriptions);
+			});
             _parentBus = parentBus;
         }
 
@@ -57,15 +64,15 @@ public void AbstractFireId<TSignal>(object identifier, TSignal signal)
 		{
 			// Do this before creating the signal so that it throws if the signal was not declared
 			Type signalType = typeof(TSignal);
+            InternalFire(signalType, signal, identifier, true);
 			var declaration = GetDeclaration(signalType, identifier, true);
 			declaration.Fire(signal);
 
             Type[] interfaces = signalType.GetInterfaces();
             int numOfInterfaces = interfaces.Length;
             for (int i = 0; i < numOfInterfaces; i++)
             {
-                declaration = GetDeclaration(interfaces[i], identifier, true);
-                declaration.Fire(signal);
+                InternalFire(interfaces[i], signal, identifier, true);
             }
 		}
 
@@ -213,7 +220,7 @@ public IObservable<TSignal> GetStream<TSignal>()
 
         public IObservable<object> GetStreamId(Type signalType, object identifier)
         {
-            return GetDeclaration(signalType, identifier, true).Stream;
+            return GetDeclaration(new BindingId(signalType, identifier)).Stream;
         }
 
         public IObservable<object> GetStream(Type signalType)