Update data annotations validation to include class level attributes

NancyFx · Mar 2, 2014 · 9f207dd · 9f207dd
1 parent b4e3bb3
commit 9f207dd
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/src/Nancy.Validation.DataAnnotatioins.Tests/DataAnnotationValidatorFixture.cs b/src/Nancy.Validation.DataAnnotatioins.Tests/DataAnnotationValidatorFixture.cs
@@ -142,7 +142,7 @@ private class OopsValidationAttribute : ValidationAttribute
         {
             protected override ValidationResult IsValid(object value, ValidationContext validationContext)
             {
-                return new ValidationResult("Oops");
+                return new ValidationResult("Oops", new[] { string.Empty });
             }
         }
 

diff --git a/src/Nancy.Validation.DataAnnotations/DataAnnotationsValidatorAdapter.cs b/src/Nancy.Validation.DataAnnotations/DataAnnotationsValidatorAdapter.cs
@@ -38,7 +38,7 @@ protected DataAnnotationsValidatorAdapter(string ruleType)
         /// <returns>An <see cref="IEnumerable{T}"/> of <see cref="ModelValidationRule"/> instances.</returns>
         public virtual IEnumerable<ModelValidationRule> GetRules(ValidationAttribute attribute, PropertyDescriptor descriptor)
         {
-            yield return new ModelValidationRule(ruleType, attribute.FormatErrorMessage, descriptor == null ? null : new[] { descriptor.Name });
+            yield return new ModelValidationRule(ruleType, attribute.FormatErrorMessage, new [] { descriptor == null ? string.Empty : descriptor.Name });
         }
 
         /// <summary>

diff --git a/src/Nancy.Validation.DataAnnotations/DefaultPropertyValidatorFactory.cs b/src/Nancy.Validation.DataAnnotations/DefaultPropertyValidatorFactory.cs
@@ -38,6 +38,17 @@ public IEnumerable<IPropertyValidator> GetValidators(Type type)
             var results =
                 new List<IPropertyValidator>();
 
+            var classAttributes =
+                typeDescriptor.GetAttributes().OfType<ValidationAttribute>();
+
+            var classValidator =
+                new PropertyValidator
+                {
+                    AttributeAdaptors = this.GetAttributeAdaptors(classAttributes)
+                };
+
+            results.Add(classValidator);
+
             foreach (PropertyDescriptor descriptor in propertyDescriptors)
             {
                 var attributes =