Merge with azure-storage

Author: JakeGinnivan

src/FunnelWeb.Azure/ServiceConfiguration.Cloud.cscfg

@@ -8,6 +8,8 @@
       <Setting name="funnelweb.configuration.authentication.username" value="test" />
       <Setting name="funnelweb.configuration.authentication.password" value="test" />
       <Setting name="funnelweb.configuration.database.provider" value="sql" />
+      <Setting name="StorageConnectionString" value="" />
+      <Setting name="BlobContainerName" value="FunnelWeb" />
     </ConfigurationSettings>
   </Role>
 </ServiceConfiguration>

src/FunnelWeb.Azure/ServiceConfiguration.Local.cscfg

@@ -8,6 +8,8 @@
       <Setting name="funnelweb.configuration.authentication.username" value="test" />
       <Setting name="funnelweb.configuration.authentication.password" value="test" />
       <Setting name="funnelweb.configuration.database.provider" value="sql" />
+      <Setting name="StorageConnectionString" value="UseDevelopmentStorage=true" />
+      <Setting name="BlobContainerName" value="FunnelWeb" />
     </ConfigurationSettings>
   </Role>
 </ServiceConfiguration>

src/FunnelWeb.Azure/ServiceDefinition.build.csdef

@@ -27,6 +27,9 @@
       <Setting name="funnelweb.configuration.authentication.username" />
       <Setting name="funnelweb.configuration.authentication.password" />
       <Setting name="funnelweb.configuration.database.provider" />
+      <Setting name="StorageConnectionString" />
+      <Setting name="BlobContainerName" />
     </ConfigurationSettings>
+    <LocalResources></LocalResources>
   </WebRole>
 </ServiceDefinition>

src/FunnelWeb.Azure/ServiceDefinition.csdef

@@ -19,6 +19,10 @@
       <Setting name="funnelweb.configuration.authentication.username" />
       <Setting name="funnelweb.configuration.authentication.password" />
       <Setting name="funnelweb.configuration.database.provider" />
+      <Setting name="StorageConnectionString" />
+      <Setting name="BlobContainerName" />
     </ConfigurationSettings>
+    <LocalResources>
+    </LocalResources>
   </WebRole>
 </ServiceDefinition>

src/FunnelWeb.Tests/Core/Repositories/FileRepositoryTests.cs

@@ -1,14 +1,23 @@
 using System;
 using System.Web;
 using FunnelWeb.Model.Repositories.Internal;
+using FunnelWeb.Providers.File;
 using FunnelWeb.Settings;
