huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Integrate dictionary helper with existing code paths

This commit is contained in:
Ryan Nowak 2014-04-09 12:25:43 -07:00
parent f0c6512b61
commit cda73e95a8
3 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Microsoft.AspNet.Mvc.Core/Internal/TypeHelper.cs
View File

@ -31,13 +31,22 @@ namespace Microsoft.AspNet.Mvc
/// <summary>
/// Given an object, adds each instance property with a public get method as a key and its
/// associated value to a dictionary.
///
/// If the object is already an <see cref="IDictionary{string, object}"/> instance, then a copy
/// is returned.
/// </summary>
//
// The implementation of PropertyHelper will cache the property accessors per-type. This is
// faster when the the same type is used multiple times with ObjectToDictionary.
public static IDictionary<string, object> ObjectToDictionary(object value)
{
var dictionary = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
var dictionary = value as IDictionary<string, object>;
if (dictionary != null)
{
return new Dictionary<string, object>(dictionary, StringComparer.OrdinalIgnoreCase);
}
dictionary = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
if (value != null)
{

56
src/Microsoft.AspNet.Mvc.Core/Rendering/Html/HtmlHelper.cs
View File

@ -103,6 +103,9 @@ namespace Microsoft.AspNet.Mvc.Rendering
/// Creates a dictionary from an object, by adding each public instance property as a key with its associated
/// value to the dictionary. It will expose public properties from derived types as well. This is typically used
/// with objects of an anonymous type.
///
/// If the object is already an <see cref="IDictionary{string, object}"/> instance, then it is
/// returned as-is.
/// </summary>
/// <example>
/// <c>new { property_name = "value" }</c> will translate to the entry <c>{ "property_name" , "value" }</c>
@ -112,32 +115,15 @@ namespace Microsoft.AspNet.Mvc.Rendering
/// <returns>The created dictionary of property names and property values.</returns>
public static IDictionary<string, object> ObjectToDictionary(object obj)
{
IDictionary<string, object> result;
var valuesAsDictionary = obj as IDictionary<string, object>;
if (valuesAsDictionary != null)
{
result = new Dictionary<string, object>(valuesAsDictionary, StringComparer.OrdinalIgnoreCase);
}
else
{
result = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
if (obj != null)
{
foreach (var prop in obj.GetType().GetRuntimeProperties())
{
var value = prop.GetValue(obj);
result.Add(prop.Name, value);
}
}
}
return result;
return TypeHelper.ObjectToDictionary(obj);
}
/// <summary>
/// Creates a dictionary of HTML attributes from the input object,
/// translating underscores to dashes.
/// translating underscores to dashes in each public instance property.
///
/// If the object is already an <see cref="IDictionary{string, object}"/> instance, then it is
/// returned as-is.
/// <example>
/// new { data_name="value" } will translate to the entry { "data-name" , "value" }
/// in the resulting dictionary.
@ -147,9 +133,23 @@ namespace Microsoft.AspNet.Mvc.Rendering
/// <returns>A dictionary that represents HTML attributes.</returns>
public static IDictionary<string, object> AnonymousObjectToHtmlAttributes(object htmlAttributes)
{
// NOTE: This should be doing more than just returning a generic conversion from obj -> dict
// Once GitHub #80 has been completed this will do more than be a call through.
return ObjectToDictionary(htmlAttributes);
var dictionary = htmlAttributes as IDictionary<string, object>;
if (dictionary != null)
{
return new Dictionary<string, object>(dictionary, StringComparer.OrdinalIgnoreCase);
}
dictionary = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
if (htmlAttributes != null)
{
foreach (var helper in HtmlAttributePropertyHelper.GetProperties(htmlAttributes))
{
dictionary.Add(helper.Name, helper.GetValue(htmlAttributes));
}
}
return dictionary;
}
public virtual void Contextualize([NotNull] ViewContext viewContext)
@ -164,11 +164,7 @@ namespace Microsoft.AspNet.Mvc.Rendering
IDictionary<string, object> htmlAttributeDictionary = null;
if (htmlAttributes != null)
{
htmlAttributeDictionary = htmlAttributes as IDictionary<string, object>;
if (htmlAttributeDictionary == null)
{
htmlAttributeDictionary = HtmlHelper.AnonymousObjectToHtmlAttributes(htmlAttributes);
}
htmlAttributeDictionary = HtmlHelper.AnonymousObjectToHtmlAttributes(htmlAttributes);
}
return GenerateForm(actionName, controllerName, routeValues, method, htmlAttributeDictionary);

15
src/Microsoft.AspNet.Mvc.Core/UrlHelper.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Diagnostics.Contracts;
using System.Globalization;
using System.Linq;
using System.Linq.Expressions;
using Microsoft.AspNet.Abstractions;
using Microsoft.AspNet.DependencyInjection;
using Microsoft.AspNet.Mvc.Rendering;
@ -27,15 +28,7 @@ namespace Microsoft.AspNet.Mvc
public string Action(string action, string controller, object values, string protocol, string host, string fragment)
{
var valuesDictionary = values as IDictionary<string, object>;
if (valuesDictionary == null)
{
valuesDictionary = new RouteValueDictionary(values);
}
else
{
valuesDictionary = new RouteValueDictionary(valuesDictionary);
}
var valuesDictionary = TypeHelper.ObjectToDictionary(values);
if (action != null)
{
@ -76,7 +69,9 @@ namespace Microsoft.AspNet.Mvc
public string RouteUrl(object values, string protocol, string host, string fragment)
{
var path = GeneratePathFromRoute(new RouteValueDictionary(values));
var valuesDictionary = TypeHelper.ObjectToDictionary(values);
var path = GeneratePathFromRoute(valuesDictionary);
if (path == null)
{
return null;