lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-12-02 11:44:41 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Adding #{} tokens support

Browse Source 
--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2013-05-01 16:05:27 -07:00
parent 95747f2048
commit aa1534cac4
2 changed files with 44 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Orchard.Web/Modules/Orchard.Tokens/Implementation/Tokenizer.cs
View File

@@ -41,21 +41,38 @@ namespace Orchard.Tokens.Implementation {
} }
public string Replace(string text, IDictionary<string, object> data, ReplaceOptions options) { public string Replace(string text, IDictionary<string, object> data, ReplaceOptions options) {
var tokenset = Parse(text);
// do we have to replace tokens with hashes ?
bool hashMode = text.Contains("#{");
var tokenset = Parse(text, hashMode);
var tokens = tokenset.Item2; var tokens = tokenset.Item2;
var replacements = Evaluate(options.Predicate == null ? tokens : tokens.Where(options.Predicate), data); var replacements = Evaluate(options.Predicate == null ? tokens : tokens.Where(options.Predicate), data);
return replacements.Aggregate(tokenset.Item1, return replacements.Aggregate(tokenset.Item1,
(current, replacement) => current.Replace("{" + replacement.Key + "}", (options.Encoding ?? ReplaceOptions.NoEncode)(replacement.Key, replacement.Value))); (current, replacement) => current.Replace((hashMode ? "#{" : "{") + replacement.Key + "}", (options.Encoding ?? ReplaceOptions.NoEncode)(replacement.Key, replacement.Value)));
} }
private static Tuple<string, IEnumerable<string>> Parse(string text) { private static Tuple<string, IEnumerable<string>> Parse(string text, bool hashMode) {
var tokens = new List<string>(); var tokens = new List<string>();
if (!string.IsNullOrEmpty(text)) { if (!string.IsNullOrEmpty(text)) {
var inToken = false; var inToken = false;
var tokenStart = 0; var tokenStart = 0;
for (var i = 0; i < text.Length; i++) { for (var i = 0; i < text.Length; i++) {
var c = text[i]; var c = text[i];
if (!inToken && hashMode) {
if (c == '#' && i + 1 < text.Length) {
c = text[i + 1];
if (c == '{') {
i++;
}
else {
continue;
}
}
}
if (c == '{') { if (c == '{') {
if (i + 1 < text.Length && text[i + 1] == '{') { if (i + 1 < text.Length && text[i + 1] == '{') {
text = text.Substring(0, i) + text.Substring(i + 1); text = text.Substring(0, i) + text.Substring(i + 1);

24
src/Orchard.Web/Modules/Orchard.Tokens/Tests/TokenizerTests.cs
View File

@@ -76,5 +76,29 @@ namespace Orchard.Tokens.Tests {
public void TestPredicate() { public void TestPredicate() {
Assert.That(_tokenizer.Replace("{Site.Global1}{Site.Global2}", null, new ReplaceOptions { Predicate = token => token == "Site.Global2" }), Is.EqualTo("{Site.Global1}[global2]")); Assert.That(_tokenizer.Replace("{Site.Global1}{Site.Global2}", null, new ReplaceOptions { Predicate = token => token == "Site.Global2" }), Is.EqualTo("{Site.Global1}[global2]"));
} }
[Test]
public void HashTokenShouldBeReplaced() {
Assert.That(_tokenizer.Replace("foo #{Site.Global1}", null), Is.EqualTo("foo [global1]"));
Assert.That(_tokenizer.Replace("#{Site.Global1}#{Site.Global2}", null), Is.EqualTo("[global1][global2]"));
}
[Test]
public void HashInsideTokenShouldBeIgnored() {
Assert.That(_tokenizer.Replace("{Site.Global1.#}", null), Is.EqualTo(""));
Assert.That(_tokenizer.Replace("#{Site.Global1.#}", null), Is.EqualTo(""));
}
[Test]
public void SimplePatterShouldBeIgnoredWhenHashIsPresent() {
Assert.That(_tokenizer.Replace("#{Site.Global1}", null), Is.EqualTo("[global1]"));
Assert.That(_tokenizer.Replace("{Site.Global1}#{Site.Global1}", null), Is.EqualTo("{Site.Global1}[global1]"));
}
[Test]
public void HashPatternCanBeEscaped() {
Assert.That(_tokenizer.Replace("##{Site.Global1}", null), Is.EqualTo("#[global1]"));
Assert.That(_tokenizer.Replace("#{{Site.Global1}}", null), Is.EqualTo("#{Site.Global1}"));
}
} }
} }