From f0573fc68c0f795622951bf922809436a661dca7 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 20 Jan 2014 13:59:25 +1100
Subject: [PATCH] Fixes: U4-4084 Macro's with non alphanumeric chars in their
 aliases cannot render in the rich text editor

---
 src/Umbraco.Core/Macros/MacroTagParser.cs     |  6 +-
 src/Umbraco.Tests/Macros/MacroParserTests.cs  | 92 +++++++++++++++++--
 .../src/common/services/macro.service.js      |  2 +-
 .../common/services/macro-service.spec.js     | 14 +++
 4 files changed, 103 insertions(+), 11 deletions(-)

diff --git a/src/Umbraco.Core/Macros/MacroTagParser.cs b/src/Umbraco.Core/Macros/MacroTagParser.cs
index ba6793580b..2a4916eb78 100644
--- a/src/Umbraco.Core/Macros/MacroTagParser.cs
+++ b/src/Umbraco.Core/Macros/MacroTagParser.cs
@@ -12,7 +12,7 @@ namespace Umbraco.Core.Macros
 	internal class MacroTagParser
 	{
         private static readonly Regex MacroRteContent = new Regex(@"(<!--\s*?)(<\?UMBRACO_MACRO.*?/>)(\s*?-->)", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.Singleline);
-        private static readonly Regex MacroPersistedFormat = new Regex(@"(<\?UMBRACO_MACRO macroAlias=[""'](\w+?)[""'].+?)(?:/>|>.*?</\?UMBRACO_MACRO>)", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.Singleline);
+        private static readonly Regex MacroPersistedFormat = new Regex(@"(<\?UMBRACO_MACRO macroAlias=[""']([\w\.]+?)[""'].+?)(?:/>|>.*?</\?UMBRACO_MACRO>)", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.Singleline);
 
 	    /// <summary>
 	    /// This formats the persisted string to something useful for the rte so that the macro renders properly since we 
@@ -39,8 +39,8 @@ namespace Umbraco.Core.Macros
                     //<div class="umb-macro-holder myMacro mceNonEditable">
                     var alias = match.Groups[2].Value;
                     var sb = new StringBuilder("<div class=\"umb-macro-holder ");
-                    sb.Append(alias);
-                    sb.Append(" mceNonEditable\"");
+                    //sb.Append(alias.ToSafeAlias());
+                    sb.Append("mceNonEditable\"");
                     foreach (var htmlAttribute in htmlAttributes)
                     {
                         sb.Append(" ");
diff --git a/src/Umbraco.Tests/Macros/MacroParserTests.cs b/src/Umbraco.Tests/Macros/MacroParserTests.cs
index b4c17fec18..a8e171df3e 100644
--- a/src/Umbraco.Tests/Macros/MacroParserTests.cs
+++ b/src/Umbraco.Tests/Macros/MacroParserTests.cs
@@ -16,6 +16,29 @@ namespace Umbraco.Tests.Macros
             Assert.AreEqual(@"<p>hello world</p>", content);
         }
 
+        [Test]
+        public void Format_RTE_Data_For_Editor_With_Non_AlphaNumeric_Char_In_Alias()
+        {
+            var content = @"<p>asdfasdf</p>
+<p>asdfsadf</p>
+<?UMBRACO_MACRO macroAlias=""My.Map.isCool"" />
+<p>asdfasdf</p>";
+            var result = MacroTagParser.FormatRichTextPersistedDataForEditor(content, new Dictionary<string, string>() { { "test1", "value1" }, { "test2", "value2" } });
+
+//            Assert.AreEqual(@"<p>asdfasdf</p>
+//<p>asdfsadf</p>
+//<div class=""umb-macro-holder Map mceNonEditable"" test1=""value1"" test2=""value2"">
+//<!-- <?UMBRACO_MACRO macroAlias=""Map"" /> -->
+//<ins>Macro alias: <strong>Map</strong></ins></div>
+//<p>asdfasdf</p>".Replace(Environment.NewLine, string.Empty), result.Replace(Environment.NewLine, string.Empty));
+            Assert.AreEqual(@"<p>asdfasdf</p>
+<p>asdfsadf</p>
+<div class=""umb-macro-holder mceNonEditable"" test1=""value1"" test2=""value2"">
+<!-- <?UMBRACO_MACRO macroAlias=""My.Map.isCool"" /> -->
+<ins>Macro alias: <strong>My.Map.isCool</strong></ins></div>
+<p>asdfasdf</p>".Replace(Environment.NewLine, string.Empty), result.Replace(Environment.NewLine, string.Empty));
+        }
+
         [Test]
         public void Format_RTE_Data_For_Editor()
         {
@@ -25,9 +48,16 @@ namespace Umbraco.Tests.Macros
 <p>asdfasdf</p>";
             var result = MacroTagParser.FormatRichTextPersistedDataForEditor(content, new Dictionary<string, string>(){{"test1", "value1"},{"test2", "value2"}});
 
+//            Assert.AreEqual(@"<p>asdfasdf</p>
+//<p>asdfsadf</p>
+//<div class=""umb-macro-holder Map mceNonEditable"" test1=""value1"" test2=""value2"">
+//<!-- <?UMBRACO_MACRO macroAlias=""Map"" /> -->
+//<ins>Macro alias: <strong>Map</strong></ins></div>
+//<p>asdfasdf</p>".Replace(Environment.NewLine, string.Empty), result.Replace(Environment.NewLine, string.Empty));
+
             Assert.AreEqual(@"<p>asdfasdf</p>
 <p>asdfsadf</p>
-<div class=""umb-macro-holder Map mceNonEditable"" test1=""value1"" test2=""value2"">
+<div class=""umb-macro-holder mceNonEditable"" test1=""value1"" test2=""value2"">
 <!-- <?UMBRACO_MACRO macroAlias=""Map"" /> -->
 <ins>Macro alias: <strong>Map</strong></ins></div>
 <p>asdfasdf</p>".Replace(Environment.NewLine, string.Empty), result.Replace(Environment.NewLine, string.Empty));
@@ -42,9 +72,15 @@ namespace Umbraco.Tests.Macros
 <p>asdfasdf</p>";
             var result = MacroTagParser.FormatRichTextPersistedDataForEditor(content, new Dictionary<string, string>() { { "test1", "value1" }, { "test2", "value2" } });
 
+//            Assert.AreEqual(@"<p>asdfasdf</p>
+//<p>asdfsadf</p>
+//<div class=""umb-macro-holder Map mceNonEditable"" test1=""value1"" test2=""value2"">
+//<!-- <?UMBRACO_MACRO macroAlias=""Map"" /> -->
+//<ins>Macro alias: <strong>Map</strong></ins></div>
+//<p>asdfasdf</p>".Replace(Environment.NewLine, string.Empty), result.Replace(Environment.NewLine, string.Empty));
             Assert.AreEqual(@"<p>asdfasdf</p>
 <p>asdfsadf</p>
-<div class=""umb-macro-holder Map mceNonEditable"" test1=""value1"" test2=""value2"">
+<div class=""umb-macro-holder mceNonEditable"" test1=""value1"" test2=""value2"">
 <!-- <?UMBRACO_MACRO macroAlias=""Map"" /> -->
 <ins>Macro alias: <strong>Map</strong></ins></div>
 <p>asdfasdf</p>".Replace(Environment.NewLine, string.Empty), result.Replace(Environment.NewLine, string.Empty));
@@ -59,9 +95,15 @@ namespace Umbraco.Tests.Macros
 <p>asdfasdf</p>";
             var result = MacroTagParser.FormatRichTextPersistedDataForEditor(content, new Dictionary<string, string>() { { "test1", "value1" }, { "test2", "value2" } });
 
+//            Assert.AreEqual(@"<p>asdfasdf</p>
+//<p>asdfsadf</p>
+//<div class=""umb-macro-holder Map mceNonEditable"" test1=""value1"" test2=""value2"">
+//<!-- <?UMBRACO_MACRO macroAlias=""Map"" test1=""value1"" test2=""value2"" /> -->
+//<ins>Macro alias: <strong>Map</strong></ins></div>
+//<p>asdfasdf</p>".Replace(Environment.NewLine, string.Empty), result.Replace(Environment.NewLine, string.Empty));
             Assert.AreEqual(@"<p>asdfasdf</p>
 <p>asdfsadf</p>
-<div class=""umb-macro-holder Map mceNonEditable"" test1=""value1"" test2=""value2"">
+<div class=""umb-macro-holder mceNonEditable"" test1=""value1"" test2=""value2"">
 <!-- <?UMBRACO_MACRO macroAlias=""Map"" test1=""value1"" test2=""value2"" /> -->
 <ins>Macro alias: <strong>Map</strong></ins></div>
 <p>asdfasdf</p>".Replace(Environment.NewLine, string.Empty), result.Replace(Environment.NewLine, string.Empty));
@@ -76,9 +118,15 @@ namespace Umbraco.Tests.Macros
 <p>asdfasdf</p>";
             var result = MacroTagParser.FormatRichTextPersistedDataForEditor(content, new Dictionary<string, string>() { { "test1", "value1" }, { "test2", "value2" } });
 
+//            Assert.AreEqual(@"<p>asdfasdf</p>
+//<p>asdfsadf</p>
+//<div class=""umb-macro-holder Map mceNonEditable"" test1=""value1"" test2=""value2"">
+//<!-- <?UMBRACO_MACRO macroAlias=""Map"" test1=""value1"" test2=""value2"" /> -->
+//<ins>Macro alias: <strong>Map</strong></ins></div>
+//<p>asdfasdf</p>".Replace(Environment.NewLine, string.Empty), result.Replace(Environment.NewLine, string.Empty));
             Assert.AreEqual(@"<p>asdfasdf</p>
 <p>asdfsadf</p>
-<div class=""umb-macro-holder Map mceNonEditable"" test1=""value1"" test2=""value2"">
+<div class=""umb-macro-holder mceNonEditable"" test1=""value1"" test2=""value2"">
 <!-- <?UMBRACO_MACRO macroAlias=""Map"" test1=""value1"" test2=""value2"" /> -->
 <ins>Macro alias: <strong>Map</strong></ins></div>
 <p>asdfasdf</p>".Replace(Environment.NewLine, string.Empty), result.Replace(Environment.NewLine, string.Empty));
@@ -93,9 +141,15 @@ namespace Umbraco.Tests.Macros
 <p>asdfasdf</p>";
             var result = MacroTagParser.FormatRichTextPersistedDataForEditor(content, new Dictionary<string, string>() { { "test1", "value1" }, { "test2", "value2" } });
 
+//            Assert.AreEqual(@"<p>asdfasdf</p>
+//<p>asdfsadf</p>
+//<div class=""umb-macro-holder Map mceNonEditable"" test1=""value1"" test2=""value2"">
+//<!-- <?UMBRACO_MACRO macroAlias=""Map"" test1=""value1"" test2=""value2"" /> -->
+//<ins>Macro alias: <strong>Map</strong></ins></div>
+//<p>asdfasdf</p>".Replace(Environment.NewLine, string.Empty), result.Replace(Environment.NewLine, string.Empty));
             Assert.AreEqual(@"<p>asdfasdf</p>
 <p>asdfsadf</p>
-<div class=""umb-macro-holder Map mceNonEditable"" test1=""value1"" test2=""value2"">
+<div class=""umb-macro-holder mceNonEditable"" test1=""value1"" test2=""value2"">
 <!-- <?UMBRACO_MACRO macroAlias=""Map"" test1=""value1"" test2=""value2"" /> -->
 <ins>Macro alias: <strong>Map</strong></ins></div>
 <p>asdfasdf</p>".Replace(Environment.NewLine, string.Empty), result.Replace(Environment.NewLine, string.Empty));
@@ -104,10 +158,26 @@ namespace Umbraco.Tests.Macros
         [Test]
         public void Format_RTE_Data_For_Persistence()
         {
+//            var content = @"<html>
+//<body>
+//<h1>asdfasdf</h1>
+//<div class='umb-macro-holder Map mceNonEditable' att1='asdf' att2='asdfasdfasdf' att3=""sdfsdfd"">
+//<!-- <?UMBRACO_MACRO macroAlias=""myMacro"" param1=""test1"" param2=""test2"" /> -->
+//asdfasdf 
+//asdfas
+//<span>asdfasdfasdf</span>
+//<p>asdfasdf</p>
+//</div>
+//<span>asdfdasf</span>
+//<div>
+//asdfsdf
+//</div>
+//</body>
+//</html>";
             var content = @"<html>
 <body>
 <h1>asdfasdf</h1>
-<div class='umb-macro-holder Map mceNonEditable' att1='asdf' att2='asdfasdfasdf' att3=""sdfsdfd"">
+<div class='umb-macro-holder mceNonEditable' att1='asdf' att2='asdfasdfasdf' att3=""sdfsdfd"">
 <!-- <?UMBRACO_MACRO macroAlias=""myMacro"" param1=""test1"" param2=""test2"" /> -->
 asdfasdf 
 asdfas
@@ -170,7 +240,15 @@ asdfsdf
         [Test]
         public void Format_RTE_Data_For_Persistence_Custom_Single_Entry()
         {
-            var content = @"<div class=""umb-macro-holder Test mceNonEditable umb-macro-mce_1""><!-- <?UMBRACO_MACRO macroAlias=""Test"" content=""1089"" textArea=""asdfasdf"" title="""" bool=""0"" number="""" contentType="""" multiContentType="""" multiProperties="""" properties="""" tabs="""" multiTabs="""" /> --><ins>
+//            var content = @"<div class=""umb-macro-holder Test mceNonEditable umb-macro-mce_1""><!-- <?UMBRACO_MACRO macroAlias=""Test"" content=""1089"" textArea=""asdfasdf"" title="""" bool=""0"" number="""" contentType="""" multiContentType="""" multiProperties="""" properties="""" tabs="""" multiTabs="""" /> --><ins>
+//<div class=""facts-box"">
+//<div class=""fatcs-box-header"">
+//<h3>null</h3>
+//</div>
+//<div class=""fatcs-box-body"">1089</div>
+//</div>
+//</ins></div>";
+            var content = @"<div class=""umb-macro-holder mceNonEditable umb-macro-mce_1""><!-- <?UMBRACO_MACRO macroAlias=""Test"" content=""1089"" textArea=""asdfasdf"" title="""" bool=""0"" number="""" contentType="""" multiContentType="""" multiProperties="""" properties="""" tabs="""" multiTabs="""" /> --><ins>
 <div class=""facts-box"">
 <div class=""fatcs-box-header"">
 <h3>null</h3>
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/macro.service.js b/src/Umbraco.Web.UI.Client/src/common/services/macro.service.js
index 0c240a294c..0b1f73e696 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/macro.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/macro.service.js
@@ -13,7 +13,7 @@ function macroService() {
         /** parses the special macro syntax like <?UMBRACO_MACRO macroAlias="Map" /> and returns an object with the macro alias and it's parameters */
         parseMacroSyntax: function (syntax) {
 
-            var expression = /(<\?UMBRACO_MACRO macroAlias=["'](\w+?)["'].+?)(\/>|>.*?<\/\?UMBRACO_MACRO>)/im;
+            var expression = /(<\?UMBRACO_MACRO macroAlias=["']([\w\.]+?)["'].+?)(\/>|>.*?<\/\?UMBRACO_MACRO>)/im;
             var match = expression.exec(syntax);
             if (!match || match.length < 3) {
                 return null;
diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/services/macro-service.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/services/macro-service.spec.js
index 470b7b59f8..381ae22713 100644
--- a/src/Umbraco.Web.UI.Client/test/unit/common/services/macro-service.spec.js
+++ b/src/Umbraco.Web.UI.Client/test/unit/common/services/macro-service.spec.js
@@ -21,6 +21,20 @@ describe('macro service tests', function () {
             expect(result.marcoParamsDictionary.test2).toBe("hello");
 
 
+        });
+
+        it('can parse syntax for macros with aliases containing dots', function () {
+
+            var result = macroService.parseMacroSyntax("<?UMBRACO_MACRO macroAlias='Map.Test' test1=\"asdf\" test2='hello' />");
+
+            expect(result).not.toBeNull();
+            expect(result.macroAlias).toBe("Map.Test");
+            expect(result.marcoParamsDictionary.test1).not.toBeUndefined();
+            expect(result.marcoParamsDictionary.test1).toBe("asdf");
+            expect(result.marcoParamsDictionary.test2).not.toBeUndefined();
+            expect(result.marcoParamsDictionary.test2).toBe("hello");
+
+
         });
         
         it('can parse syntax for macros with body', function () {