Changes

firesharkstudios · Oct 21, 2019 · 3324e99 · 3324e99
1 parent ee1e63c
commit 3324e99
Show file tree

Hide file tree

Showing 20 changed files with 774 additions and 400 deletions.
diff --git a/Butterfly.Message.Aws/Butterfly.Message.Aws.csproj b/Butterfly.Message.Aws/Butterfly.Message.Aws.csproj
@@ -12,7 +12,7 @@
     <Authors>Kent Johnson</Authors>
     <Copyright>Copyright 2017-2019 Fireshark Studios, LLC</Copyright>
     <Description>Implementation of Butterfly.Message for AWS Simple Email Service</Description>
-    <Version>2.0.4</Version>
+    <Version>2.0.5</Version>
     <PackageReleaseNotes>Various improvements and bug fixes</PackageReleaseNotes>
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(MSBuildProjectName).xml</DocumentationFile>
     <LangVersion>7.1</LangVersion>

diff --git a/Butterfly.Message.Test/MessageTest.cs b/Butterfly.Message.Test/MessageTest.cs
@@ -16,7 +16,7 @@ public class MessageTest {
         [TestMethod]
         public void ParseSendMessage() {
             var email = FileX.LoadResourceAsText(Assembly.GetExecutingAssembly(), "Butterfly.Message.Test.email.txt");
-            var sendMessageTemplate = SendMessage.Parse(email);
+            var sendMessageTemplate = SendMessage.Parse(email, SimpleEvaluator.Evaluate);
             var sendMessage = sendMessageTemplate.Evaluate(new {
                 first_name = "Bob"
             });

diff --git a/Butterfly.Message.Twilio/Butterfly.Message.Twilio.csproj b/Butterfly.Message.Twilio/Butterfly.Message.Twilio.csproj
@@ -12,7 +12,7 @@
     <Authors>Kent Johnson</Authors>
     <Copyright>Copyright 2017-2019 Fireshark Studios, LLC</Copyright>
     <Description>Implementation of Butterfly.Message for Twilio SMS</Description>
-    <Version>2.0.4</Version>
+    <Version>2.0.5</Version>
     <PackageReleaseNotes>Various improvements and bug fixes</PackageReleaseNotes>
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(MSBuildProjectName).xml</DocumentationFile>
     <LangVersion>7.1</LangVersion>

diff --git a/Butterfly.Message/Butterfly.Message.csproj b/Butterfly.Message/Butterfly.Message.csproj
@@ -11,7 +11,7 @@
     <Company>Fireshark Studios, LLC</Company>
     <Product>Butterfly.Message</Product>
     <Copyright>Copyright 2017-2019 Fireshark Studios, LLC</Copyright>
-    <Version>2.0.4</Version>
+    <Version>2.0.5</Version>
     <PackageReleaseNotes>Various improvements and bug fixes</PackageReleaseNotes>
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(MSBuildProjectName).xml</DocumentationFile>
     <LangVersion>7.1</LangVersion>

diff --git a/Butterfly.Message/ScribanEvaluator.cs b/Butterfly.Message/ScribanEvaluator.cs
@@ -11,8 +11,8 @@
 namespace Butterfly.Message {
     public static class ScribanEvaluator {
 
-        public static string Evaluate(string text, Dict vars, string sourceFilePath) {
-            Template template = Template.Parse(text, sourceFilePath: sourceFilePath);
+        public static string Evaluate(string text, Dict vars, string path) {
+            Template template = Template.Parse(text, sourceFilePath: path);
             return template.RenderWithRelativeIncludes(vars);
         }
 

diff --git a/Butterfly.Message/SendMessage.cs b/Butterfly.Message/SendMessage.cs
@@ -25,19 +25,19 @@ public class SendMessage {
         public readonly string bodyHtml;
         public readonly byte priority;
         public readonly Func<string, Dict , string, string> evaluator;
-        public readonly string sourceFile;
+        public readonly string path;
 
         public Dict extraData = null;
 
-        public SendMessage(string from, string to, string subject, string bodyText, string bodyHtml = null, byte priority = 0, Func<string, Dict, string, string> evaluator = null, string sourceFile = null) {
+        public SendMessage(string from, string to, string subject, string bodyText, string bodyHtml = null, byte priority = 0, Func<string, Dict, string, string> evaluator = null, string path = null) {
             this.from = from;
             this.to = to;
             this.subject = subject;
             this.bodyText = bodyText;
             this.bodyHtml = bodyHtml;
             this.priority = priority;
             this.evaluator = evaluator;
-            this.sourceFile = sourceFile;
+            this.path = path;
             this.extraData = null;
         }
 
@@ -56,24 +56,15 @@ public SendMessage Evaluate(dynamic vars) {
                 values = DynamicX.ToDictionary(vars);
             }
 
-            string from = this.evaluator(this.from, values, this.sourceFile);
-            string to = this.evaluator(this.to, values, this.sourceFile);
-            string subject = this.evaluator(this.subject, values, this.sourceFile);
-            string bodyText = this.evaluator(this.bodyText, values, this.sourceFile);
-            string bodyHtml = this.evaluator(this.bodyHtml, values, this.sourceFile);
+            string from = this.evaluator(this.from, values, this.path);
+            string to = this.evaluator(this.to, values, this.path);
+            string subject = this.evaluator(this.subject, values, this.path);
+            string bodyText = this.evaluator(this.bodyText, values, this.path);
+            string bodyHtml = this.evaluator(this.bodyHtml, values, this.path);
             return new SendMessage(from, to, subject, bodyText, bodyHtml, this.priority);
         }
 
-        public static SendMessage ParseFile(string fileName, Dictionary<string, Func<string, Dict, string, string>> evaluatorByExtension) {
-            if (!File.Exists(fileName)) throw new Exception("Could not find file '" + fileName + "'");
-            var extension = Path.GetExtension(fileName);
-            if (!evaluatorByExtension.TryGetValue(extension, out Func<string, Dict, string, string> evaluator)) throw new Exception($"Unknown evaluator extension {extension}");
-
-            string text = File.ReadAllText(fileName);
-            return Parse(text, evaluator, fileName);
-        }
-
-        public static SendMessage Parse(string text, Func<string, Dict, string, string> evaluator, string sourceFile) {
+        public static SendMessage Parse(string text, Func<string, Dict, string, string> evaluator, string path = null) {
             string from = null;
             string to = null;
             string subject = null;
@@ -136,7 +127,7 @@ public static SendMessage Parse(string text, Func<string, Dict, string, string>
                 }
             }
 
-            return new SendMessage(from, to, subject, sectionByName.GetAs(TEXT_SECTION_NAME, (string)null), sectionByName.GetAs(HTML_SECTION_NAME, (string)null), priority, evaluator, sourceFile);
+            return new SendMessage(from, to, subject, sectionByName.GetAs(TEXT_SECTION_NAME, (string)null), sectionByName.GetAs(HTML_SECTION_NAME, (string)null), priority, evaluator, path);
         }
     }
 }
diff --git a/Butterfly.Message/SendMessageFileParser.cs b/Butterfly.Message/SendMessageFileParser.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+
+using Dict = System.Collections.Generic.Dictionary<string, object>;
+
+namespace Butterfly.Message {
+    public class SendMessageFileParser {
+
+        protected Dictionary<string, Func<string, Dict, string, string>> evaluatorByExtension;
+
+        public SendMessageFileParser(Dictionary<string, Func<string, Dict, string, string>> evaluatorByExtension = null) {
+            if (evaluatorByExtension==null) {
+                this.evaluatorByExtension = new Dictionary<string, Func<string, Dict, string, string>> {
+                    ["liquid"] = ScribanEvaluator.Evaluate,
+                    ["txt"] = SimpleEvaluator.Evaluate
+                };
+            }
+            else {
+                this.evaluatorByExtension = evaluatorByExtension;
+            }
+        }
+
+        public SendMessage Parse(string fileName) {
+            if (!File.Exists(fileName)) throw new Exception("Could not find file '" + fileName + "'");
+            var extension = Path.GetExtension(fileName);
+            if (!this.evaluatorByExtension.TryGetValue(extension, out Func<string, Dict, string, string> evaluator)) throw new Exception($"Unknown evaluator extension {extension}");
+
+            string text = File.ReadAllText(fileName);
+            return SendMessage.Parse(text, evaluator, Path.GetDirectoryName(fileName));
+        }
+
+    }
+}
diff --git a/docfx_project/api/.manifest b/docfx_project/api/.manifest
@@ -33,13 +33,16 @@
   "Butterfly.Message.SendMessage.HTML_SECTION_NAME": "Butterfly.Message.SendMessage.yml",
   "Butterfly.Message.SendMessage.logger": "Butterfly.Message.SendMessage.yml",
   "Butterfly.Message.SendMessage.Parse(System.String,Func{System.String,System.Collections.Generic.Dictionary{System.String,System.Object},System.String,System.String},System.String)": "Butterfly.Message.SendMessage.yml",
-  "Butterfly.Message.SendMessage.ParseFile(System.String,Dictionary{System.String,Func{System.String,System.Collections.Generic.Dictionary{System.String,System.Object},System.String,System.String}})": "Butterfly.Message.SendMessage.yml",
+  "Butterfly.Message.SendMessage.path": "Butterfly.Message.SendMessage.yml",
   "Butterfly.Message.SendMessage.priority": "Butterfly.Message.SendMessage.yml",
   "Butterfly.Message.SendMessage.SECTION_DELIM": "Butterfly.Message.SendMessage.yml",
-  "Butterfly.Message.SendMessage.sourceFile": "Butterfly.Message.SendMessage.yml",
   "Butterfly.Message.SendMessage.subject": "Butterfly.Message.SendMessage.yml",
   "Butterfly.Message.SendMessage.TEXT_SECTION_NAME": "Butterfly.Message.SendMessage.yml",
   "Butterfly.Message.SendMessage.to": "Butterfly.Message.SendMessage.yml",
+  "Butterfly.Message.SendMessageFileParser": "Butterfly.Message.SendMessageFileParser.yml",
+  "Butterfly.Message.SendMessageFileParser.#ctor(Dictionary{System.String,Func{System.String,System.Collections.Generic.Dictionary{System.String,System.Object},System.String,System.String}})": "Butterfly.Message.SendMessageFileParser.yml",
+  "Butterfly.Message.SendMessageFileParser.evaluatorByExtension": "Butterfly.Message.SendMessageFileParser.yml",
+  "Butterfly.Message.SendMessageFileParser.Parse(System.String)": "Butterfly.Message.SendMessageFileParser.yml",
   "Butterfly.Message.SendMessageQueueManager": "Butterfly.Message.SendMessageQueueManager.yml",
   "Butterfly.Message.SendMessageQueueManager.#ctor(Butterfly.Db.IDatabase,Butterfly.Message.IMessageSender,Butterfly.Message.IMessageSender,System.String,System.String,System.Int32,Butterfly.Message.SendMessage,Butterfly.Message.SendMessage,System.String)": "Butterfly.Message.SendMessageQueueManager.yml",
   "Butterfly.Message.SendMessageQueueManager.database": "Butterfly.Message.SendMessageQueueManager.yml",

diff --git a/docfx_project/api/Butterfly.Message.ScribanEvaluator.yml b/docfx_project/api/Butterfly.Message.ScribanEvaluator.yml
@@ -62,17 +62,17 @@ items:
   - Butterfly.Message
   namespace: Butterfly.Message
   syntax:
-    content: public static string Evaluate(string text, System.Collections.Generic.Dictionary<string, object> vars, string sourceFilePath)
+    content: public static string Evaluate(string text, System.Collections.Generic.Dictionary<string, object> vars, string path)
     parameters:
     - id: text
       type: System.String
     - id: vars
       type: System.Collections.Generic.Dictionary{System.String,System.Object}
-    - id: sourceFilePath
+    - id: path
       type: System.String
     return:
       type: System.String
-    content.vb: Public Shared Function Evaluate(text As String, vars As System.Collections.Generic.Dictionary(Of String, Object), sourceFilePath As String) As String
+    content.vb: Public Shared Function Evaluate(text As String, vars As System.Collections.Generic.Dictionary(Of String, Object), path As String) As String
   overload: Butterfly.Message.ScribanEvaluator.Evaluate*
   nameWithType.vb: ScribanEvaluator.Evaluate(String, System.Collections.Generic.Dictionary(Of String, Object), String)
   modifiers.csharp: