Merge pull request #8 from geeklearningio/master

sandorfr · web-flow · commit 983679233699 · 2016-08-09T19:25:27.000+02:00
Master
diff --git a/GeekLearning.Templating.sln b/GeekLearning.Templating.sln
@@ -1,7 +1,7 @@
 ﻿
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "GeekLearning.Templating", "src\GeekLearning.Templating\GeekLearning.Templating.xproj", "{369E8A80-AC62-4F8E-9CE3-AE5E6A35925E}"
 EndProject
@@ -19,6 +19,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		.gitattributes = .gitattributes
 		.gitignore = .gitignore
+		GitVersion.yml = GitVersion.yml
 		global.json = global.json
 		LICENSE.md = LICENSE.md
 		README.md = README.md
diff --git a/GitVersion.yml b/GitVersion.yml
@@ -0,0 +1,9 @@
+branches: 
+  dev(elop)?(ment)?$:
+    tag: alpha
+  features?[/-]:
+    tag: alpha.{BranchName}
+  releases?[/-]:
+    mode: ContinuousDeployment
+  hotfix(es)?[/-]:
+    mode: ContinuousDeployment
diff --git a/global.json b/global.json
@@ -1,6 +1,4 @@
 {
   "projects": [ "src", "samples" ],
-  "sdk": {
-    "version": "1.0.0-preview1-002702"
-  }
+  "sdk": { "version": "1.0.0-preview2-003121" }
 }
diff --git a/samples/GeekLearning.Templating.BasicSample/Controllers/TestController.cs b/samples/GeekLearning.Templating.BasicSample/Controllers/TestController.cs
@@ -18,7 +18,7 @@ public TestController(EmailTemplates templates)
 
         // POST api/values
         [HttpGet]
-        public async Task<string> Post([FromQuery]InvitationContext value)
+        public async Task<string> Get([FromQuery]InvitationContext value)
         {
             try
             {
@@ -32,7 +32,7 @@ public async Task<string> Post([FromQuery]InvitationContext value)
 
         // POST api/values
         [HttpGet("2")]
-        public async Task<string> Post2([FromQuery]InvitationContext value)
+        public async Task<string> Get2([FromQuery]InvitationContext value)
         {
             try
             {
@@ -43,5 +43,18 @@ public async Task<string> Post2([FromQuery]InvitationContext value)
                 return ice.InnerException.Message;
             }
         }
+
+        [HttpGet("3")]
+        public async Task<string> Get3([FromQuery]InvitationContext value)
+        {
+            try
+            {
+                return await templates.ApplyInvitation3Template(value);
+            }
+            catch (InvalidContextException ice)
+            {
+                return ice.InnerException.Message;
+            }
+        }
     }
 }
diff --git a/samples/GeekLearning.Templating.BasicSample/EmailTemplates.cs b/samples/GeekLearning.Templating.BasicSample/EmailTemplates.cs
@@ -22,5 +22,10 @@ public Task<string> ApplyInvitation2Template(InvitationContext context)
         {
             return this.LoadAndApplyTemplate("invitation2", context);
         }
+
+        public Task<string> ApplyInvitation3Template(InvitationContext context)
+        {
+            return this.LoadAndApplyTemplate("SubDir/invitation", context);
+        }
     }
 }
diff --git a/samples/GeekLearning.Templating.BasicSample/Startup.cs b/samples/GeekLearning.Templating.BasicSample/Startup.cs
@@ -17,17 +17,19 @@ public Startup(IHostingEnvironment env)
                 .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true)
                 .AddEnvironmentVariables();
             Configuration = builder.Build();
+            this.HostingEnvironment = env;
         }
 
         public IConfigurationRoot Configuration { get; }
