Skip to content

Updates for 2.0.0 pre-release branch #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Sep 21, 2015
Merged

Updates for 2.0.0 pre-release branch #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1c79ede
Better namespacing, more modular serialisation
jordangray Aug 31, 2015
d66d47a
ExpandoObject serialisation, streamlined tests
jordangray Sep 1, 2015
40f2312
More flexibility, added comments
jordangray Sep 2, 2015
87ed10a
New contract resolver functionality
jordangray Sep 2, 2015
1d6cef1
Tested and working per request contract resolver
jordangray Sep 2, 2015
a3ddda6
Tidied up style test
jordangray Sep 8, 2015
5be64c2
Improved naming, expanded documentation
jordangray Sep 21, 2015
fb10ad6
Bumped assembly version
jordangray Sep 21, 2015
6c330ba
Reflected version bump in related projects
jordangray Sep 21, 2015
a41808d
Updated NuGet packages
jordangray Sep 21, 2015
d8fa7d9
Updated assembly info version
jordangray Sep 21, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,027 changes: 1,027 additions & 0 deletions .vs/config/applicationhost.config
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion samples/WebApiContrib.Formatting.Xlsx.Sample/Areas/HelpPage/ApiDescriptionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public static string GetFriendlyId(this ApiDescription description)
localPath.Replace("/", "-").Replace("{", String.Empty).Replace("}", String.Empty));
if (queryKeyString != null)
{
friendlyPath.AppendFormat("_{0}", queryKeyString);
friendlyPath.AppendFormat("_{0}", queryKeyString.Replace('.', '-'));
}
return friendlyPath.ToString();
}
Expand Down
5 changes: 3 additions & 2 deletions samples/WebApiContrib.Formatting.Xlsx.Sample/Areas/HelpPage/HelpPage.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@

.help-page .sample-header {
border: 2px solid #D4D4D4;
background: #76B8DB;
background: #00497E;
color: #FFFFFF;
padding: 8px 15px;
border-bottom: none;
Expand Down Expand Up @@ -109,6 +109,7 @@
.help-page h1,
.help-page .h1 {
font-size: 36px;
line-height: normal;
}

.help-page h2,
Expand All @@ -128,6 +129,6 @@
}

.help-page a {
color: #00abec;
color: #0000EE;
text-decoration: none;
}
34 changes: 33 additions & 1 deletion ...es/WebApiContrib.Formatting.Xlsx.Sample/Areas/HelpPage/HelpPageConfigurationExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.ComponentModel;
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using System.Globalization;
Expand Down Expand Up @@ -268,7 +269,28 @@ private static void GenerateUriParameters(HelpPageApiModel apiModel, ModelDescri
complexTypeDescription = typeDescription as ComplexTypeModelDescription;
}

if (complexTypeDescription != null)
// Example:
// [TypeConverter(typeof(PointConverter))]
// public class Point
// {
// public Point(int x, int y)
// {
// X = x;
// Y = y;
// }
// public int X { get; set; }
// public int Y { get; set; }
// }
// Class Point is bindable with a TypeConverter, so Point will be added to UriParameters collection.
//
// public class Point
// {
// public int X { get; set; }
// public int Y { get; set; }
// }
// Regular complex class Point will have properties X and Y added to UriParameters collection.
if (complexTypeDescription != null
&& !IsBindableWithTypeConverter(parameterType))
{
foreach (ParameterDescription uriParameter in complexTypeDescription.Properties)
{
Expand Down Expand Up @@ -305,6 +327,16 @@ private static void GenerateUriParameters(HelpPageApiModel apiModel, ModelDescri
}
}

private static bool IsBindableWithTypeConverter(Type parameterType)
{
if (parameterType == null)
{
return false;
}

return TypeDescriptor.GetConverter(parameterType).CanConvertFrom(typeof(string));
}

private static ParameterDescription AddParameterDescription(HelpPageApiModel apiModel,
ApiParameterDescription apiParameter, ModelDescription typeDescription)
{
Expand Down
2 changes: 1 addition & 1 deletion samples/WebApiContrib.Formatting.Xlsx.Sample/Areas/HelpPage/Views/Shared/_Layout.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width" />
Expand Down
2 changes: 1 addition & 1 deletion samples/WebApiContrib.Formatting.Xlsx.Sample/Areas/HelpPage/Views/Web.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</configSections>

<system.web.webPages.razor>
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.1.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<pages pageBaseType="System.Web.Mvc.WebViewPage">
<namespaces>
<add namespace="System.Web.Mvc" />
Expand Down
Loading