Merge pull request WebApiContrib#47 from jordangray/pre

Updates for 2.0.0 pre-release branch
a-frazier · Sep 21, 2015 · d8ce6d9 · d8ce6d9
2 parents 61aee58 + d8fa7d9
commit d8ce6d9
Show file tree

Hide file tree

Showing 66 changed files with 8,153 additions and 4,608 deletions.
diff --git a/.vs/config/applicationhost.config b/.vs/config/applicationhost.config
diff --git a/samples/WebApiContrib.Formatting.Xlsx.Sample/Areas/HelpPage/ApiDescriptionExtensions.cs b/samples/WebApiContrib.Formatting.Xlsx.Sample/Areas/HelpPage/ApiDescriptionExtensions.cs
@@ -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();
         }

diff --git a/samples/WebApiContrib.Formatting.Xlsx.Sample/Areas/HelpPage/HelpPage.css b/samples/WebApiContrib.Formatting.Xlsx.Sample/Areas/HelpPage/HelpPage.css
@@ -65,7 +65,7 @@
 
 .help-page .sample-header {
     border: 2px solid #D4D4D4;
-    background: #76B8DB;
+    background: #00497E;
     color: #FFFFFF;
     padding: 8px 15px;
     border-bottom: none;
@@ -109,6 +109,7 @@
 .help-page h1,
 .help-page .h1 {
     font-size: 36px;
+    line-height: normal;
 }
 
 .help-page h2,
@@ -128,6 +129,6 @@
 }
 
 .help-page a {
-    color: #00abec;
+    color: #0000EE;
     text-decoration: none;
 }
diff --git a/...es/WebApiContrib.Formatting.Xlsx.Sample/Areas/HelpPage/HelpPageConfigurationExtensions.cs b/...es/WebApiContrib.Formatting.Xlsx.Sample/Areas/HelpPage/HelpPageConfigurationExtensions.cs
@@ -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;
@@ -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)
                         {
@@ -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)
         {

diff --git a/samples/WebApiContrib.Formatting.Xlsx.Sample/Areas/HelpPage/Views/Shared/_Layout.cshtml b/samples/WebApiContrib.Formatting.Xlsx.Sample/Areas/HelpPage/Views/Shared/_Layout.cshtml
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width" />

diff --git a/samples/WebApiContrib.Formatting.Xlsx.Sample/Areas/HelpPage/Views/Web.config b/samples/WebApiContrib.Formatting.Xlsx.Sample/Areas/HelpPage/Views/Web.config
@@ -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" />