From c05b2546f19bb9adbaf8aa17b5fcd0a4c205c859 Mon Sep 17 00:00:00 2001
From: Sipke Schoorstra <sipke@ideliverable.com>
Date: Tue, 12 Apr 2016 21:46:19 +0200
Subject: [PATCH] Revert "Removed unnecessary YamlService."

This reverts commit fef3fbfbe76da7a4816650080ca4f4f50f27e265.
---
 .../Orchard.Framework.Tests.csproj            |  1 +
 src/Orchard.Tests/Services/YamlParserTests.cs | 70 +++++++++++++++++++
 .../Orchard.Layouts/Orchard.Layouts.csproj    |  8 ---
 .../Providers/SnippetElementHarvester.cs      | 13 ++--
 .../Modules/Orchard.Layouts/packages.config   |  2 -
 src/Orchard/Orchard.Framework.csproj          |  6 ++
 src/Orchard/Services/IYamlParser.cs           | 21 ++++++
 src/Orchard/Services/YamlParser.cs            | 19 +++++
 src/Orchard/packages.config                   |  1 +
 9 files changed, 124 insertions(+), 17 deletions(-)
 create mode 100644 src/Orchard.Tests/Services/YamlParserTests.cs
 create mode 100644 src/Orchard/Services/IYamlParser.cs
 create mode 100644 src/Orchard/Services/YamlParser.cs

diff --git a/src/Orchard.Tests/Orchard.Framework.Tests.csproj b/src/Orchard.Tests/Orchard.Framework.Tests.csproj
index 4a39036af..02ed1d16f 100644
--- a/src/Orchard.Tests/Orchard.Framework.Tests.csproj
+++ b/src/Orchard.Tests/Orchard.Framework.Tests.csproj
@@ -320,6 +320,7 @@
     <Compile Include="Localization\DateTimePartsTests.cs" />
     <Compile Include="Localization\DefaultDateLocalizationServicesTests.cs" />
     <Compile Include="Localization\DefaultDateFormatterTests.cs" />
+    <Compile Include="Services\YamlParserTests.cs" />
     <Compile Include="Stubs\StubApplicationEnvironment.cs" />
     <Compile Include="Stubs\StubCultureSelector.cs" />
     <Compile Include="Localization\TestHelpers.cs" />