+        public IHostingEnvironment HostingEnvironment { get; }
 
         // This method gets called by the runtime. Use this method to add services to the container.
         public void ConfigureServices(IServiceCollection services)
         {
             // Add framework services.
             services.AddMvc();
             services.AddMemoryCache();
-            services.AddStorage().AddFileSystemStorage().AddAzureStorage();
+            services.AddStorage().AddFileSystemStorage(HostingEnvironment.ContentRootPath).AddAzureStorage();
             services.Configure<StorageOptions>(Configuration.GetSection("Storage"));
             services.AddTemplating().AddMustache().AddHandlebars();
 
diff --git a/samples/GeekLearning.Templating.BasicSample/Templates/SubDir/_footer.hbs b/samples/GeekLearning.Templating.BasicSample/Templates/SubDir/_footer.hbs
@@ -0,0 +1,2 @@
+﻿-- 
+This is a more Awesome footer{{#if Origin}} (Copyright : {{Origin}}){{/if}}.
diff --git a/samples/GeekLearning.Templating.BasicSample/Templates/SubDir/invitation.hbs b/samples/GeekLearning.Templating.BasicSample/Templates/SubDir/invitation.hbs
@@ -0,0 +1,5 @@
+﻿Hi {{UserName}},
+
+This is another invitation to {{Something}}.
+
+{{> footer}}
diff --git a/samples/GeekLearning.Templating.BasicSample/project.json b/samples/GeekLearning.Templating.BasicSample/project.json
@@ -1,38 +1,34 @@
 ﻿{
   "dependencies": {
     "Microsoft.NETCore.App": {
-      "version": "1.0.0-rc2-3002702",
+      "version": "1.0.0",
       "type": "platform"
     },
-    "Microsoft.AspNetCore.Mvc": "1.0.0-rc2-final",
-    "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-rc2-final",
-    "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Configuration.FileExtensions": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Configuration.Json": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Logging": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Logging.Debug": "1.0.0-rc2-final",
-    "GeekLearning.Storage.FileSystem": "0.2.0",
-    "GeekLearning.Storage.Azure": "0.2.0",
+    "Microsoft.AspNetCore.Mvc": "1.0.0",
+    "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0",
+    "Microsoft.AspNetCore.Server.Kestrel": "1.0.0",
+    "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0",
+    "Microsoft.Extensions.Configuration.FileExtensions": "1.0.0",
+    "Microsoft.Extensions.Configuration.Json": "1.0.0",
+    "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0",
+    "Microsoft.Extensions.Logging": "1.0.0",
+    "Microsoft.Extensions.Logging.Console": "1.0.0",
+    "Microsoft.Extensions.Logging.Debug": "1.0.0",
+    "GeekLearning.Storage.FileSystem": "0.3.0-*",
+    "GeekLearning.Storage.Azure": "0.3.0-*",
     "GeekLearning.Templating": "*",
     "GeekLearning.Templating.Handlebars": "*",
     "GeekLearning.Templating.Mustache": "*"
   },
 
   "tools": {
-    "Microsoft.AspNetCore.Server.IISIntegration.Tools": {
-      "version": "1.0.0-preview1-final",
-      "imports": "portable-net45+win8+dnxcore50"
-    }
+    "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final"
   },
 
   "frameworks": {
     "netcoreapp1.0": {
       "imports": [
         "dotnet5.6",
-        "dnxcore50",
         "portable-net45+win8"
       ]
     }
@@ -44,7 +40,9 @@
   },
 
   "runtimeOptions": {
-    "gcServer": true
+    "configProperties": {
+      "System.GC.Server": true
+    }
   },
 
   "publishOptions": {
diff --git a/src/GeekLearning.Templating.Handlebars/project.json b/src/GeekLearning.Templating.Handlebars/project.json
@@ -9,9 +9,9 @@
   },
 
   "dependencies": {
-    "NETStandard.Library": "1.5.0-rc2-24027",
-    "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc2-final",
-    "handlebars.netstandard": "1.0.0-dotnet-core-rc2-0001",
+    "NETStandard.Library": "1.6.0",
+    "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0",
+    "Handlebars.NetStandard": "1.0.0-dotnet-core-rtm1",
     "GeekLearning.Templating": "*"
   },
 
@@ -20,7 +20,6 @@
     "netstandard1.5": {
       "imports": [
         "dotnet5.6",
-        "dnxcore50",
         "portable-net45+win8"
       ]
     }
diff --git a/src/GeekLearning.Templating.Mustache/project.json b/src/GeekLearning.Templating.Mustache/project.json
@@ -9,9 +9,9 @@
   },
 
   "dependencies": {
-    "NETStandard.Library": "1.5.0-rc2-24027",
-    "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc2-final",
-    "mustache-netstandard": "0.1.0-rc2-0001",
+    "NETStandard.Library": "1.6.0",
+    "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0",
+    "mustache-netstandard": "0.1.0-rtm-0001",
     "GeekLearning.Templating": "*"
   },
 
@@ -20,7 +20,6 @@
     "netstandard1.5": {
       "imports": [
         "dotnet5.6",
-        "dnxcore50",
         "portable-net45+win8"
       ]
     }
diff --git a/src/GeekLearning.Templating/Internal/TemplateLoader.cs b/src/GeekLearning.Templating/Internal/TemplateLoader.cs
@@ -22,34 +22,48 @@ public TemplateLoader(IStore store, IEnumerable<ITemplateProvider> providers, IM
             //this.scope = memoryCache.GetOrCreateAsync("x_tmpl_inf_scopes", async entry => { })
         }
 
-        public async Task<ITemplate> GetTemplate(string name)
+        public Task<ITemplate> GetTemplate(string name)
         {
-            return await this.memoryCache.GetOrCreateAsync($"x_tmpl_{name}", async entry =>
+            return this.memoryCache.GetOrCreateAsync($"x_tmpl_{this.store.Name}_{name}", async entry =>
             {
+                string directory;
+                string file;
+                var lastSlash = name.LastIndexOf('/');
+                if (lastSlash < 0)
+                {
+                    directory = "";
+                    file = name;
+                }
+                else
+                {
+                    directory = name.Substring(0, lastSlash);
+                    file = name.Substring(lastSlash + 1);
+                }
                 entry.SetPriority(CacheItemPriority.High);
-                var fileName = (await this.store.List($"{name}.*")).First();
-                var provider = this.providers.First(x => x.Extensions.Any(ext => fileName.EndsWith(ext)));
+                var fileReference = (await this.store.ListAsync(directory, $"{file}.*")).First();
+                var provider = this.providers.First(x => x.Extensions.Any(ext => fileReference.Path.EndsWith(ext)));
 
-                var scope = await GetScope(provider, name.Substring(Math.Max(0, name.LastIndexOf('/'))));
+                var scope = await GetScope(provider, directory);
 
-                return scope.Compile(await this.store.ReadAllText(fileName));
+                return scope.Compile(await this.store.ReadAllTextAsync(fileReference));
             });
         }
 
-        private async Task<ITemplateProviderScope> GetScope(ITemplateProvider provider, string name)
+        private Task<ITemplateProviderScope> GetScope(ITemplateProvider provider, string name)
         {
-            return await this.memoryCache.GetOrCreateAsync($"x_tmpl_inf_scopes_{provider.Extensions.First()}_{name}", async entry => {
+            return this.memoryCache.GetOrCreateAsync($"x_tmpl_{this.store.Name}_inf_scopes_{provider.Extensions.First()}_{name}", async entry =>
+            {
                 entry.SetPriority(CacheItemPriority.High);
                 var scope = provider.CreateScope();
-                var files = await this.store.List(name);
+                var files = await this.store.ListAsync(name, "_*.*");
                 foreach (var file in files)
                 {
-                    var path = file.Split('/');
+                    var path = file.Path.Split('/');
                     var fileName = path.Last();
-                    if (fileName.StartsWith("_") && provider.Extensions.Any(ext=> fileName.EndsWith(ext)))
+                    if (fileName.StartsWith("_") && provider.Extensions.Any(ext => fileName.EndsWith(ext)))
                     {
                         var partialName = System.IO.Path.GetFileNameWithoutExtension(fileName.Substring(1));
-                        scope.RegisterPartial(partialName, await this.store.ReadAllText(file));
+                        scope.RegisterPartial(partialName, await this.store.ReadAllTextAsync(file));
                     }
                 }
                 return scope;
diff --git a/src/GeekLearning.Templating/project.json b/src/GeekLearning.Templating/project.json
@@ -9,18 +9,17 @@
   },
 
   "dependencies": {
-    "NETStandard.Library": "1.5.0-rc2-24027",
-    "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Caching.Abstractions": "1.0.0-rc2-final",
-    "GeekLearning.Storage": "0.2.0"
+    "NETStandard.Library": "1.6.0",
+    "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0",
+    "Microsoft.Extensions.Caching.Abstractions": "1.0.0",
+    "GeekLearning.Storage": "0.3.0-*"
   },
 
   "frameworks": {
     "net451": { },
     "netstandard1.5": {
       "imports": [
         "dotnet5.6",
-        "dnxcore50",
         "portable-net45+win8"
       ]
     }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`	`1`	`{`
`2`	`2`	`"projects": [ "src", "samples" ],`
`3`		`- "sdk": {`
`4`		`- "version": "1.0.0-preview1-002702"`
`5`		`- }`
	`3`	`+ "sdk": { "version": "1.0.0-preview2-003121" }`
`6`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public TestController(EmailTemplates templates)`
`18`	`18`
`19`	`19`	`// POST api/values`
`20`	`20`	`[HttpGet]`
`21`		`- public async Task<string> Post([FromQuery]InvitationContext value)`
	`21`	`+ public async Task<string> Get([FromQuery]InvitationContext value)`
`22`	`22`	`{`
`23`	`23`	`try`
`24`	`24`	`{`
`@@ -32,7 +32,7 @@ public async Task<string> Post([FromQuery]InvitationContext value)`
`32`	`32`
`33`	`33`	`// POST api/values`
`34`	`34`	`[HttpGet("2")]`
`35`		`- public async Task<string> Post2([FromQuery]InvitationContext value)`
	`35`	`+ public async Task<string> Get2([FromQuery]InvitationContext value)`
`36`	`36`	`{`
`37`	`37`	`try`
`38`	`38`	`{`
`@@ -43,5 +43,18 @@ public async Task<string> Post2([FromQuery]InvitationContext value)`
`43`	`43`	`return ice.InnerException.Message;`
`44`	`44`	`}`
`45`	`45`	`}`
	`46`	`+`
	`47`	`+ [HttpGet("3")]`
	`48`	`+ public async Task<string> Get3([FromQuery]InvitationContext value)`
	`49`	`+ {`
	`50`	`+ try`
	`51`	`+ {`
	`52`	`+ return await templates.ApplyInvitation3Template(value);`
	`53`	`+ }`
	`54`	`+ catch (InvalidContextException ice)`
	`55`	`+ {`
	`56`	`+ return ice.InnerException.Message;`
	`57`	`+ }`
	`58`	`+ }`
`46`	`59`	`}`
`47`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,5 +22,10 @@ public Task<string> ApplyInvitation2Template(InvitationContext context)`
`22`	`22`	`{`
`23`	`23`	`return this.LoadAndApplyTemplate("invitation2", context);`
`24`	`24`	`}`
	`25`	`+`
	`26`	`+ public Task<string> ApplyInvitation3Template(InvitationContext context)`
	`27`	`+ {`
	`28`	`+ return this.LoadAndApplyTemplate("SubDir/invitation", context);`
	`29`	`+ }`
`25`	`30`	`}`
`26`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+--`
	`2`	`+This is a more Awesome footer{{#if Origin}} (Copyright : {{Origin}}){{/if}}.`