Merge pull request #7 from geeklearningio/release/0.2.0

sandorfr · web-flow · commit 1b718d528244 · 2016-08-09T19:19:38.000+02:00
Release/0.2.0
diff --git a/.gitignore b/.gitignore
@@ -242,4 +242,5 @@ ModelManifest.xml
 .paket/paket.exe
 
 # FAKE - F# Make
-.fake/
+.fake/
+/tests/GeekLearning.Email.Integration.Test/appsettings.development.json
diff --git a/GeekLearning.Email.sln b/GeekLearning.Email.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.Email", "src\GeekLearning.Email\GeekLearning.Email.xproj", "{474EEA84-EBFB-4925-BDC2-619C21E7EBC9}"
 EndProject
@@ -11,6 +11,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
@@ -20,6 +21,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{6898
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "GeekLearning.Email.Samples", "samples\GeekLearning.Email.Samples\GeekLearning.Email.Samples.xproj", "{EDA94EFF-7FF4-4C79-BC52-93BC7E696FF6}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{8DF5B138-1052-4991-88EF-FF23AE1DCC34}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "GeekLearning.Email.Integration.Test", "tests\GeekLearning.Email.Integration.Test\GeekLearning.Email.Integration.Test.xproj", "{86B313ED-41D4-424F-A172-7D0E8EEE5E49}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -34,12 +39,17 @@ Global
 		{EDA94EFF-7FF4-4C79-BC52-93BC7E696FF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EDA94EFF-7FF4-4C79-BC52-93BC7E696FF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EDA94EFF-7FF4-4C79-BC52-93BC7E696FF6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{86B313ED-41D4-424F-A172-7D0E8EEE5E49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{86B313ED-41D4-424F-A172-7D0E8EEE5E49}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{86B313ED-41D4-424F-A172-7D0E8EEE5E49}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{86B313ED-41D4-424F-A172-7D0E8EEE5E49}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{474EEA84-EBFB-4925-BDC2-619C21E7EBC9} = {01E85AC0-EFEF-4564-9EE9-9A124776B72E}
 		{EDA94EFF-7FF4-4C79-BC52-93BC7E696FF6} = {68985ADC-F984-4594-AF38-6A6EEFB2DFDE}
+		{86B313ED-41D4-424F-A172-7D0E8EEE5E49} = {8DF5B138-1052-4991-88EF-FF23AE1DCC34}
 	EndGlobalSection
 EndGlobal
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", "test" ],
-  "sdk": {
-    "version": "1.0.0-preview1-002702"
-  }
+  "projects": [ "src", "tests", "samples" ],
+  "sdk": { "version": "1.0.0-preview2-003121" }
 }
diff --git a/samples/GeekLearning.Email.Samples/Startup.cs b/samples/GeekLearning.Email.Samples/Startup.cs
@@ -22,17 +22,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.AddStorage().AddFileSystemStorage();
+            services.AddStorage().AddFileSystemStorage(this.HostingEnvironment.ContentRootPath);
             services.Configure<StorageOptions>(Configuration.GetSection("Storage"));
             services.AddTemplating().AddHandlebars();
 
diff --git a/samples/GeekLearning.Email.Samples/Templates/Invitation-BodyHtml.hbs b/samples/GeekLearning.Email.Samples/Templates/Invitation-BodyHtml.hbs
@@ -13,3 +13,4 @@
         <span style="font-size:10pt;">This is an invitation to {{ApplicationName}}.</span>
     </font>
 </div>
+{{> Footer-Html}}
diff --git a/samples/GeekLearning.Email.Samples/Templates/Invitation-BodyText.hbs b/samples/GeekLearning.Email.Samples/Templates/Invitation-BodyText.hbs
@@ -1,3 +1,4 @@
 Hi {{User.DisplayName}},
 
-This is an invitation to {{ApplicationName}}.
+This is an invitation to {{ApplicationName}}.
+{{> Footer-Text}}
diff --git a/samples/GeekLearning.Email.Samples/Templates/_Footer-Html.hbs b/samples/GeekLearning.Email.Samples/Templates/_Footer-Html.hbs
@@ -0,0 +1,5 @@
+﻿<div style="margin:0;">
+    <font face="Calibri,sans-serif" size="2">
+        <span style="font-size:10pt;">This is an awesome footer.</span>
+    </font>
+</div>
diff --git a/samples/GeekLearning.Email.Samples/Templates/_Footer-Text.hbs b/samples/GeekLearning.Email.Samples/Templates/_Footer-Text.hbs
@@ -0,0 +1,2 @@
+﻿--
+This is an awesome footer
diff --git a/samples/GeekLearning.Email.Samples/project.json b/samples/GeekLearning.Email.Samples/project.json
@@ -1,46 +1,39 @@
 ﻿{
   "dependencies": {
     "Microsoft.NETCore.App": {
-      "version": "1.0.0-rc2-3002702",
+      "version": "1.0.0",
       "type": "platform"
     },
-    "Microsoft.AspNetCore.Diagnostics": "1.0.0-rc2-final",
-    "Microsoft.AspNetCore.Mvc": "1.0.0-rc2-final",
+    "Microsoft.AspNetCore.Diagnostics": "1.0.0",
+    "Microsoft.AspNetCore.Mvc": "1.0.0",
     "Microsoft.AspNetCore.Razor.Tools": {
-      "version": "1.0.0-preview1-final",
+      "version": "1.0.0-preview2-final",
       "type": "build"
     },
-    "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-rc2-final",
-    "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-final",
-    "Microsoft.AspNetCore.StaticFiles": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Configuration.Json": "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",
-    "Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.0.0-rc2-final",
-    "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0-rc2-final",
-    "GeekLearning.Storage.FileSystem": "0.2.0",
-    "GeekLearning.Templating.Handlebars": "0.2.1",
+    "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0",
+    "Microsoft.AspNetCore.Server.Kestrel": "1.0.0",
+    "Microsoft.AspNetCore.StaticFiles": "1.0.0",
+    "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0",
+    "Microsoft.Extensions.Configuration.Json": "1.0.0",
+    "Microsoft.Extensions.Logging": "1.0.0",
+    "Microsoft.Extensions.Logging.Console": "1.0.0",
+    "Microsoft.Extensions.Logging.Debug": "1.0.0",
+    "Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.0.0",
+    "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0",
+    "GeekLearning.Storage.FileSystem": "0.3.0-*",
+    "GeekLearning.Templating.Handlebars": "0.3.0-*",
     "GeekLearning.Email": "*"
   },
 
   "tools": {
-    "Microsoft.AspNetCore.Razor.Tools": {
-      "version": "1.0.0-preview1-final",
-      "imports": "portable-net45+win8+dnxcore50"
-    },
-    "Microsoft.AspNetCore.Server.IISIntegration.Tools": {
-      "version": "1.0.0-preview1-final",
-      "imports": "portable-net45+win8+dnxcore50"
-    }
+    "Microsoft.AspNetCore.Razor.Tools": "1.0.0-preview2-final",
+    "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final"
   },
 
   "frameworks": {
     "netcoreapp1.0": {
       "imports": [
         "dotnet5.6",
-        "dnxcore50",
         "portable-net45+win8"
       ]
     }
diff --git a/src/GeekLearning.Email/project.json b/src/GeekLearning.Email/project.json
@@ -9,19 +9,18 @@
   },
 
   "dependencies": {
-    "NETStandard.Library": "1.5.0-rc2-24027",
-    "Microsoft.Extensions.Options": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Caching.Abstractions": "1.0.0-rc2-final",
-    "Newtonsoft.Json": "8.0.3",
-    "GeekLearning.Templating": "0.2.1"
+    "NETStandard.Library": "1.6.0",
+    "Microsoft.Extensions.Options": "1.0.0",
+    "Microsoft.Extensions.Caching.Abstractions": "1.0.0",
+    "Newtonsoft.Json": "9.0.1",
+    "GeekLearning.Templating": "0.3.0-*"
   },
 
   "frameworks": {
     "net451": { },
     "netstandard1.5": {
       "imports": [
         "dotnet5.6",
-        "dnxcore50",
         "portable-net45+win8"
       ]
     }
diff --git a/tests/GeekLearning.Email.Integration.Test/GeekLearning.Email.Integration.Test.xproj b/tests/GeekLearning.Email.Integration.Test/GeekLearning.Email.Integration.Test.xproj
@@ -0,0 +1,22 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>86b313ed-41d4-424f-a172-7d0e8eee5e49</ProjectGuid>
+    <RootNamespace>GeekLearning.Email.Integration.Test</RootNamespace>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
+</Project>
diff --git a/tests/GeekLearning.Email.Integration.Test/IntegrationCollection.cs b/tests/GeekLearning.Email.Integration.Test/IntegrationCollection.cs
@@ -0,0 +1,14 @@
+﻿namespace GeekLearning.Email.Integration.Test
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Xunit;
+
+    [CollectionDefinition(nameof(IntegrationCollection))]
+    public class IntegrationCollection: ICollectionFixture<StoresFixture>
+    {
+
+    }
+}
diff --git a/tests/GeekLearning.Email.Integration.Test/Properties/AssemblyInfo.cs b/tests/GeekLearning.Email.Integration.Test/Properties/AssemblyInfo.cs
@@ -0,0 +1,19 @@
+﻿using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 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: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("GeekLearning.Email.Integration.Test")]
+[assembly: AssemblyTrademark("")]
+
+// 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)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("86b313ed-41d4-424f-a172-7d0e8eee5e49")]
diff --git a/tests/GeekLearning.Email.Integration.Test/SampleDirectory/Notification1-BodyHtml.hbs b/tests/GeekLearning.Email.Integration.Test/SampleDirectory/Notification1-BodyHtml.hbs
@@ -0,0 +1 @@
+﻿htmlbody
diff --git a/tests/GeekLearning.Email.Integration.Test/SampleDirectory/Notification1-BodyText.hbs b/tests/GeekLearning.Email.Integration.Test/SampleDirectory/Notification1-BodyText.hbs
@@ -0,0 +1 @@
+﻿textbody
diff --git a/tests/GeekLearning.Email.Integration.Test/SampleDirectory/Notification1-Subject.hbs b/tests/GeekLearning.Email.Integration.Test/SampleDirectory/Notification1-Subject.hbs
@@ -0,0 +1 @@
+﻿subject
diff --git a/tests/GeekLearning.Email.Integration.Test/SendTemplatedTest.cs b/tests/GeekLearning.Email.Integration.Test/SendTemplatedTest.cs
@@ -0,0 +1,59 @@
+﻿using GeekLearning.Storage;
+using GeekLearning.Templating;
+using Microsoft.Extensions.DependencyInjection;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace GeekLearning.Email.Integration.Test
+{
+    [Collection(nameof(IntegrationCollection))]
+    [Trait("Operation", "SendTemplated"), Trait("Kind", "Integration")]
+    public class SendTemplatedTest
+    {
+        StoresFixture storeFixture;
+
+        public SendTemplatedTest(StoresFixture fixture)
+        {
+            this.storeFixture = fixture;
+        }
+
+        [Theory(DisplayName = nameof(SendNotification1)), InlineData("azure"), InlineData("filesystem")]
+        public async Task SendNotification1(string storeName)
+        {
+            var options = Microsoft.Extensions.Options.Options.Create(new EmailOptions
+            {
+                TemplateStorage = storeName,
+                DefaultSender = new Internal.EmailAddress
+                {
+                    DisplayName = "test user",
+                    Email = "no-reply@test.geeklearning.io"
+                },
+                Key = storeFixture.SendGridKey,
+                User = storeFixture.SendGridUser,
+                Mockup = new EmailOptions.MockupOptions
+                {
+                    Disclaimer = "",
+                    Exceptions = new EmailOptions.MockupExceptionsOptions
+                    {
+                        Domains = new List<string>(),
+                        Emails = new List<string>(),
+                    },
+                    Recipients = new List<string>()
+                }
+            });
+            var emailSender = new Internal.EmailSender(options,
+                this.storeFixture.Services.GetRequiredService<ITemplateLoaderFactory>(),
+                this.storeFixture.Services.GetRequiredService<IStorageFactory>()
+                );
+
+            await emailSender.SendTemplatedEmail("Notification1", new { }, new Internal.EmailAddress
+            {
+                DisplayName = "test user",
+                Email = "no-reply@test.geeklearning.io"
+            });
+        }
+    }
+}
diff --git a/tests/GeekLearning.Email.Integration.Test/StoresFixture.cs b/tests/GeekLearning.Email.Integration.Test/StoresFixture.cs
diff --git a/tests/GeekLearning.Email.Integration.Test/appsettings.json b/tests/GeekLearning.Email.Integration.Test/appsettings.json
diff --git a/tests/GeekLearning.Email.Integration.Test/project.json b/tests/GeekLearning.Email.Integration.Test/project.json

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`	`1`	`{`
`2`		`- "projects": [ "src", "test" ],`
`3`		`- "sdk": {`
`4`		`- "version": "1.0.0-preview1-002702"`
`5`		`- }`
	`2`	`+ "projects": [ "src", "tests", "samples" ],`
	`3`	`+ "sdk": { "version": "1.0.0-preview2-003121" }`
`6`	`4`	`}`