fixing multiple issues - #44 #42 #41 #37 #26

src/SwaggerWcf.Test.Service/Data/Book.cs

@@ -28,5 +28,9 @@ public class Book
  [DataMember]
  [Description("Book Language")]
  public Language Language { get; set; }
+
+ [DataMember]
+ [Description("Book Tags")]
+ public string[] Tags { get; set; }
  }
 }

src/SwaggerWcf.Test.Service/IStore.cs

@@ -13,7 +13,7 @@ public interface IStore
 
  [SwaggerWcfPath("Create book", "Create a book on the store")]
  // default Method for WebInvoke is POST
- [WebInvoke(UriTemplate = "/books", BodyStyle = WebMessageBodyStyle.Bare, //Method = "POST",
+ [WebInvoke(UriTemplate = "/books", BodyStyle = WebMessageBodyStyle.Wrapped, //Method = "POST",
  RequestFormat = WebMessageFormat.Json, ResponseFormat = WebMessageFormat.Json)]
  [OperationContract]
  Book CreateBook([SwaggerWcfParameter(Description = "Book to be created, the id will be replaced")] Book value);

src/SwaggerWcf.Test.Service/Store.svc.cs

@@ -13,6 +13,7 @@ public class BookStore : IStore
  {
  #region /books
  [SwaggerWcfTag("Books")]
+ [SwaggerWcfHeader("clientId", false, "Client ID", "000")]
  [SwaggerWcfResponse(HttpStatusCode.Created, "Book created, value in the response body with id updated")]
  [SwaggerWcfResponse(HttpStatusCode.BadRequest, "Bad request", true)]
  [SwaggerWcfResponse(HttpStatusCode.InternalServerError,

src/SwaggerWcf/Attributes/SwaggerWcfHeaderAttribute.cs

@@ -0,0 +1,46 @@
+using System;
+
+namespace SwaggerWcf.Attributes
+{
+ /// <summary>
+ /// Describe a parameter
+ /// </summary>
+ [AttributeUsage(AttributeTargets.Method)]
+ public class SwaggerWcfHeaderAttribute : Attribute
+ {
+ /// <summary>
+ /// Describes a parameter
+ /// </summary>
+ /// <param name="name">Parameter name</param>
+ /// <param name="required">Set parameter as required. Defaults is false.</param>
+ /// <param name="description">Parameter description.</param>
+ /// <param name="defaultValue">Parameter default value.</param>
+ public SwaggerWcfHeaderAttribute(string name, bool required = false, string description = null, string defaultValue = null)
+ {
+ Name = name;
+ Required = required;
+ Description = description;
+ DefaultValue = defaultValue;
+ }
+
+ /// <summary>
+ /// Name of this parameter
+ /// </summary>
+ public string Name { get; set; }
+
+ /// <summary>
+ /// Defines if this parameter is required in operations
+ /// </summary>
+ public bool Required { get; set; }
+
+ /// <summary>
+ /// Description of this parameter
+ /// </summary>
+ public string Description { get; set; }
+
+ /// <summary>
+ /// Default value of this parameter
+ /// </summary>
+ public string DefaultValue { get; set; }
+ }
+}

src/SwaggerWcf/Models/InType.cs

@@ -6,6 +6,7 @@ internal enum InType
  Body = 1,
  Path = 2,
  Query = 3,
- FormData = 4
+ FormData = 4,
+ Header = 5
  }
 }

src/SwaggerWcf/Support/DefinitionsBuilder.cs

@@ -11,7 +11,7 @@ namespace SwaggerWcf.Support
 {
  internal sealed class DefinitionsBuilder
  {
- public static List<Definition> Process(IList<string> hiddenTags, List<Type> definitionsTypes)
+ public static List<Definition> Process(IList<string> hiddenTags, IList<string> visibleTags, List<Type> definitionsTypes)
  {
  if (definitionsTypes == null || !definitionsTypes.Any())
  return new List<Definition>(0);
@@ -24,7 +24,7 @@ public static List<Definition> Process(IList<string> hiddenTags, List<Type> defi
  while (typesStack.Any())
  {
  Type t = typesStack.Pop();
- if (IsHidden(t, hiddenTags) || processedTypes.Contains(t))
+ if (IsHidden(t, hiddenTags, visibleTags) || processedTypes.Contains(t))
  continue;
 
  processedTypes.Add(t);
@@ -34,18 +34,17 @@ public static List<Definition> Process(IList<string> hiddenTags, List<Type> defi
  return definitions;
  }
 
- private static bool IsHidden(Type type, IList<string> hiddenTags)
+ private static bool IsHidden(Type type, ICollection<string> hiddenTags, ICollection<string> visibleTags)
  {
  if (hiddenTags.Contains(type.FullName))
  return true;
 
  if (type.GetCustomAttribute<SwaggerWcfHiddenAttribute>() != null)
- return true;
-
- if (type.GetCustomAttributes<SwaggerWcfTagAttribute>().Select(t => t.TagName).Any(hiddenTags.Contains))
- return true;
+ {
+ return !type.GetCustomAttributes<SwaggerWcfTagAttribute>().Select(t => t.TagName).Any(visibleTags.Contains);
+ }
 
- return false;
+ return type.GetCustomAttributes<SwaggerWcfTagAttribute>().Select(t => t.TagName).Any(hiddenTags.Contains);
  }
 
  private static Definition ConvertTypeToDefinition(Type definitionType, IList<string> hiddenTags,
@@ -136,8 +135,16 @@ private static void ProcessProperties(Type definitionType, DefinitionSchema sche
  //prop.TypeFormat = new TypeFormat(prop.TypeFormat.Type, HttpUtility.HtmlEncode(t.FullName));
  prop.TypeFormat = new TypeFormat(prop.TypeFormat.Type, null);
 
- prop.Items.TypeFormat = new TypeFormat(ParameterType.Unknown, null);
- prop.Items.Ref = t.FullName;
+ TypeFormat st = Helpers.MapSwaggerType(t);
+ if (st.Type == ParameterType.Array || st.Type == ParameterType.Object)
+ {
+ prop.Items.TypeFormat = new TypeFormat(ParameterType.Unknown, null);
+ prop.Items.Ref = t.FullName;
+ }
+ else
+ {
+ prop.Items.TypeFormat = st;
+ }
  }
  }
 

src/SwaggerWcf/Support/Helpers.cs

@@ -12,7 +12,7 @@ namespace SwaggerWcf.Support
 {
  internal static class Helpers
  {
- public static TypeFormat MapSwaggerType(Type type, IList<Type> definitions)
+ public static TypeFormat MapSwaggerType(Type type, IList<Type> definitions = null)
  {
  //built-in types
  if (type == typeof(bool))