Merge pull request #5 from akobr/develop

Alfa version of .NET standard library

StrongBeaver.Core.Platform/DelegatedPlatformFactory.cs

@@ -0,0 +1,36 @@
+using System;
+
+namespace StrongBeaver.Core.Platform
+{
+    public class DelegatedPlatformFactory : IPlatformFactory
+    {
+        private readonly Func<IDeviceInfo> deviceInfoFactory;
+        private readonly Func<IPlatformInfo> platformInfoFactory;
+        private readonly Func<IApplicationInfo> applicationInfoFactory;
+
+        public DelegatedPlatformFactory(
+            Func<IDeviceInfo> deviceInfoFactory,
+            Func<IPlatformInfo> platformInfoFactory,
+            Func<IApplicationInfo> applicationInfoFactory)
+        {
+            this.deviceInfoFactory = deviceInfoFactory;
+            this.platformInfoFactory = platformInfoFactory;
+            this.applicationInfoFactory = applicationInfoFactory;
+        }
+
+        public IDeviceInfo BuildDeviceInfo()
+        {
+            return deviceInfoFactory?.Invoke();
+        }
+
+        public IPlatformInfo BuildPlatformInfo()
+        {
+            return platformInfoFactory?.Invoke();
+        }
+
+        public IApplicationInfo BuildApplicationInfo()
+        {
+            return applicationInfoFactory?.Invoke();
+        }
+    }
+}

StrongBeaver.Core/Platform/DefaultPlatformModel.cs → StrongBeaver.Core.Platform/EnvironmentInfo.cs