diff --git a/src/Orchard.Tests/Services/YamlParserTests.cs b/src/Orchard.Tests/Services/YamlParserTests.cs
new file mode 100644
index 000000000..19ece43fa
--- /dev/null
+++ b/src/Orchard.Tests/Services/YamlParserTests.cs
@@ -0,0 +1,70 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using NUnit.Framework;
+using Newtonsoft.Json.Linq;
+using Orchard.Services;
+
+namespace Orchard.Tests.Services {
+
+    [TestFixture]
+    public class YamlParserTests {
+        
+        [Test]
+        public void ShouldConvertYamlToWellknowType() {
+            var parser = new YamlParser();
+            var yaml = SampleYamlDocument;
+
+            var order = parser.Deserialize<Order>(yaml);
+
+            Assert.AreEqual("Nikola", order.Customer.FirstName);
+            Assert.AreEqual(2, order.Items.Count);
+        }
+
+        [Test]
+        public void ShouldConvertYamlToDynamic()
+        {
+            var parser = new YamlParser();
+            var yaml = SampleYamlDocument;
+
+            var order = parser.Deserialize(yaml);
+
+            Assert.AreEqual("Nikola", (string)order.Customer.FirstName);
+            Assert.AreEqual(2, (int)order.Items.Count);
+        }
+
+        public class Order {
+            public DateTime Date { get; set; }
+            public Customer Customer { get; set; }
+            public IList<OrderItem> Items { get; set; }
+        }
+
+        public class OrderItem {
+            public string Product { get; set; }
+            public int Quantity { get; set; }
+            public decimal Price { get; set; }
+        }
+
+        public class Customer {
+            public string FirstName { get; set; }
+            public string LastName { get; set; }
+
+        }
+
+        private const string SampleYamlDocument =
+@"
+Date: 1916-04-01
+Customer:
+    FirstName: Nikola
+    LastName: Tesla
+Items:
+    - Product: Bulb
+      Quantity: 1
+      Price: 1.46
+      
+    - Product: Wire
+      Quantity: 1
+      Price: 0.32
+";
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj b/src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
index 66ccc72b6..38987ec69 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
@@ -102,14 +102,6 @@
     <Reference Include="System.Xml" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Xml.Linq" />
-    <Reference Include="YamlDotNet, Version=3.8.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\YamlDotNet.3.8.0\lib\net35\YamlDotNet.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="YamlDotNet.Dynamic, Version=3.2.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\YamlDotNet.Dynamic.3.2.3\lib\net40\YamlDotNet.Dynamic.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Content Include="Assets\JavaScript\Models\RecycleBin.js" />
diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Providers/SnippetElementHarvester.cs b/src/Orchard.Web/Modules/Orchard.Layouts/Providers/SnippetElementHarvester.cs
index 3369c7132..1333ef9c5 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Providers/SnippetElementHarvester.cs
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Providers/SnippetElementHarvester.cs
@@ -17,10 +17,10 @@ using Orchard.Layouts.Services;
 using Orchard.Layouts.Shapes;
 using Orchard.Layouts.ViewModels;
 using Orchard.Localization;
+using Orchard.Services;
 using Orchard.Themes.Services;
 using Orchard.Tokens;
 using Orchard.Utility.Extensions;
-using YamlDotNet.Dynamic;
 
 namespace Orchard.Layouts.Providers {
     [OrchardFeature("Orchard.Layouts.Snippets")]
@@ -34,6 +34,7 @@ namespace Orchard.Layouts.Providers {
         private readonly Work<ICurrentThemeShapeBindingResolver> _currentThemeShapeBindingResolver;
         private readonly Work<ITokenizer> _tokenizer;
         private readonly IWorkContextAccessor _wca;
+        private readonly Work<IYamlParser> _yamlParser;
 
         public SnippetElementHarvester(
             IWorkContextAccessor workContextAccessor,
@@ -43,7 +44,8 @@ namespace Orchard.Layouts.Providers {
             Work<IElementFactory> elementFactory,
             Work<IShapeDisplay> shapeDisplay,
             Work<ITokenizer> tokenizer,
-            Work<ICurrentThemeShapeBindingResolver> currentThemeShapeBindingResolver) {
+            Work<ICurrentThemeShapeBindingResolver> currentThemeShapeBindingResolver,
+            Work<IYamlParser> yamlParser) {
 
             _shapeFactory = shapeFactory;
             _siteThemeService = siteThemeService;
@@ -52,6 +54,7 @@ namespace Orchard.Layouts.Providers {
             _shapeDisplay = shapeDisplay;
             _tokenizer = tokenizer;
             _currentThemeShapeBindingResolver = currentThemeShapeBindingResolver;
+            _yamlParser = yamlParser;
             _wca = workContextAccessor;
         }
 
@@ -146,7 +149,7 @@ namespace Orchard.Layouts.Providers {
                 return null;
 
             var yaml = File.ReadAllText(paramsFileName);
-            var snippetConfig = Deserialize(yaml);
+            var snippetConfig = _yamlParser.Value.Deserialize(yaml);
             var fieldsConfig = snippetConfig.Fields != null ? snippetConfig.Fields.Children : new dynamic[0];
             var descriptor = new SnippetDescriptor();
 
@@ -199,9 +202,5 @@ namespace Orchard.Layouts.Providers {
             var markup = File.ReadAllText(localFileName);
             return markup.Contains("@Html.SnippetField");
         }
-
-        private dynamic Deserialize(string yaml) {
-            return new DynamicYaml(yaml);
-        }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/packages.config b/src/Orchard.Web/Modules/Orchard.Layouts/packages.config
index 22c39f3eb..61ca9fb6f 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/packages.config
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/packages.config
@@ -7,6 +7,4 @@
   <package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net452" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net452" />
-  <package id="YamlDotNet" version="3.8.0" targetFramework="net452" />
-  <package id="YamlDotNet.Dynamic" version="3.2.3" targetFramework="net452" />
 </packages>
\ No newline at end of file
diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj
index 9b469678e..be276337b 100644
--- a/src/Orchard/Orchard.Framework.csproj
+++ b/src/Orchard/Orchard.Framework.csproj
@@ -170,6 +170,10 @@
       <HintPath>..\packages\YamlDotNet.3.8.0\lib\net35\YamlDotNet.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="YamlDotNet.Dynamic, Version=3.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\YamlDotNet.Dynamic.3.2.3\lib\net40\YamlDotNet.Dynamic.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ContentManagement\Extensions\DriverResultExtensions.cs" />
@@ -423,7 +427,9 @@
     <Compile Include="Services\ClientHostAddressAccessor.cs" />
     <Compile Include="Services\DefaultJsonConverter.cs" />
     <Compile Include="Services\IClientHostAddressAccessor.cs" />
+    <Compile Include="Services\IYamlParser.cs" />
     <Compile Include="Services\IJsonConverter.cs" />
+    <Compile Include="Services\YamlParser.cs" />
     <Compile Include="Settings\CurrentSiteWorkContext.cs" />
     <Compile Include="Settings\ResourceDebugMode.cs" />
     <Compile Include="Tasks\Locking\Services\DistributedLockSchemaBuilder.cs" />
diff --git a/src/Orchard/Services/IYamlParser.cs b/src/Orchard/Services/IYamlParser.cs
new file mode 100644
index 000000000..cf9ea5f2c
--- /dev/null
+++ b/src/Orchard/Services/IYamlParser.cs
@@ -0,0 +1,21 @@
+namespace Orchard.Services {
+    /// <summary>
+    /// Provides methods to deserialize objects from YAML documents.
+    /// </summary>
+    public interface IYamlParser : IDependency {
+        /// <summary>
+        /// Deserializes a YAML document to a dynamic object.
+        /// </summary>
+        /// <param name="yaml">The YAML document to deserialize.</param>
+        /// <returns>The deserialized object.</returns>
+        dynamic Deserialize(string yaml);
+
+        /// <summary>
+        /// Deserializes a YAML document to a specific object.
+        /// </summary>
+        /// <typeparam name="T">The type of the object to deserialize.</typeparam>
+        /// <param name="yaml">The YAML document to deserialize.</param>
+        /// <returns>The deserialized object.</returns>
+        T Deserialize<T>(string yaml);
+    }
+}
diff --git a/src/Orchard/Services/YamlParser.cs b/src/Orchard/Services/YamlParser.cs
new file mode 100644
index 000000000..b783aad5c
--- /dev/null
+++ b/src/Orchard/Services/YamlParser.cs
@@ -0,0 +1,19 @@
+using System.IO;
+using YamlDotNet.Dynamic;
+using YamlDotNet.Serialization;
+using YamlDotNet.Serialization.NamingConventions;
+
+namespace Orchard.Services {
+    public class YamlParser : IYamlParser {
+        public dynamic Deserialize(string yaml) {
+            return new DynamicYaml(yaml);
+        }
+
+        public T Deserialize<T>(string yaml) {
+            var deserializer = new Deserializer(namingConvention: new PascalCaseNamingConvention(), ignoreUnmatched: true);
+            using (var reader = new StringReader(yaml)) {
+                return deserializer.Deserialize<T>(reader);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard/packages.config b/src/Orchard/packages.config
index c25a4d246..f5f57f9e4 100644
--- a/src/Orchard/packages.config
+++ b/src/Orchard/packages.config
@@ -18,4 +18,5 @@
   <package id="NHibernate" version="4.0.1.4000" targetFramework="net452" />
   <package id="Owin" version="1.0" targetFramework="net452" />
   <package id="YamlDotNet" version="3.8.0" targetFramework="net452" />
+  <package id="YamlDotNet.Dynamic" version="3.2.3" targetFramework="net452" />
 </packages>
\ No newline at end of file