+using FunnelWeb.Utilities;
 using NSubstitute;
 using NUnit.Framework;
 
 namespace FunnelWeb.Tests.Core.Repositories
 {
     public class FileRepositoryTests
     {
+        private readonly IMimeTypeLookup mimeTypeLookup;
+
+        public FileRepositoryTests()
+        {
+            mimeTypeLookup = Substitute.For<IMimeTypeLookup>();
+        }
+
         [Test]
         public void RelativePaths()
         {
@@ -18,7 +27,7 @@ public void RelativePaths()
             var settings = Substitute.For<ISettingsProvider>();
             settings.GetSettings<FunnelWebSettings>().Returns(new FunnelWebSettings { UploadPath = "~/Temp" });
 
-            new FileRepository(settings, server);
+            new FileRepository(settings, server, mimeTypeLookup);
 
             //Act
 
@@ -34,7 +43,7 @@ public void AbsolutePaths()
             var settings = Substitute.For<ISettingsProvider>();
             settings.GetSettings<FunnelWebSettings>().Returns(new FunnelWebSettings { UploadPath = "C:\\Temp" });
 
-            new FileRepository(settings, server);
+            new FileRepository(settings, server, mimeTypeLookup);
 
             //Act
 

src/FunnelWeb.Tests/DatabaseDeployer/DatabaseUpgradeDetectorTests.cs

@@ -2,10 +2,9 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Linq;
-using Autofac.Features.Indexed;
 using DbUp.Engine;
 using FunnelWeb.DatabaseDeployer;
-using FunnelWeb.DatabaseDeployer.DbProviders;
+using FunnelWeb.Providers.Database;
 using NSubstitute;
 using NUnit.Framework;
 
@@ -15,23 +14,20 @@ namespace FunnelWeb.Tests.DatabaseDeployer
     public class DatabaseUpgradeDetectorTests
     {
         private DatabaseUpgradeDetector detector;
-        private IConnectionStringProvider connectionString;
+        private IConnectionStringSettings connectionString;
         private IApplicationDatabase applicationDatabase;
         private readonly List<ScriptedExtension> extensions = new List<ScriptedExtension>();
-        private IIndex<string, IDatabaseProvider> databaseProviderLookup;
         private IDatabaseProvider databaseProvider;
 
         [SetUp]
         public void SetUp()
         {
-            connectionString = Substitute.For<IConnectionStringProvider>();
+            connectionString = Substitute.For<IConnectionStringSettings>();
             connectionString.Schema = "dbo";
             connectionString.DatabaseProvider = "sql";
             applicationDatabase = Substitute.For<IApplicationDatabase>();
-            databaseProviderLookup = Substitute.For<IIndex<string, IDatabaseProvider>>();
             databaseProvider = Substitute.For<IDatabaseProvider>();
-            databaseProviderLookup[Arg.Any<string>()].Returns(databaseProvider);
-            detector = new DatabaseUpgradeDetector(connectionString, extensions, applicationDatabase, databaseProviderLookup);
+            detector = new DatabaseUpgradeDetector(connectionString, extensions, applicationDatabase, databaseProvider);
         }
 
         [Test]

src/FunnelWeb.Tests/Helpers/ITemporaryDatabase.cs

@@ -6,7 +6,7 @@
 
 namespace FunnelWeb.Tests.Helpers
 {
-    public interface ITemporaryDatabase : IDisposable, IConnectionStringProvider
+    public interface ITemporaryDatabase : IDisposable, IConnectionStringSettings
     {
         void WithRepository(Action<IRepository> callback);
         void WithSession(Action<ISession> callback);

src/FunnelWeb.Tests/Helpers/QueryIntegrationTest.cs

@@ -1,4 +1,3 @@
-using System;
 using NUnit.Framework;
 
 namespace FunnelWeb.Tests.Helpers

src/FunnelWeb.Tests/Helpers/SqlCeTemporaryDatabase.cs

@@ -7,8 +7,9 @@
 using DbUp.Engine.Output;
 using DbUp.Helpers;
 using FunnelWeb.DatabaseDeployer;
-using FunnelWeb.DatabaseDeployer.DbProviders;
 using FunnelWeb.Model.Repositories;
+using FunnelWeb.Providers;
+using FunnelWeb.Providers.Database;
 using FunnelWeb.Repositories;
 using NHibernate;
 
@@ -33,7 +34,8 @@ public SqlCeTemporaryDatabase()
             database = new AdHocSqlRunner(() => new SqlCeConnection(connectionString), null);
 
             var containerBuilder = new ContainerBuilder();
-            containerBuilder.RegisterInstance(this).As<IConnectionStringProvider>();
+            containerBuilder.RegisterInstance(this).As<IConnectionStringSettings>();
+            containerBuilder.RegisterModule(new InternalProviderRegistrationModule());
             containerBuilder.RegisterModule(new RepositoriesModule());
             containerBuilder.RegisterModule(new DatabaseModule());
             container = containerBuilder.Build();
@@ -90,7 +92,7 @@ public string Schema
             set { }
         }
 
-        public string ReadOnlyReason { get; private set; }
+        public string ReadOnlyReason { get; set; }
 
         public AdHocSqlRunner AdHoc
         {

src/FunnelWeb.Tests/LifetimeJustifications.cs

@@ -13,9 +13,13 @@
 using FunnelWeb.DatabaseDeployer;
 using FunnelWeb.Eventing;
 using FunnelWeb.Model.Repositories;
+using FunnelWeb.Providers;
+using FunnelWeb.Providers.Database;
+using FunnelWeb.Providers.File;
 using FunnelWeb.Repositories;
 using FunnelWeb.Settings;
 using FunnelWeb.Tasks;
+using FunnelWeb.Utilities;
 using FunnelWeb.Web.Application.Authentication;
 using FunnelWeb.Web.Application.Mime;
 using FunnelWeb.Web.Application.Mvc;
@@ -59,6 +63,7 @@ public void IntializeTheContainerJustLikeInGlobalAsax()
             builder.RegisterModule(new RepositoriesModule());
             builder.RegisterModule(new EventingModule());
             builder.RegisterModule(new ExtensionsModule("C:\\Foo", routes));
+            builder.RegisterModule(new InternalProviderRegistrationModule());
 
             //// FunnelWeb Web
             builder.RegisterModule(new WebAbstractionsModule());
@@ -83,9 +88,12 @@ public void ComponentsThatShouldBeSingletons()
 
             // The following are singletons just because there's no need to have more than one - if you have a good 
             // reason feel free to change
-            IsSingleton<IConnectionStringProvider>("This component uses the bootstrap settings to store the connection string. Since the bootstrap settings are opened/closed on the fly, there only needs to be one instance of this type.");
-            IsSingleton<IBootstrapSettings>("This component opens/closes the XML file on the fly; there's no need to have more than one.");
+            IsSingleton<IConnectionStringSettings>("This component uses the bootstrap settings to store the connection string. Since the bootstrap settings are opened/closed on the fly, there only needs to be one instance of this type.");
+            IsSingleton<IConfigSettings>("This component opens/closes the XML file on the fly; there's no need to have more than one.");
             IsSingleton<IMimeTypeLookup>("It just calls the registry/a static list - no need for more than one");
+
+            IsSingleton<IProviderInfo<IDatabaseProvider>>("This type extends the contains, no need to create multiple times");
+            IsSingleton<IProviderInfo<IFileRepository>>("This type extends the contains, no need to create multiple times");
         }
 
         [Test]