1. add row data validator

2. rename ValueValidator* to CellValueValidator*
3. correct typos

Author: biggray

src/Excel.cs

@@ -138,10 +138,10 @@ public static class Excel
 
                     var value = row.GetCellValue(index, _formulaEvaluator);
 
-                    // give a chance to the value validator
-                    if (config?.ValueValidator != null)
+                    // give a chance to the cell value validator
+                    if (null != config?.CellValueValidator)
                     {
-                        var validationResult = config.ValueValidator(row.RowNum - 1, config.Index, value);
+                        var validationResult = config.CellValueValidator(row.RowNum - 1, config.Index, value);
                         if (false == validationResult)
                         {
                             if (fluentConfig.SkipInvalidRows)
@@ -189,6 +189,22 @@ public static class Excel
 
                 if (itemIsValid)
                 {
+                    // give a chance to the row data validator
+                    if (null != fluentConfig?.RowDataValidator)
+                    {
+                        var validationResult = fluentConfig.RowDataValidator(row.RowNum - 1, item);
+                        if (false == validationResult)
+                        {
+                            if (fluentConfig.SkipInvalidRows)
+                            {
+                                itemIsValid = false;
+                                continue;
+                            }
+
+                            throw new ArgumentException($"Validation of row data at row {row.RowNum} failed!");
+                        }
+                    }
+
                     list.Add(item);
                 }
             }

src/FluentConfiguration/FluentConfiguration.cs

@@ -14,10 +14,19 @@ namespace FluentExcel
     /// <typeparam name="TModel">The type of model.</typeparam>
     public class FluentConfiguration<TModel> : IFluentConfiguration where TModel : class
     {
+        /// <summary>
+        /// Typed row data validator delegate, validate current row before adding it to the result list.
+        /// </summary>
+        /// <param name="rowIndex">Index of current row in excel</param>
+        /// <param name="rowData">Model data of current row</param>
+        /// <returns>Whether the row data passes validation</returns>
+        public delegate bool RowDataValidatorTypedDelegate(int rowIndex, TModel rowData);
+
         private Dictionary<string, PropertyConfiguration> _propertyConfigurations;
         private List<StatisticsConfiguration> _statisticsConfigurations;
         private List<FilterConfiguration> _filterConfigurations;
         private List<FreezeConfiguration> _freezeConfigurations;
+        private RowDataValidatorDelegate _rowDataValidator;
         private bool _skipInvalidRows;
 
         /// <summary>
@@ -79,6 +88,12 @@ public IReadOnlyList<FreezeConfiguration> FreezeConfigurations
             }
         }
 
+        /// <summary>
+        /// Gets the row data validator.
+        /// </summary>
+        /// <value>The row data validator.</value>
+        public RowDataValidatorDelegate RowDataValidator { get { return _rowDataValidator; } }
+
         /// <summary>
         /// Gets the value indicating whether to skip the rows with validation failure while loading the excel data.
         /// </summary>
@@ -261,6 +276,30 @@ public FluentConfiguration<TModel> HasFreeze(int columnSplit, int rowSplit, int
             return this;
         }
 
+        /// <summary>
+        /// Configures the row data validator which validates each row before adding it to the result list.
+        /// </summary>
+        /// <returns>The <see cref="FluentConfiguration{TModel}"/>.</returns>
+        /// <param name="rowDataValidator">The row data validator</param>
+        public FluentConfiguration<TModel> HasRowDataValidator(RowDataValidatorTypedDelegate rowDataValidator)
+        {
+            if (null == rowDataValidator)
+            {
+                _rowDataValidator = null;
+                return this;
+            }
+
+            _rowDataValidator = (rowIndex, rowData) =>
+            {
+                var model = rowData as TModel;
+                if (null == model && null != rowData) throw new ArgumentException($"the row data is not of type {typeof(TModel).Name}", nameof(rowData));
+
+                return rowDataValidator(rowIndex, model);
+            };
+
+            return this;
+        }
+
         /// <summary>
         /// Configure whether to skip the rows with validation failure while loading the excel data.
         /// </summary>

src/FluentConfiguration/IFluentConfiguration.cs

@@ -4,6 +4,14 @@ namespace FluentExcel
 {
     using System.Collections.Generic;
 
+    /// <summary>
+    /// Row data validator delegate, validate current row before adding it to the result list.
+    /// </summary>
+    /// <param name="rowIndex">Index of current row in excel</param>
+    /// <param name="rowData">Model data of current row</param>
+    /// <returns>Whether the row data passes validation</returns>
+    public delegate bool RowDataValidatorDelegate(int rowIndex, object rowData);
+
     /// <summary>
     /// Provides the interfaces for the fluent configuration.
     /// </summary>
@@ -33,6 +41,12 @@ public interface IFluentConfiguration
         /// <value>The freeze config.</value>
         IReadOnlyList<FreezeConfiguration> FreezeConfigurations { get; }
 
+        /// <summary>
+        /// Gets the row data validator.
+        /// </summary>
+        /// <value>The row data validator.</value>
+        RowDataValidatorDelegate RowDataValidator { get; }
+
         /// <summary>
         /// Gets the value indicating whether to skip the rows with validation failure while loading the excel data.
         /// </summary>

src/FluentConfiguration/PropertyConfiguration.cs

@@ -5,13 +5,13 @@ namespace FluentExcel
     using System;
 
     /// <summary>
-    /// Value validator delegate, validate value before <see cref="PropertyConfiguration.ValueConverter"/>
+    /// Cell value validator delegate, validate current cell value before <see cref="PropertyConfiguration.ValueConverter"/>
     /// </summary>
     /// <param name="rowIndex">Row index of current cell in excel</param>
     /// <param name="columnIndex">Column index of current cell in excel</param>
-    /// <param name="value">value of current cell</param>
-    /// <returns>Wether the value passes validation</returns>
-    public delegate bool ValueValidatorDelegate(int rowIndex, int columnIndex, object value);
+    /// <param name="value">Value of current cell</param>
+    /// <returns>Whether the value passes validation</returns>
+    public delegate bool CellValueValidatorDelegate(int rowIndex, int columnIndex, object value);
 
     /// <summary>
     /// Represents the configuration for the specfidied property.
@@ -61,9 +61,9 @@ public class PropertyConfiguration
         public string Formatter { get; internal set; }
 
         /// <summary>
-        /// Gets the value validator to validate the value.
+        /// Gets the cell value validator to validate the cell value.
         /// </summary>
-        public ValueValidatorDelegate ValueValidator { get; internal set; }
+        public CellValueValidatorDelegate CellValueValidator { get; internal set; }
 
         /// <summary>
         /// Gets the value converter to convert the value.
@@ -149,13 +149,13 @@ public PropertyConfiguration HasValueConverter(Func<object, object> valueConvert
         }
 
         /// <summary>
-        /// Configures the value validator for the specified property.
+        /// Configures the cell value validator for the specified property.
         /// </summary>
-        /// <param name="valueValidator">The value validator.</param>
+        /// <param name="cellValueValidator">The value validator.</param>
         /// <returns>The <see cref="PropertyConfiguration"/>.</returns>
-        public PropertyConfiguration HasValueValidator(ValueValidatorDelegate valueValidator)
+        public PropertyConfiguration HasValueValidator(CellValueValidatorDelegate cellValueValidator)
         {
-            ValueValidator = valueValidator;
+            CellValueValidator = cellValueValidator;
 
             return this;
         }