Added TrimLastEmptyRows and IsLastRowEmpty.

mikecole · Aug 8, 2018 · 9fb090c · 9fb090c
1 parent 267c59e
commit 9fb090c
Show file tree

Hide file tree

Showing 5 changed files with 88 additions and 3 deletions.
diff --git a/src/EPPlus.Extensions.Tests/EPPlus.Extensions.Tests.csproj b/src/EPPlus.Extensions.Tests/EPPlus.Extensions.Tests.csproj
@@ -56,6 +56,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="MarvelWithSpaces.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="Marvel.csv">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

diff --git a/src/EPPlus.Extensions.Tests/ExtensionTests.cs b/src/EPPlus.Extensions.Tests/ExtensionTests.cs
@@ -133,6 +133,40 @@ public void ToDataSet_WhenCsv_AllowsDateFormat()
             Convert.ToDateTime(cellValue).ToString("o").ShouldBe(DateTime.Parse("04/22/1950 08:41 PM").ToString("o"));
         }
 
+        public void IsLastRowEmpty_ReturnsFalse_WhenLastRowIsNotEmpty()
+        {
+            var package = GetMarvelCsvPackage();
+            package.Workbook.Worksheets["Marvel"].IsLastRowEmpty().ShouldBeFalse();
+        }
+
+        public void IsLastRowEmpty_ReturnsTrue_WhenLastRowIsEmpty()
+        {
+            var package = GetMarvelWithSpacesCsvPackage();
+            package.Workbook.Worksheets["Marvel"].IsLastRowEmpty().ShouldBeTrue();
+        }
+
+        public void TrimLastEmptyRows_RemovesEmptyRows()
+        {
+            var package = GetMarvelWithSpacesCsvPackage();
+            var sheet = package.Workbook.Worksheets["Marvel"];
+
+            sheet.TrimLastEmptyRows();
+
+            sheet.IsLastRowEmpty().ShouldBeFalse();
+            sheet.Dimension.End.Row.ShouldBe(11);
+        }
+
+        public void TrimLastEmptyRows_DoesRemoveNotEmptyRows()
+        {
+            var package = GetMarvelCsvPackage();
+            var sheet = package.Workbook.Worksheets["Marvel"];
+
+            sheet.TrimLastEmptyRows();
+
+            sheet.IsLastRowEmpty().ShouldBeFalse();
+            sheet.Dimension.End.Row.ShouldBe(11);
+        }
+
         private static ExcelPackage GetMarvelPackage()
         {
             var path = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Marvel.xlsx");
@@ -147,8 +181,21 @@ private static ExcelPackage GetMarvelCsvPackage()
             var file = new FileInfo(path);
             var package = new ExcelPackage();
 
-            var textFormat = new ExcelTextFormat();
-            textFormat.TextQualifier = '"';
+            var textFormat = new ExcelTextFormat { TextQualifier = '"' };
+
+            var sheet = package.Workbook.Worksheets.Add("Marvel");
+            sheet.Cells.LoadFromText(File.ReadAllText(file.FullName), textFormat);
+
+            return package;
+        }
+
+        private static ExcelPackage GetMarvelWithSpacesCsvPackage()
+        {
+            var path = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "MarvelWithSpaces.csv");
+            var file = new FileInfo(path);
+            var package = new ExcelPackage();
+
+            var textFormat = new ExcelTextFormat { TextQualifier = '"' };
 
             var sheet = package.Workbook.Worksheets.Add("Marvel");
             sheet.Cells.LoadFromText(File.ReadAllText(file.FullName), textFormat);

diff --git a/src/EPPlus.Extensions.Tests/Marvel.csv b/src/EPPlus.Extensions.Tests/Marvel.csv
@@ -8,4 +8,4 @@ Steve,Rogers,Captain America,04/22/2017 08:41 PM
 James,Barnes,The Winter Solider,04/22/2017 08:41 PM
 Sam,Wilson,Falcon,04/22/2017 08:41 PM
 Wanda,Maximoff,Scarlet Witch,04/22/2017 08:41 PM
-Natasha,Romanoff,Black WIdow,04/22/2017 08:41 PM
+Natasha,Romanoff,Black Widow,04/22/2017 08:41 PM
diff --git a/src/EPPlus.Extensions.Tests/MarvelWithSpaces.csv b/src/EPPlus.Extensions.Tests/MarvelWithSpaces.csv
@@ -0,0 +1,13 @@
+First Name,Last Name,Alter Ego,Birth Date
+Tony,Stark,Iron Man,04/22/1950 08:41 PM
+Peter,Parker,Spider-man,04/22/2017 08:41 PM
+Bruce,Banner,Hulk,04/22/2017 08:41 PM
+Clint,Barton,Hawkeye,04/22/2017 08:41 PM
+James,Rhodes,War Machine,04/22/2017 08:41 PM
+Steve,Rogers,Captain America,04/22/2017 08:41 PM
+James,Barnes,The Winter Solider,04/22/2017 08:41 PM
+Sam,Wilson,Falcon,04/22/2017 08:41 PM
+Wanda,Maximoff,Scarlet Witch,04/22/2017 08:41 PM
+Natasha,Romanoff,Black Widow,04/22/2017 08:41 PM
+
+
diff --git a/src/EPPlus.Extensions/EPPlusExtensions.cs b/src/EPPlus.Extensions/EPPlusExtensions.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using OfficeOpenXml;
 using System;
+using System.Collections.Generic;
 
 namespace EPPlus.Extensions
 {
@@ -67,5 +68,26 @@ public static DataSet ToDataSet(this ExcelPackage package, int headerRow = 0)
 
             return result;
         }
+
+        public static void TrimLastEmptyRows(this ExcelWorksheet worksheet)
+        {
+            while (worksheet.IsLastRowEmpty())
+            {
+                worksheet.DeleteRow(worksheet.Dimension.End.Row, 1);
+            }
+        }
+
+        public static bool IsLastRowEmpty(this ExcelWorksheet worksheet)
+        {
+            var empties = new List<bool>();
+
+            for (var index = 1; index <= worksheet.Dimension.End.Column; index++)
+            {
+                var value = worksheet.Cells[worksheet.Dimension.End.Row, index].Value;
+                empties.Add(value == null || string.IsNullOrWhiteSpace(value.ToString()));
+            }
+
+            return empties.All(e => e);
+        }
     }
 }