Merge pull request #139 from nbajko/master

Fix issue #138 - Duplicated style properties added with different values

Author: martinnormark

PreMailer.Net/PreMailer.Net.Tests/CssParserTests.cs

@@ -170,6 +170,32 @@ public void AddStylesheet_ShouldSetStyleClassPositions()
 			Assert.AreEqual(1, parser.Styles.Values[0].Position);
 			Assert.AreEqual(4, parser.Styles.Values[1].Position);
 			Assert.AreEqual(3, parser.Styles.Values[2].Position);
-		}
-	}
+        }
+
+        [TestMethod]
+        public void AddStylesheet_ContainsSingleQuotes_ShouldParseStylesheet()
+        {
+            var stylesheet = "a { color: #fff; font-family: 'Segoe UI', Verdana, Arial, sans-serif; text-decoration: underline; }";
+            var parser = new CssParser();
+
+            parser.AddStyleSheet(stylesheet);
+
+            Assert.IsNotNull(parser.Styles["a"]);
+            Assert.IsNotNull(parser.Styles["a"].Attributes["font-family"]);
+            Assert.AreEqual(3, parser.Styles["a"].Attributes.Count);
+        }
+
+        [TestMethod]
+        public void AddStylesheet_ContainsDoubleQuotes_ShouldParseStylesheet()
+        {
+            var stylesheet = "a { color: #fff; font-family: \"Segoe UI\", Verdana, Arial, sans-serif; text-decoration: underline; }";
+            var parser = new CssParser();
+
+            parser.AddStyleSheet(stylesheet);
+
+            Assert.IsNotNull(parser.Styles["a"]);
+            Assert.IsNotNull(parser.Styles["a"].Attributes["font-family"]);
+            Assert.AreEqual(3, parser.Styles["a"].Attributes.Count);
+        }
+    }
 }

PreMailer.Net/PreMailer.Net/CssParser.cs

@@ -109,7 +109,7 @@ private void FillStyleClass(StyleClass sc, string styleName, string style)
 			}
 		}
 
-		private static Regex FillStyleClassRegex = new Regex(@"(;)(?=(?:[^""']|[""|'][^""']*"")*$)", RegexOptions.Multiline | RegexOptions.Compiled);
+		private static Regex FillStyleClassRegex = new Regex(@"(;)(?=(?:[^""']|""[^""]*""|'[^']*')*$)", RegexOptions.Multiline | RegexOptions.Compiled);
 		private static Regex CssCommentRegex = new Regex(@"(?:/\*(.|[\r\n])*?\*/)|(?:(?<!url\s*\([^)]*)//.*)", RegexOptions.Compiled);
 		private static Regex UnsupportedAtRuleRegex = new Regex(@"(?:@charset [^;]*;)|(?:@(page|font-face)[^{]*{[^}]*})|@import.+?;", RegexOptions.IgnoreCase | RegexOptions.Compiled);
 
@@ -135,4 +135,4 @@ private string CleanupMediaQueries(string s)
 			return temp;
 		}
 	}
-}
+}