swcs/Archetype
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update naming scheme

Browse Source
This commit is contained in:
Kevin Giszewski
2014-05-08 17:47:24 -04:00
committed by kjac
parent 5b43053406
commit 2bf2e5f91a
16 changed files with 69 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Umbraco/Archetype.Tests/Models/FieldsetTests.cs
+4 -4
View File
@@ -4,7 +4,7 @@ using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Archetype.Umbraco.PropertyConverters;
using Archetype.PropertyConverters;
using NUnit.Framework;
namespace Archetype.Tests.Models
@@ -26,7 +26,7 @@ namespace Archetype.Tests.Models
public void Can_Get_Fieldset_Property_By_Alias()
{
var converter = new ArchetypeValueConverter();
var result = (Archetype.Umbraco.Models.Archetype)converter.ConvertDataToSource(null, _sampleJson, false);
var result = (Archetype.Models.ArchetypeModel)converter.ConvertDataToSource(null, _sampleJson, false);
var fieldset = result.Fieldsets.First();
var propertyValue = fieldset.GetValue("boxHeadline");
@@ -38,7 +38,7 @@ namespace Archetype.Tests.Models
public void Can_Convert_Property_Value_Types()
{
var converter = new ArchetypeValueConverter();
var result = (Archetype.Umbraco.Models.Archetype)converter.ConvertDataToSource(null, _sampleJson, false);
var result = (Archetype.Models.ArchetypeModel)converter.ConvertDataToSource(null, _sampleJson, false);
var fieldset = result.Fieldsets.First();
@@ -51,7 +51,7 @@ namespace Archetype.Tests.Models
public void Returns_String_When_No_Type_Specified()
{
var converter = new ArchetypeValueConverter();
var result = (Archetype.Umbraco.Models.Archetype)converter.ConvertDataToSource(null, _sampleJson, false);
var result = (Archetype.Models.ArchetypeModel)converter.ConvertDataToSource(null, _sampleJson, false);
var fieldset = result.Fieldsets.First();
app/Umbraco/Archetype.Tests/PropertyValueConverter/PropertyValueConverterTests.cs
+6 -6
View File
@@ -4,7 +4,7 @@ using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Archetype.Umbraco.PropertyConverters;
using Archetype.PropertyConverters;
using Moq;
using NUnit.Framework;
using Umbraco.Core.Models.PublishedContent;
@@ -31,9 +31,9 @@ namespace Archetype.Tests.PropertyValueConverter
var converter = new ArchetypeValueConverter();
var result = converter.ConvertDataToSource(null, data, false);
Assert.AreEqual(result.GetType(), typeof (Archetype.Umbraco.Models.Archetype));
Assert.AreEqual(result.GetType(), typeof (Archetype.Models.ArchetypeModel));
var fieldsets = (Archetype.Umbraco.Models.Archetype) result;
var fieldsets = (Archetype.Models.ArchetypeModel) result;
Assert.IsTrue(fieldsets.Count() == 0);
}
@@ -44,9 +44,9 @@ namespace Archetype.Tests.PropertyValueConverter
var converter = new ArchetypeValueConverter();
var result = converter.ConvertDataToSource(null, data, false);
Assert.AreEqual(result.GetType(), typeof (Archetype.Umbraco.Models.Archetype));
Assert.AreEqual(result.GetType(), typeof (Archetype.Models.ArchetypeModel));
var fieldsets = (Archetype.Umbraco.Models.Archetype) result;
var fieldsets = (Archetype.Models.ArchetypeModel) result;
Assert.IsTrue(fieldsets.Count() == 0);
}
@@ -54,7 +54,7 @@ namespace Archetype.Tests.PropertyValueConverter
public void Can_Serialize_From_Json_Model()
{
var converter = new ArchetypeValueConverter();
var result = (Archetype.Umbraco.Models.Archetype)converter.ConvertDataToSource(null, _sampleJson, false);
var result = (Archetype.Models.ArchetypeModel)converter.ConvertDataToSource(null, _sampleJson, false);
Assert.That(result != null);
Assert.That(result.Fieldsets.Count() == 2);
app/Umbraco/Umbraco.Archetype/Api/ArchetypeDataTypeController.cs
+1 -1
View File
@@ -9,7 +9,7 @@ using Umbraco.Web.Models.ContentEditing;
using Umbraco.Web.Mvc;
using Umbraco.Web.Editors;
namespace Archetype.Umbraco.Api
namespace Archetype.Api
{
[PluginController("ArchetypeApi")]
public class ArchetypeDataTypeController : UmbracoAuthorizedJsonController
app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj
+1 -1
View File
@@ -7,7 +7,7 @@
<ProjectGuid>{7D185D41-4228-4978-ACB8-83F9A48AD94F}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Archetype.Umbraco</RootNamespace>
<RootNamespace>Archetype</RootNamespace>
<AssemblyName>Archetype</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
app/Umbraco/Umbraco.Archetype/Constants.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace Archetype.Umbraco
namespace Archetype
{
public static class Constants
{
app/Umbraco/Umbraco.Archetype/Events/ExpireCache.cs
+1 -1
View File
@@ -8,7 +8,7 @@ using Umbraco.Core.Models;
using Umbraco.Core.Services;
using Umbraco.Web;
namespace Archetype.Umbraco.Events
namespace Archetype.Events
{
public class ExpireCache : ApplicationEventHandler
{
app/Umbraco/Umbraco.Archetype/Extensions/ArchetypeHelper.cs
+9 -9
View File
@@ -1,11 +1,11 @@
using System;
using System.Linq;
using Archetype.Umbraco.Models;
using Archetype.Models;
using Newtonsoft.Json;
using Umbraco.Core;
using Umbraco.Core.Models;
namespace Archetype.Umbraco.Extensions
namespace Archetype.Extensions
{
public class ArchetypeHelper
{
@@ -22,11 +22,11 @@ namespace Archetype.Umbraco.Extensions
_app = ApplicationContext.Current;
}
internal Models.Archetype DeserializeJsonToArchetype(string sourceJson, PreValueCollection dataTypePreValues)
internal Models.ArchetypeModel DeserializeJsonToArchetype(string sourceJson, PreValueCollection dataTypePreValues)
{
try
{
var archetype = JsonConvert.DeserializeObject<Models.Archetype>(sourceJson, _jsonSettings);
var archetype = JsonConvert.DeserializeObject<Models.ArchetypeModel>(sourceJson, _jsonSettings);
try
{
@@ -42,15 +42,15 @@ namespace Archetype.Umbraco.Extensions
}
catch
{
return new Models.Archetype();
return new Models.ArchetypeModel();
}
}
internal Models.Archetype DeserializeJsonToArchetype(string sourceJson, int dataTypeId)
internal Models.ArchetypeModel DeserializeJsonToArchetype(string sourceJson, int dataTypeId)
{
try
{
var archetype = JsonConvert.DeserializeObject<Models.Archetype>(sourceJson, _jsonSettings);
var archetype = JsonConvert.DeserializeObject<Models.ArchetypeModel>(sourceJson, _jsonSettings);
try
{
@@ -66,7 +66,7 @@ namespace Archetype.Umbraco.Extensions
}
catch
{
return new Models.Archetype();
return new Models.ArchetypeModel();
}
}
@@ -110,7 +110,7 @@ namespace Archetype.Umbraco.Extensions
/// </summary>
/// <param name="archetype">The Archetype to add the additional metadata to</param>
/// <param name="preValue">The configuration of the Archetype</param>
private void RetrieveAdditionalProperties(ref Models.Archetype archetype, ArchetypePreValue preValue)
private void RetrieveAdditionalProperties(ref Models.ArchetypeModel archetype, ArchetypePreValue preValue)
{
foreach (var fieldset in preValue.Fieldsets)
{
app/Umbraco/Umbraco.Archetype/Extensions/Extensions.cs
+3 -3
View File
@@ -5,9 +5,9 @@ using System.Text.RegularExpressions;
using System.Collections.Generic;
using Umbraco.Core;
using Umbraco.Web;
using Archetype.Umbraco.Models;
using Archetype.Models;
namespace Archetype.Umbraco.Extensions
namespace Archetype.Extensions
{
public static class Extensions
{
@@ -19,7 +19,7 @@ namespace Archetype.Umbraco.Extensions
|| input.StartsWith("[") && input.EndsWith("]");
}
public static bool IsArchetype(this Property prop)
public static bool IsArchetype(this ArchetypeProperty prop)
{
return prop.PropertyEditorAlias.InvariantEquals(Constants.PropertyEditorAlias);
}
app/Umbraco/Umbraco.Archetype/Models/Archetype.cs
+6 -6
View File
@@ -5,20 +5,20 @@ using System.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
namespace Archetype.Umbraco.Models
namespace Archetype.Models
{
[JsonObject]
public class Archetype : IEnumerable<Fieldset>
public class ArchetypeModel : IEnumerable<ArchetypeFieldsetModel>
{
[JsonProperty("fieldsets")]
internal IEnumerable<Fieldset> Fieldsets { get; set; }
internal IEnumerable<ArchetypeFieldsetModel> Fieldsets { get; set; }
public Archetype()
public ArchetypeModel()
{
Fieldsets = new List<Fieldset>();
Fieldsets = new List<ArchetypeFieldsetModel>();
}
public IEnumerator<Fieldset> GetEnumerator()
public IEnumerator<ArchetypeFieldsetModel> GetEnumerator()
{
return this.Fieldsets.GetEnumerator();
}
app/Umbraco/Umbraco.Archetype/Models/ArchetypePreValue.cs
+1 -1
View File
@@ -1,7 +1,7 @@
using System.Collections.Generic;
using Newtonsoft.Json;
namespace Archetype.Umbraco.Models
namespace Archetype.Models
{
public class ArchetypePreValue
{
app/Umbraco/Umbraco.Archetype/Models/ArchetypePreValueFieldset.cs
+1 -1
View File
@@ -1,7 +1,7 @@
using System.Collections.Generic;
using Newtonsoft.Json;
namespace Archetype.Umbraco.Models
namespace Archetype.Models
{
public class ArchetypePreValueFieldset
{
app/Umbraco/Umbraco.Archetype/Models/ArchetypePreValueProperty.cs
+1 -1
View File
@@ -1,7 +1,7 @@
using System;
using Newtonsoft.Json;
namespace Archetype.Umbraco.Models
namespace Archetype.Models
{
public class ArchetypePreValueProperty
{
app/Umbraco/Umbraco.Archetype/Models/Fieldset.cs
+6 -6
View File
@@ -3,19 +3,19 @@ using System.Linq;
using Newtonsoft.Json;
using Umbraco.Core;
namespace Archetype.Umbraco.Models
namespace Archetype.Models
{
public class Fieldset
public class ArchetypeFieldsetModel
{
[JsonProperty("alias")]
public string Alias { get; set; }
[JsonProperty("properties")]
public IEnumerable<Property> Properties;
public IEnumerable<ArchetypeProperty> Properties;
public Fieldset()
public ArchetypeFieldsetModel()
{
Properties = new List<Property>();
Properties = new List<ArchetypeProperty>();
}
#region Helper Methods
@@ -49,7 +49,7 @@ namespace Archetype.Umbraco.Models
return !string.IsNullOrEmpty(property.Value.ToString());
}
private Property GetProperty(string propertyAlias)
private ArchetypeProperty GetProperty(string propertyAlias)
{
return Properties.FirstOrDefault(p => p.Alias.InvariantEquals(propertyAlias));
}
app/Umbraco/Umbraco.Archetype/Models/Property.cs
+2 -2
View File
@@ -7,9 +7,9 @@ using Umbraco.Core.Models.PublishedContent;
using Umbraco.Core.PropertyEditors;
using Umbraco.Web;
namespace Archetype.Umbraco.Models
namespace Archetype.Models
{
public class Property
public class ArchetypeProperty
{
[JsonProperty("alias")]
public string Alias { get; internal set; }
app/Umbraco/Umbraco.Archetype/PropertyConverters/ArchetypeValueConverter.cs
+24 -24
View File
@@ -1,8 +1,8 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Archetype.Umbraco.Extensions;
using Archetype.Umbraco.Models;
using Archetype.Extensions;
using Archetype.Models;
using Newtonsoft.Json;
using Umbraco.Core;
using Umbraco.Core.Models;
@@ -10,30 +10,30 @@ using Umbraco.Core.Models.PublishedContent;
using Umbraco.Core.PropertyEditors;
using Umbraco.Core.Services;
namespace Archetype.Umbraco.PropertyConverters
{
[PropertyValueType(typeof(Models.Archetype))]
[PropertyValueCache(PropertyCacheValue.All, PropertyCacheLevel.Content)]
public class ArchetypeValueConverter : PropertyValueConverterBase
{
public ServiceContext Services
{
get { return ApplicationContext.Current.Services; }
}
public override bool IsConverter(PublishedPropertyType propertyType)
{
return propertyType.PropertyEditorAlias.Equals(Constants.PropertyEditorAlias);
}
namespace Archetype.PropertyConverters
{
[PropertyValueType(typeof(Models.ArchetypeModel))]
[PropertyValueCache(PropertyCacheValue.All, PropertyCacheLevel.Content)]
public class ArchetypeValueConverter : PropertyValueConverterBase
{
public ServiceContext Services
{
get { return ApplicationContext.Current.Services; }
}
public override bool IsConverter(PublishedPropertyType propertyType)
{
return propertyType.PropertyEditorAlias.Equals(Constants.PropertyEditorAlias);
}
public override object ConvertDataToSource(PublishedPropertyType propertyType, object source, bool preview)
{
var defaultValue = new Models.Archetype();
if (source == null)
return defaultValue;
var defaultValue = new Models.ArchetypeModel();
if (source == null)
return defaultValue;
var sourceString = source.ToString();
if (!sourceString.DetectIsJson())
app/Umbraco/Umbraco.Archetype/PropertyEditors/ArcheTypePropertyEditor.cs
+2 -2
View File
@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Archetype.Umbraco.Extensions;
using Archetype.Extensions;
using ClientDependency.Core;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
@@ -13,7 +13,7 @@ using Umbraco.Core.Services;
using Umbraco.Web.PropertyEditors;
using Umbraco.Core.Logging;
namespace Archetype.Umbraco.PropertyEditors
namespace Archetype.PropertyEditors
{
[PropertyEditorAsset(ClientDependencyType.Javascript, "/App_Plugins/Archetype/js/archetype.js")]
[PropertyEditor("Imulus.Archetype", "Archetype", "/App_Plugins/Archetype/views/archetype.html",