Merge remote-tracking branch 'refs/remotes/origin/develop'

Author: JimBobSquarePants

README.md

@@ -58,6 +58,15 @@ Update `~/Config/FileSystemProviders.config` replacing the default provider with
         Defaults to 365 days.
       -->
       <add key="maxDays" value="365" />
+      <!--
+        When true this allows the VirtualPathProvider to use the default "media" route prefix regardless 
+        of the container name.
+      -->
+      <add key="useDefaultRoute" value="true" />
+      <!--
+        When true blob containers will be private instead of public what means that you can't access the original blob file directly from its blob url.
+      -->
+      <add key="usePrivateContainer" value="false" />
     </Parameters>
   </Provider>
 </FileSystemProviders>
@@ -124,6 +133,7 @@ In `Web.config` create the new application keys and post fix each key with the `
 <add key="AzureBlobFileSystem.RootUrl:media" value="http://[myAccountName].blob.core.windows.net/" />
 <add key="AzureBlobFileSystem.MaxDays:media" value="365" />
 <add key="AzureBlobFileSystem.UseDefaultRoute:media" value="true" />
+<add key="AzureBlobFileSystem.UsePrivateContainer" value="false" />
 ```
 
 ## Virtual Path Provider
@@ -164,7 +174,8 @@ For **Umbraco v7.5+ you must add the the StaticFileHandler** to the new Web.conf
 
 ## Combining with ImageProcessor
 
-As of ImageProcessor.Web version [4.3.2](https://www.nuget.org/packages/ImageProcessor.Web/4.3.2) a new [`IImageService`](http://imageprocessor.org/imageprocessor-web/extending/#iimageservice) implementation has been available called `CloudImageService`. To enable that service and pull images directly from the cloud simply install the [configuration package](https://www.nuget.org/packages/ImageProcessor.Web.Config/) and replace the `CloudImageService`setting with the following:
+As of ImageProcessor.Web version [4.3.2](https://www.nuget.org/packages/ImageProcessor.Web/4.3.2) a new [`IImageService`](http://imageprocessor.org/imageprocessor-web/extending/#iimageservice) implementation has been available called `CloudImageService`. To enable that service and pull images directly from 
+the cloud simply install the [configuration package](https://www.nuget.org/packages/ImageProcessor.Web.Config/) and replace the `CloudImageService`setting with the following:
 
 ```xml
 <?xml version="1.0"?>
@@ -181,6 +192,8 @@ As of ImageProcessor.Web version [4.3.2](https://www.nuget.org/packages/ImagePro
   </services>  
 </security>
 ```
+**Note** The `CloudImageService`is not compatible with the FileSystemProvider when using private storage. You will have to build your own `IImageService` implementation.
+
 If using a version of ImageProcessor.Web version [4.5.0](https://www.nuget.org/packages/ImageProcessor.Web/4.5.0) the configuration details will need to be configured as follows:
 
 ```xml

appveyor.yml

@@ -1,7 +1,7 @@
 os: Visual Studio 2015
 
 # Version format
-version: 0.5.7.{build}
+version: 0.5.8.{build}
 
 cache:
   - src\packages -> **\packages.config   # preserve "packages" directory in the root of build folder but will reset it if packages.config is modified

build/transforms/FileSystemProviders.config.install.xdt

@@ -22,6 +22,10 @@
         of the container name.
       -->
       <add key="useDefaultRoute" value="true" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
+      <!--
+        When true blob containers will be private instead of public what means that you can't access the original blob file directly from its blob url.
+      -->
+      <add key="usePrivateContainer" value="false" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
     </Parameters>
   </Provider>
   <!--

src/.nuget/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="StyleCop.Analyzers" version="1.0.0" />
+</packages>

src/UmbracoFileSystemProviders.Azure.Installer/Configurator/Controllers/Configure.js

@@ -38,6 +38,6 @@ configApp.controller("Loader", function ($scope, $http, $log) {
     };
 
     $scope.getInputType = function (param) {
-        return param.toUpperCase() === "USEDEFAULTROUTE" ? "checkbox" : "text";
+        return param.toUpperCase() === "USEDEFAULTROUTE" || param.toUpperCase() === "USEPRIVATECONTAINER" ? "checkbox" : "text";
     };
 });

src/UmbracoFileSystemProviders.Azure.Installer/InstallerController.cs

@@ -77,6 +77,7 @@ public InstallerStatus PostParameters(IEnumerable<Parameter> parameters)
             string connection = newParameters.SingleOrDefault(k => k.Key == "connectionString").Value;
             string containerName = newParameters.SingleOrDefault(k => k.Key == "containerName").Value;
             bool useDefaultRoute = bool.Parse(newParameters.SingleOrDefault(k => k.Key == "useDefaultRoute").Value);
+            bool usePrivateContainer = bool.Parse(newParameters.SingleOrDefault(k => k.Key == "usePrivateContainer").Value);
             string rootUrl = newParameters.SingleOrDefault(k => k.Key == "rootUrl").Value;
 
             if (!TestAzureCredentials(connection, containerName))

src/UmbracoFileSystemProviders.Azure.Installer/Models/Parameter.cs

@@ -13,13 +13,13 @@ namespace Our.Umbraco.FileSystemProviders.Azure.Installer.Models
     public class Parameter
     {
         /// <summary>
-        /// The key.
+        /// Gets or sets the key.
         /// </summary>
         [JsonProperty("key")]
         public string Key { get; set; }
 
         /// <summary>
-        /// The value.
+        /// Gets or sets the value.
         /// </summary>
         [JsonProperty("value")]
         public string Value { get; set; }

src/UmbracoFileSystemProviders.Azure.Installer/PackageActions.cs

@@ -67,7 +67,7 @@ private bool Transform(string packageName, XmlNode xmlData, bool uninstall = fal
 
                     string sourceDocFileName = VirtualPathUtility.ToAbsolute(file);
 
-                    // The xdt file used for tranformation 
+                    // The xdt file used for tranformation
                     string fileEnd = "install.xdt";
                     if (uninstall)
                     {

src/UmbracoFileSystemProviders.Azure.Installer/Properties/AssemblyInfo.cs

@@ -1,8 +1,13 @@
-using System.Reflection;
+// <copyright file="AssemblyInfo.cs" company="James Jackson-South, Jeavon Leopold, and contributors">
+// Copyright (c) James Jackson-South, Jeavon Leopold, and contributors. All rights reserved.
+// Licensed under the Apache License, Version 2.0.
+// </copyright>
+
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("UmbracoFileSystemProviders.Azure.Installer")]
@@ -14,8 +19,8 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 

src/UmbracoFileSystemProviders.Azure.Installer/Properties/VersionInfo.cs

@@ -1,5 +1,5 @@
-// <copyright file="VersionInfo.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South. All rights reserved.
+// <copyright file="VersionInfo.cs" company="James Jackson-South, Jeavon Leopold, and contributors">
+// Copyright (c) James Jackson-South, Jeavon Leopold, and contributors. All rights reserved.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
@@ -8,11 +8,11 @@
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers 
+// You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("0.5.0.10")]
 [assembly: AssemblyVersion("0.5.0.0")]