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

Refactoring Bags and moving to Orchard.Framework

Browse Source 
--HG--
branch : 1.x
extra : rebase_source : 0f934cffae32b4477ee39be01bcc63d36982b6b8
This commit is contained in:
Sebastien Ros
2012-11-13 15:20:59 -08:00
parent 51276d2cbd
commit 26aef60205
14 changed files with 62 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/Orchard.Web/Modules/Orchard.Projections/Tests/Settings/SettingsTests.cs → src/Orchard.Tests/Data/Bags/SettingsTests.cs
View File

@@ -1,15 +1,15 @@
using NUnit.Framework;
using Orchard.Projections.Settings;
using Orchard.Data.Bags;
using Orchard.Data.Bags.Serialization;
using System.Collections.Generic;
using System.IO;
using Orchard.Projections.Settings.Serialization;
namespace Orchard.Projections.Tests.Settings {
namespace Orchard.Tests.Data.Bags {
[TestFixture]
public class SettingsTests {
public class BagsTests {
[Test]
public void ShouldRemoveMember() {
dynamic e = new SObject();
dynamic e = new Bag();
e.Foo = "Bar";
Assert.That(e, Is.Not.Empty);
Assert.That(e.Foo, Is.EqualTo("Bar"));
@@ -20,7 +20,7 @@ namespace Orchard.Projections.Tests.Settings {
[Test]
public void ShouldSupportFactoryInvocation() {
var e = SObject.New();
var e = Bag.New();
e.Foo = "Bar";
Assert.That(e["Foo"], Is.EqualTo("Bar"));
@@ -29,7 +29,7 @@ namespace Orchard.Projections.Tests.Settings {
[Test]
public void ShouldAddDynamicProperties() {
dynamic e = new SObject();
dynamic e = new Bag();
e.Foo = "Bar";
Assert.That(e["Foo"], Is.EqualTo("Bar"));
Assert.That(e.Foo, Is.EqualTo("Bar"));
@@ -37,15 +37,15 @@ namespace Orchard.Projections.Tests.Settings {
[Test]
public void UnknownPropertiesShouldBeNull() {
dynamic e = new SObject();
dynamic e = new Bag();
Assert.That((object)e["Foo"], Is.EqualTo(null));
Assert.That((object)e.Foo, Is.EqualTo(null));
}
[Test]
public void ShouldAddDynamicObjects() {
dynamic e = new SObject();
e.Address = new SObject();
dynamic e = new Bag();
e.Address = new Bag();
e.Address.Street = "One Microsoft Way";
Assert.That(e["Address"]["Street"], Is.EqualTo("One Microsoft Way"));
@@ -53,7 +53,7 @@ namespace Orchard.Projections.Tests.Settings {
}
public void ShouldAddArraysOfAnonymousObject() {
dynamic e = new SObject();
dynamic e = new Bag();
e.Foos = new[] { new { Foo1 = "Bar1", Foo2 = "Bar2" } };
Assert.That(e.Foos[0].Foo1, Is.EqualTo("Bar1"));
@@ -61,7 +61,7 @@ namespace Orchard.Projections.Tests.Settings {
}
public void ShouldAddAnonymousObject() {
dynamic e = new SObject();
dynamic e = new Bag();
e.Foos = new { Foo1 = "Bar1", Foo2 = "Bar2" };
Assert.That(e.Foos.Foo1, Is.EqualTo("Bar1"));
@@ -70,7 +70,7 @@ namespace Orchard.Projections.Tests.Settings {
[Test]
public void ShouldAddArrays() {
dynamic e = new SObject();
dynamic e = new Bag();
e.Owners = new[] { "Steve", "Bill" };
Assert.That(e.Owners[0], Is.EqualTo("Steve"));
Assert.That(e.Owners[1], Is.EqualTo("Bill"));
@@ -78,8 +78,8 @@ namespace Orchard.Projections.Tests.Settings {
[Test]
public void ShouldBeEnumerable() {
dynamic e = new SObject();
e.Address = new SObject();
dynamic e = new Bag();
e.Address = new Bag();
e.Address.Street = "One Microsoft Way";
e.Foos = new[] { new { Foo1 = "Bar1", Foo2 = "Bar2" } };
@@ -93,11 +93,11 @@ namespace Orchard.Projections.Tests.Settings {
[Test]
public void ShouldSerializeAndDeserialize() {
dynamic e = new SObject();
dynamic e = new Bag();
e.Foo = "Bar";
e.Address = new SObject();
e.Address = new Bag();
e.Address.Street = "One Microsoft Way";
e.Owners = new[] { "Steve", "Bill" };
e.Foos = new[] { new { Foo1 = "Bar1", Foo2 = "Bar2" } };
@@ -128,11 +128,11 @@ namespace Orchard.Projections.Tests.Settings {
[Test]
public void MergeShouldOverwriteExistingProperties() {
var o1 = SObject.New();
var o1 = Bag.New();
o1.Foo = "Foo1";
o1.Bar = "Bar1";
var o2 = SObject.New();
var o2 = Bag.New();
o2.Foo = "Foo2";
o2.Baz = "Baz2";
@@ -145,10 +145,10 @@ namespace Orchard.Projections.Tests.Settings {
[Test]
public void MergeShouldConcatenateArrays() {
var o1 = SObject.New();
var o1 = Bag.New();
o1.Foo = new[] { "a", "b" };
var o2 = SObject.New();
var o2 = Bag.New();
o2.Foo = new[] { "c", "d" };
var o3 = o1 & o2;

1
src/Orchard.Tests/Orchard.Framework.Tests.csproj
View File

@@ -217,6 +217,7 @@
<Compile Include="Data\ProviderUtilities.cs" />
<Compile Include="Data\RepositoryTests.cs" />
<Compile Include="Data\ProvidersTests.cs" />
<Compile Include="Data\Bags\SettingsTests.cs" />
<Compile Include="Data\StubLocator.cs" />
<Compile Include="DisplayManagement\ArgsUtility.cs" />
<Compile Include="DisplayManagement\DefaultDisplayManagerTests.cs" />

12
src/Orchard.Web/Modules/Orchard.Projections/Orchard.Projections.csproj
View File

@@ -21,6 +21,10 @@
</UpgradeBackupLocation>
<TargetFrameworkProfile />
<UseIISExpress>false</UseIISExpress>
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -217,16 +221,8 @@
<Compile Include="Services\PropertyShapes.cs" />
<Compile Include="Services\ProjectionManager.cs" />
<Compile Include="Services\QueryService.cs" />
<Compile Include="Settings\Serialization\XmlSettingsSerializer.cs" />
<Compile Include="Settings\Serialization\ISettingsSerializer.cs" />
<Compile Include="Services\FieldIndexService.cs" />
<Compile Include="Services\IFieldIndexService.cs" />
<Compile Include="Settings\SArray.cs" />
<Compile Include="Settings\SConvert.cs" />
<Compile Include="Settings\SItem.cs" />
<Compile Include="Settings\StateValueProvider.cs" />
<Compile Include="Settings\SValue.cs" />
<Compile Include="Settings\SObject.cs" />
<Compile Include="StandardQueries\QueryFeedQuery.cs" />
<Compile Include="ViewModels\BindingIndexViewModel.cs" />
<Compile Include="ViewModels\BindingSelectViewModel.cs" />

4
src/Orchard.Web/Modules/Orchard.Projections/Services/FormParametersHelper.cs
View File

@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Xml;
using System.Xml.Linq;
using Orchard.Projections.Settings;
using Orchard.Data.Bags;
namespace Orchard.Projections.Services {
public static class FormParametersHelper {
@@ -43,7 +43,7 @@ namespace Orchard.Projections.Services {
public static dynamic ToDynamic(string parameters) {
var result = SObject.New();
var result = Bag.New();
if (String.IsNullOrEmpty(parameters)) {
return result;

8
src/Orchard.Web/Modules/Orchard.Projections/Settings/Serialization/ISettingsSerializer.cs
View File

@@ -1,8 +0,0 @@
using System.IO;
namespace Orchard.Projections.Settings.Serialization {
public interface ISettingsSerializer : IDependency {
void Serialize(TextWriter tw, SObject o);
SObject Deserialize(TextReader tr);
}
}

1
src/Orchard.Web/Modules/Orchard.Projections/Tests/Orchard.Projections.Tests.csproj
View File

@@ -66,7 +66,6 @@
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Services\FieldIndexServiceTests.cs" />
<Compile Include="Services\FieldIndexStorageTests.cs" />
<Compile Include="Settings\SettingsTests.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\Orchard.Tests\Orchard.Framework.Tests.csproj">

4
src/Orchard.Web/Modules/Orchard.Projections/Settings/SArray.cs → src/Orchard/Data/Bags/SArray.cs
View File

@@ -3,7 +3,7 @@ using System.Dynamic;
using System.Linq;
using System.Reflection;
namespace Orchard.Projections.Settings {
namespace Orchard.Data.Bags {
public class SArray : DynamicObject, ISItem {
public ISItem[] Values { get; private set; }
@@ -70,7 +70,7 @@ namespace Orchard.Projections.Settings {
return new SArray(o1.Values.Union(new[] { o1 }).ToArray());
}
public static SObject operator &(SArray o1, SObject o2) {
public static Bag operator &(SArray o1, Bag o2) {
return o2;
}

6
src/Orchard.Web/Modules/Orchard.Projections/Settings/SConvert.cs → src/Orchard/Data/Bags/SConvert.cs
View File

@@ -4,14 +4,14 @@ using System.Reflection;
using System.Globalization;
using System.Xml;
namespace Orchard.Projections.Settings {
namespace Orchard.Data.Bags {
public class SConvert {
public static ISItem ToSettings(object o) {
if (o is SValue) {
return (ISItem)o;
}
if (o is SObject) {
if (o is Bag) {
return (ISItem)o;
}
@@ -24,7 +24,7 @@ namespace Orchard.Projections.Settings {
}
if (IsAnonymousType(o.GetType())) {
dynamic grappe = new SObject();
dynamic grappe = new Bag();
foreach (var p in o.GetType().GetProperties()) {
grappe[p.Name] = p.GetValue(o, null);

2
src/Orchard.Web/Modules/Orchard.Projections/Settings/SItem.cs → src/Orchard/Data/Bags/SItem.cs
View File

@@ -1,6 +1,6 @@
using System;
namespace Orchard.Projections.Settings {
namespace Orchard.Data.Bags {
public interface ISItem : ICloneable {
}

10
src/Orchard.Web/Modules/Orchard.Projections/Settings/SObject.cs → src/Orchard/Data/Bags/SObject.cs
View File

@@ -1,12 +1,12 @@
using System.Collections.Generic;
using System.Dynamic;
namespace Orchard.Projections.Settings {
public class SObject : DynamicObject, IEnumerable<KeyValuePair<string, object>>, ISItem {
namespace Orchard.Data.Bags {
public class Bag : DynamicObject, IEnumerable<KeyValuePair<string, object>>, ISItem {
internal readonly Dictionary<string, ISItem> _properties = new Dictionary<string, ISItem>();
public static dynamic New() {
return new SObject();
return new Bag();
}
public override bool TrySetMember(SetMemberBinder binder, object value) {
@@ -52,12 +52,12 @@ namespace Orchard.Projections.Settings {
return GetMember(indexes[0].ToString(), out result);
}
public static SObject operator &(SObject o1, SObject o2) {
public static Bag operator &(Bag o1, Bag o2) {
if (o1 == null) {
return o2;
}
var clone = (SObject)o1.Clone();
var clone = (Bag)o1.Clone();
dynamic dclone = clone;
foreach (var pair in o2._properties) {

4
src/Orchard.Web/Modules/Orchard.Projections/Settings/SValue.cs → src/Orchard/Data/Bags/SValue.cs
View File

@@ -1,6 +1,6 @@
using System.Linq;
namespace Orchard.Projections.Settings {
namespace Orchard.Data.Bags {
public class SValue : ISItem {
public object Value { get; set; }
@@ -23,7 +23,7 @@ namespace Orchard.Projections.Settings {
return new SArray(new[] { o1 }.Union(o2.Values).ToArray());
}
public static SObject operator &(SValue o1, SObject o2) {
public static Bag operator &(SValue o1, Bag o2) {
return o2;
}

8
src/Orchard/Data/Bags/Serialization/IBagSerializer.cs Normal file
View File

@@ -0,0 +1,8 @@
using System.IO;
namespace Orchard.Data.Bags.Serialization {
public interface IBagSerializer : IDependency {
void Serialize(TextWriter tw, Bag o);
Bag Deserialize(TextReader tr);
}
}

24
src/Orchard.Web/Modules/Orchard.Projections/Settings/Serialization/XmlSettingsSerializer.cs → src/Orchard/Data/Bags/Serialization/XmlSettingsSerializer.cs
View File

@@ -3,11 +3,11 @@ using System.Collections.Generic;
using System.IO;
using System.Xml;
namespace Orchard.Projections.Settings.Serialization {
public class XmlSettingsSerializer : ISettingsSerializer {
private const string Root = "SObject";
namespace Orchard.Data.Bags.Serialization {
public class XmlSettingsSerializer : IBagSerializer {
private const string Root = "Bag";
public void Serialize(TextWriter tw, SObject o) {
public void Serialize(TextWriter tw, Bag o) {
using (var writer = new XmlTextWriter(tw)) {
writer.WriteStartDocument();
writer.WriteStartElement(Root);
@@ -17,9 +17,9 @@ namespace Orchard.Projections.Settings.Serialization {
}
}
public SObject Deserialize(TextReader tr) {
public Bag Deserialize(TextReader tr) {
var reader = new XmlTextReader(tr);
var result = new SObject();
var result = new Bag();
// ignore root element
while (reader.MoveToContent() == XmlNodeType.Element && reader.LocalName == Root) {
@@ -33,7 +33,7 @@ namespace Orchard.Projections.Settings.Serialization {
return result;
}
private void ReadElement(XmlReader reader, SObject parent) {
private void ReadElement(XmlReader reader, Bag parent) {
var name = XmlConvert.DecodeName(reader.LocalName);
var type = reader["type"];
@@ -51,7 +51,7 @@ namespace Orchard.Projections.Settings.Serialization {
}
}
else {
var grappe = new SObject();
var grappe = new Bag();
reader.Read();
parent.SetMember(name, grappe);
while (reader.MoveToContent() == XmlNodeType.Element) {
@@ -66,7 +66,7 @@ namespace Orchard.Projections.Settings.Serialization {
var list = new List<object>();
reader.Read();
while (reader.MoveToContent() == XmlNodeType.Element && reader.LocalName == "Item") {
dynamic o = new SObject();
dynamic o = new Bag();
ReadElement(reader, o);
list.Add(o.Item);
}
@@ -74,16 +74,16 @@ namespace Orchard.Projections.Settings.Serialization {
return new SArray(list.ToArray());
}
private void WriteGrappe(XmlWriter writer, SObject grappe) {
private void WriteGrappe(XmlWriter writer, Bag grappe) {
foreach (var pair in grappe._properties) {
WriteAny(writer, pair.Key, pair.Value);
}
}
private void WriteAny(XmlWriter writer, string name, object value) {
if (value is SObject) {
if (value is Bag) {
writer.WriteStartElement(XmlConvert.EncodeLocalName(name));
WriteGrappe(writer, (SObject)value);
WriteGrappe(writer, (Bag)value);
writer.WriteEndElement();
}
if (value is SArray) {

2
src/Orchard.Web/Modules/Orchard.Projections/Settings/StateValueProvider.cs → src/Orchard/Data/Bags/StateValueProvider.cs
View File

@@ -1,6 +1,6 @@
using System.Web.Mvc;
namespace Orchard.Projections.Settings {
namespace Orchard.Data.Bags {
public class SettingsValueProvider : IValueProvider {
private readonly dynamic _state;