@@ -1,8 +1,8 @@
 namespace StrongBeaver.Core.Platform
 {
-    public class DefaultPlatformModel : IPlatformModel
+    public class EnvironmentInfo : IEnvironmentInfo
     {
-        public DefaultPlatformModel(IPlatformInfo platform, IDeviceInfo device, IApplicationInfo application)
+        public EnvironmentInfo(IPlatformInfo platform, IDeviceInfo device, IApplicationInfo application)
         {
             Platform = platform;
             Device = device;

StrongBeaver.Core/Platform/IPlatformModel.cs → StrongBeaver.Core.Platform/IEnvironmentInfo.cs

@@ -1,8 +1,6 @@
-using System;
-
-namespace StrongBeaver.Core.Platform
+namespace StrongBeaver.Core.Platform
 {
-    public interface IPlatformModel
+    public interface IEnvironmentInfo
     {
         IPlatformInfo Platform { get; }
 

StrongBeaver.Core.Platform/IPlatformFactory.cs

@@ -0,0 +1,11 @@
+namespace StrongBeaver.Core.Platform
+{
+    public interface IPlatformFactory
+    {
+        IDeviceInfo BuildDeviceInfo();
+
+        IPlatformInfo BuildPlatformInfo();
+
+        IApplicationInfo BuildApplicationInfo();
+    }
+}

StrongBeaver.Core.Platform/IPlatformProvider.cs

@@ -0,0 +1,13 @@
+namespace StrongBeaver.Core.Platform
+{
+    public interface IPlatformProvider
+    {
+        IDeviceInfo DeviceInfo { get; }
+
+        IPlatformInfo PlatformInfo { get; }
+
+        IApplicationInfo ApplicationInfo { get; }
+
+        IEnvironmentInfo EnvironmentInfo { get; }
+    }
+}

StrongBeaver.Core.Platform/PlatformProvider.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Threading;
+
+namespace StrongBeaver.Core.Platform
+{
+    public class PlatformProvider : IPlatformProvider
+    {
+        private readonly Lazy<IDeviceInfo> deviceInfo;
+        private readonly Lazy<IPlatformInfo> platformInfo;
+        private readonly Lazy<IApplicationInfo> applicationInfo;
+        private readonly Lazy<IEnvironmentInfo> environmentInfo;
+
+        public PlatformProvider(IPlatformFactory factory)
+        {
+            if (factory == null)
+            {
+                throw new ArgumentNullException(nameof(factory));
+            }
+
+            deviceInfo = new Lazy<IDeviceInfo>(factory.BuildDeviceInfo, LazyThreadSafetyMode.PublicationOnly);
+            platformInfo = new Lazy<IPlatformInfo>(factory.BuildPlatformInfo, LazyThreadSafetyMode.PublicationOnly);
+            applicationInfo = new Lazy<IApplicationInfo>(factory.BuildApplicationInfo, LazyThreadSafetyMode.PublicationOnly);
+            environmentInfo = new Lazy<IEnvironmentInfo>(BuildEnvironmentInfo, LazyThreadSafetyMode.PublicationOnly);
+        }
+
+        public IDeviceInfo DeviceInfo => deviceInfo.Value;
+
+        public IPlatformInfo PlatformInfo => platformInfo.Value;
+
+        public IApplicationInfo ApplicationInfo => applicationInfo.Value;
+
+        public IEnvironmentInfo EnvironmentInfo => environmentInfo.Value;
+
+        private IEnvironmentInfo BuildEnvironmentInfo()
+        {
+            return new EnvironmentInfo(platformInfo.Value, deviceInfo.Value, applicationInfo.Value);
+        }
+    }
+}

StrongBeaver.Core/Platform/PlatformTypeEnum.cs → StrongBeaver.Core.Platform/PlatformTypeEnum.cs

@@ -9,6 +9,8 @@ public enum PlatformTypeEnum
         Android,
         WindowsPhone,
         WindowsUWP,
-        WindowsDesktop
+        WindowsDesktop,
+        WebSite,
+        Server,
     }
 }

StrongBeaver.Core.Platform/StrongBeaver.Core.Platform.csproj

@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <PackageId>BeaverSoft.StrongBeaver.Core.Platform</PackageId>
+    <Version>0.9.1-alpha</Version>
+    <Authors>BeaverSoft (Ales Kobr)</Authors>
+    <Company>BeaverSoft (Ales Kobr)</Company>
+    <Product>Platform info objects for StrongBeaver Framework</Product>
+    <Description>Platform info objects for StrongBeaver Framework.</Description>
+    <Copyright>Copyright 2017</Copyright>
+    <PackageLicenseUrl>https://github.com/akobr/strong-beaver/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageProjectUrl>https://github.com/akobr/strong-beaver</PackageProjectUrl>
+    <PackageIconUrl>https://github.com/akobr/strong-beaver/blob/master/doc/design/icon-nuget-package.png?raw=true</PackageIconUrl>
+    <PackageTags>Framework Strong Beaver Platform</PackageTags>
+    <PackageReleaseNotes>Alpha version created by BeaverSoft.</PackageReleaseNotes>
+    <NeutralLanguage>en-150</NeutralLanguage>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\StrongBeaver.Core\StrongBeaver.Core.csproj" />
+  </ItemGroup>
+
+</Project>

StrongBeaver.Core/IProvider.cs → StrongBeaver.Core.Providers/IProvider.cs

@@ -15,9 +15,6 @@ void Register<TInterface>(Func<TInterface> factory, string key)
         void Unregister<TInterface>()
             where TInterface : class, TProvidedItem;
 
-        void Unregister<TInterface>(TInterface item)
-            where TInterface : class, TProvidedItem;
-
         void Unregister<TInterface>(string key)
             where TInterface : class, TProvidedItem;
 

StrongBeaver.Core/Provider.cs → StrongBeaver.Core.Providers/Provider.cs

@@ -16,6 +16,12 @@ public Provider(IContainer container)
             this.container = container;
         }
 
+        public Provider()
+            : this(new SimpleIocContainer())
+        {
+            // no operation
+        }
+
         public TItem Get<TItem>()
             where TItem : TProvidedItem
         {
@@ -47,12 +53,6 @@ public void Unregister<TInterface>()
             container.Unregister<TInterface>();
         }
 
-        public void Unregister<TInterface>(TInterface item)
-            where TInterface : class, TProvidedItem
-        {
-            container.Unregister<TInterface>(item);
-        }
-
         public void Unregister<TInterface>(string key)
             where TInterface : class, TProvidedItem
         {

StrongBeaver.Core/ProviderWithMessageBus.cs → StrongBeaver.Core.Providers/ProviderWithMessageBus.cs

@@ -6,15 +6,19 @@ namespace StrongBeaver.Core
     public class ProviderWithMessageBus<TItem> : Provider<TItem>, IMessageBusProvider
         where TItem : class
     {
-        private readonly IMessenger messenger;
-
         public ProviderWithMessageBus(IContainer container)
             : base(container)
         {
-            messenger = new Messenger();
+            Messanger = new Messenger();
+        }
+
+        public ProviderWithMessageBus()
+            : this(new SimpleIocContainer())
+        {
+            // no operation
         }
 
-        public IMessenger Messanger => messenger;
+        public IMessenger Messanger { get; }
 
         public void RegisterToMessageBus<TRecipient, TMessage>(TRecipient recipient)
             where TRecipient : class, IMessageBusRecipient<TMessage>
@@ -24,13 +28,13 @@ public ProviderWithMessageBus(IContainer container)
                 return;
             }
 
-            messenger.Register<TMessage>(recipient, recipient.ProcessMessage);
+            Messanger.Register<TRecipient, TMessage>(recipient);
             Provider.LogDebugMessage($"The message bus recipient '{typeof(TRecipient).Name}' has been registered with message type '{typeof(TMessage).Name}'.");
         }
 
         public void UnregisterFromMessageBus(object recipient)
         {
-            messenger.Unregister(recipient);
+            Messanger.Unregister(recipient);
         }
     }
 }