From 1ea956ae7f5d6567e336618c05af2345efdf1efb Mon Sep 17 00:00:00 2001 From: BobLd <38405645+BobLd@users.noreply.github.com> Date: Sun, 6 Oct 2024 18:18:33 +0100 Subject: [PATCH 1/8] Update TargetFrameworks --- Tabula.Csv/Tabula.Csv.csproj | 2 +- Tabula.Json/Tabula.Json.csproj | 2 +- Tabula/Tabula.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Tabula.Csv/Tabula.Csv.csproj b/Tabula.Csv/Tabula.Csv.csproj index 8da83ec..dfc0439 100644 --- a/Tabula.Csv/Tabula.Csv.csproj +++ b/Tabula.Csv/Tabula.Csv.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1;netstandard2.0;net452;net46;net461;net462;net47;net6.0 + netstandard2.0;net462;net471;net6.0;net8.0 Extract tables from PDF files (port of tabula-java using PdfPig). Csv and Tsv writers. https://github.com/BobLd/tabula-sharp 0.1.4-alpha001 diff --git a/Tabula.Json/Tabula.Json.csproj b/Tabula.Json/Tabula.Json.csproj index ebae5de..8b35abc 100644 --- a/Tabula.Json/Tabula.Json.csproj +++ b/Tabula.Json/Tabula.Json.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1;netstandard2.0;net452;net46;net461;net462;net47;net6.0 + netstandard2.0;net462;net471;net6.0;net8.0 Extract tables from PDF files (port of tabula-java using PdfPig). Json writer. https://github.com/BobLd/tabula-sharp 0.1.4-alpha001 diff --git a/Tabula/Tabula.csproj b/Tabula/Tabula.csproj index c3ff4cf..5de3046 100644 --- a/Tabula/Tabula.csproj +++ b/Tabula/Tabula.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1;netstandard2.0;net452;net46;net461;net462;net47;net6.0 + netstandard2.0;net462;net471;net6.0;net8.0 Extract tables from PDF files (port of tabula-java using PdfPig). https://github.com/BobLd/tabula-sharp 0.1.4-alpha001 From 64904d07a85f619bd11486966fb76f53c3e73661 Mon Sep 17 00:00:00 2001 From: BobLd <38405645+BobLd@users.noreply.github.com> Date: Sun, 6 Oct 2024 18:20:38 +0100 Subject: [PATCH 2/8] Update CsvHelper to 33.0.1 --- Tabula.Csv/Tabula.Csv.csproj | 2 +- Tabula.Tests/Tabula.Tests.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Tabula.Csv/Tabula.Csv.csproj b/Tabula.Csv/Tabula.Csv.csproj index dfc0439..1637398 100644 --- a/Tabula.Csv/Tabula.Csv.csproj +++ b/Tabula.Csv/Tabula.Csv.csproj @@ -22,7 +22,7 @@ - + diff --git a/Tabula.Tests/Tabula.Tests.csproj b/Tabula.Tests/Tabula.Tests.csproj index 7e7f370..1ab4e60 100644 --- a/Tabula.Tests/Tabula.Tests.csproj +++ b/Tabula.Tests/Tabula.Tests.csproj @@ -9,7 +9,7 @@ - + From 41e06b21d6809a9f8f7d0a3fac566e63b6e5a916 Mon Sep 17 00:00:00 2001 From: BobLd <38405645+BobLd@users.noreply.github.com> Date: Sun, 6 Oct 2024 18:21:42 +0100 Subject: [PATCH 3/8] Update xunit to 2.9.2 --- Tabula.Tests/Tabula.Tests.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tabula.Tests/Tabula.Tests.csproj b/Tabula.Tests/Tabula.Tests.csproj index 1ab4e60..dbed5eb 100644 --- a/Tabula.Tests/Tabula.Tests.csproj +++ b/Tabula.Tests/Tabula.Tests.csproj @@ -12,8 +12,8 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive From f453fda5c9c014f547f3be0fa101068028093ee9 Mon Sep 17 00:00:00 2001 From: BobLd <38405645+BobLd@users.noreply.github.com> Date: Sun, 6 Oct 2024 18:22:20 +0100 Subject: [PATCH 4/8] Update Microsoft.NET.Test.Sdk to 17.11.1 --- Tabula.Tests/Tabula.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tabula.Tests/Tabula.Tests.csproj b/Tabula.Tests/Tabula.Tests.csproj index dbed5eb..f4d9571 100644 --- a/Tabula.Tests/Tabula.Tests.csproj +++ b/Tabula.Tests/Tabula.Tests.csproj @@ -10,7 +10,7 @@ - + From 95278a4425aae3c03df9b30ef46348e29c9f6531 Mon Sep 17 00:00:00 2001 From: BobLd <38405645+BobLd@users.noreply.github.com> Date: Sun, 6 Oct 2024 18:22:44 +0100 Subject: [PATCH 5/8] Update coverlet to 6.0.2 --- Tabula.Tests/Tabula.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tabula.Tests/Tabula.Tests.csproj b/Tabula.Tests/Tabula.Tests.csproj index f4d9571..e99e7bd 100644 --- a/Tabula.Tests/Tabula.Tests.csproj +++ b/Tabula.Tests/Tabula.Tests.csproj @@ -17,7 +17,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive From b446c396ad85e94d74eb20ad46e88433d42ff4e9 Mon Sep 17 00:00:00 2001 From: BobLd <38405645+BobLd@users.noreply.github.com> Date: Sun, 6 Oct 2024 18:23:13 +0100 Subject: [PATCH 6/8] Update PdfPig to 0.1.9 --- Tabula/Tabula.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tabula/Tabula.csproj b/Tabula/Tabula.csproj index 5de3046..c6708b3 100644 --- a/Tabula/Tabula.csproj +++ b/Tabula/Tabula.csproj @@ -23,7 +23,7 @@ - + From 1d955a3b782d46509698af02bc1cd6e92848bc3c Mon Sep 17 00:00:00 2001 From: BobLd <38405645+BobLd@users.noreply.github.com> Date: Sun, 6 Oct 2024 18:37:27 +0100 Subject: [PATCH 7/8] Fix tests --- Tabula.Tests/PdfPigExtensionsTests.cs | 53 +++++++++++++-------------- Tabula.Tests/TestBasicExtractor.cs | 52 ++++++++++++-------------- 2 files changed, 49 insertions(+), 56 deletions(-) diff --git a/Tabula.Tests/PdfPigExtensionsTests.cs b/Tabula.Tests/PdfPigExtensionsTests.cs index b35703a..6580819 100644 --- a/Tabula.Tests/PdfPigExtensionsTests.cs +++ b/Tabula.Tests/PdfPigExtensionsTests.cs @@ -350,46 +350,43 @@ public void TestNaturalOrderOfRectangles() Assert.Equal("North Carolina State\rUniversity", cells[8].GetText()); //Third row - Assert.Equal("Social and ethical research and education in agrifood", cells[9].GetText()); - Assert.Equal("nanotechnology (NIRT)", cells[10].GetText()); - Assert.Equal("NSF", cells[11].GetText()); - Assert.Equal("Michigan State University", cells[12].GetText()); + Assert.Equal("Social and ethical research and education in agrifood\rnanotechnology (NIRT)", cells[9].GetText()); + Assert.Equal("NSF", cells[10].GetText()); + Assert.Equal("Michigan State University", cells[11].GetText()); //Fourth row - Assert.Equal("From laboratory to society: developing an informed", cells[13].GetText()); - Assert.Equal("approach to nanoscale science and engineering (NIRT)", cells[14].GetText()); - Assert.Equal("NSF", cells[15].GetText()); - Assert.Equal("University of South Carolina", cells[16].GetText()); + Assert.Equal("From laboratory to society: developing an informed\rapproach to nanoscale science and engineering (NIRT)", cells[12].GetText()); + Assert.Equal("NSF", cells[13].GetText()); + Assert.Equal("University of South Carolina", cells[14].GetText()); //Fifth row - Assert.Equal("Database and innovation timeline for nanotechnology", cells[17].GetText()); - Assert.Equal("NSF", cells[18].GetText()); - Assert.Equal("UCLA", cells[19].GetText()); + Assert.Equal("Database and innovation timeline for nanotechnology", cells[15].GetText()); + Assert.Equal("NSF", cells[16].GetText()); + Assert.Equal("UCLA", cells[17].GetText()); //Sixth row - Assert.Equal("Social and ethical dimensions of nanotechnology", cells[20].GetText()); - Assert.Equal("NSF", cells[21].GetText()); - Assert.Equal("University of Virginia", cells[22].GetText()); + Assert.Equal("Social and ethical dimensions of nanotechnology", cells[18].GetText()); + Assert.Equal("NSF", cells[19].GetText()); + Assert.Equal("University of Virginia", cells[20].GetText()); //Seventh row - Assert.Equal("Undergraduate exploration of nanoscience,", cells[23].GetText()); - Assert.Equal("applications and societal implications (NUE)", cells[24].GetText()); - Assert.Equal("NSF", cells[25].GetText()); - Assert.Equal("Michigan Technological\rUniversity", cells[26].GetText()); + Assert.Equal("Undergraduate exploration of nanoscience,\rapplications and societal implications (NUE)", cells[21].GetText()); + Assert.Equal("NSF", cells[22].GetText()); + Assert.Equal("Michigan Technological\rUniversity", cells[23].GetText()); //Eighth row - Assert.Equal("Ethics and belief inside the development of", cells[27].GetText()); - Assert.Equal("nanotechnology (CAREER)", cells[28].GetText()); - Assert.Equal("NSF", cells[29].GetText()); - Assert.Equal("University of Virginia", cells[30].GetText()); + Assert.Equal("Ethics and belief inside the development of\rnanotechnology (CAREER)", cells[24].GetText()); + //Assert.Equal("nanotechnology (CAREER)", cells[28].GetText()); + Assert.Equal("NSF", cells[25].GetText()); + Assert.Equal("University of Virginia", cells[26].GetText()); //Ninth row - Assert.Equal("All centers, NNIN and NCN have a societal", cells[31].GetText()); - Assert.Equal("NSF, DOE,", cells[32].GetText()); - Assert.Equal("All nanotechnology centers", cells[33].GetText()); - Assert.Equal("implications components", cells[34].GetText()); - Assert.Equal("DOD, and NIH", cells[35].GetText()); - Assert.Equal("and networks", cells[36].GetText()); + Assert.Equal("All centers, NNIN and NCN have a societal", cells[27].GetText()); + Assert.Equal("NSF, DOE,", cells[28].GetText()); + Assert.Equal("All nanotechnology centers", cells[29].GetText()); + Assert.Equal("implications components", cells[30].GetText()); + Assert.Equal("DOD, and NIH", cells[31].GetText()); + Assert.Equal("and networks", cells[32].GetText()); } } diff --git a/Tabula.Tests/TestBasicExtractor.cs b/Tabula.Tests/TestBasicExtractor.cs index 6026a31..9463dd6 100644 --- a/Tabula.Tests/TestBasicExtractor.cs +++ b/Tabula.Tests/TestBasicExtractor.cs @@ -314,46 +314,42 @@ public void TestNaturalOrderOfRectangles() Assert.Equal("North Carolina State\rUniversity", cells[8].GetText()); //Third row - Assert.Equal("Social and ethical research and education in agrifood", cells[9].GetText()); - Assert.Equal("nanotechnology (NIRT)", cells[10].GetText()); - Assert.Equal("NSF", cells[11].GetText()); - Assert.Equal("Michigan State University", cells[12].GetText()); + Assert.Equal("Social and ethical research and education in agrifood\rnanotechnology (NIRT)", cells[9].GetText()); + Assert.Equal("NSF", cells[10].GetText()); + Assert.Equal("Michigan State University", cells[11].GetText()); //Fourth row - Assert.Equal("From laboratory to society: developing an informed", cells[13].GetText()); - Assert.Equal("approach to nanoscale science and engineering (NIRT)", cells[14].GetText()); - Assert.Equal("NSF", cells[15].GetText()); - Assert.Equal("University of South Carolina", cells[16].GetText()); + Assert.Equal("From laboratory to society: developing an informed\rapproach to nanoscale science and engineering (NIRT)", cells[12].GetText()); + Assert.Equal("NSF", cells[13].GetText()); + Assert.Equal("University of South Carolina", cells[14].GetText()); //Fifth row - Assert.Equal("Database and innovation timeline for nanotechnology", cells[17].GetText()); - Assert.Equal("NSF", cells[18].GetText()); - Assert.Equal("UCLA", cells[19].GetText()); + Assert.Equal("Database and innovation timeline for nanotechnology", cells[15].GetText()); + Assert.Equal("NSF", cells[16].GetText()); + Assert.Equal("UCLA", cells[17].GetText()); //Sixth row - Assert.Equal("Social and ethical dimensions of nanotechnology", cells[20].GetText()); - Assert.Equal("NSF", cells[21].GetText()); - Assert.Equal("University of Virginia", cells[22].GetText()); + Assert.Equal("Social and ethical dimensions of nanotechnology", cells[18].GetText()); + Assert.Equal("NSF", cells[19].GetText()); + Assert.Equal("University of Virginia", cells[20].GetText()); //Seventh row - Assert.Equal("Undergraduate exploration of nanoscience,", cells[23].GetText()); - Assert.Equal("applications and societal implications (NUE)", cells[24].GetText()); - Assert.Equal("NSF", cells[25].GetText()); - Assert.Equal("Michigan Technological\rUniversity", cells[26].GetText()); + Assert.Equal("Undergraduate exploration of nanoscience,\rapplications and societal implications (NUE)", cells[21].GetText()); + Assert.Equal("NSF", cells[22].GetText()); + Assert.Equal("Michigan Technological\rUniversity", cells[23].GetText()); //Eighth row - Assert.Equal("Ethics and belief inside the development of", cells[27].GetText()); - Assert.Equal("nanotechnology (CAREER)", cells[28].GetText()); - Assert.Equal("NSF", cells[29].GetText()); - Assert.Equal("University of Virginia", cells[30].GetText()); + Assert.Equal("Ethics and belief inside the development of\rnanotechnology (CAREER)", cells[24].GetText()); + Assert.Equal("NSF", cells[25].GetText()); + Assert.Equal("University of Virginia", cells[26].GetText()); //Ninth row - Assert.Equal("All centers, NNIN and NCN have a societal", cells[31].GetText()); - Assert.Equal("NSF, DOE,", cells[32].GetText()); - Assert.Equal("All nanotechnology centers", cells[33].GetText()); - Assert.Equal("implications components", cells[34].GetText()); - Assert.Equal("DOD, and NIH", cells[35].GetText()); - Assert.Equal("and networks", cells[36].GetText()); + Assert.Equal("All centers, NNIN and NCN have a societal", cells[27].GetText()); + Assert.Equal("NSF, DOE,", cells[28].GetText()); + Assert.Equal("All nanotechnology centers", cells[29].GetText()); + Assert.Equal("implications components", cells[30].GetText()); + Assert.Equal("DOD, and NIH", cells[31].GetText()); + Assert.Equal("and networks", cells[32].GetText()); } [Fact] From aecc80118eddcc7bf3060859c97533454e1d595b Mon Sep 17 00:00:00 2001 From: BobLd <38405645+BobLd@users.noreply.github.com> Date: Sun, 6 Oct 2024 18:38:31 +0100 Subject: [PATCH 8/8] Bump version --- Tabula.Csv/Tabula.Csv.csproj | 2 +- Tabula.Json/Tabula.Json.csproj | 2 +- Tabula/Tabula.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Tabula.Csv/Tabula.Csv.csproj b/Tabula.Csv/Tabula.Csv.csproj index 1637398..19de791 100644 --- a/Tabula.Csv/Tabula.Csv.csproj +++ b/Tabula.Csv/Tabula.Csv.csproj @@ -4,7 +4,7 @@ netstandard2.0;net462;net471;net6.0;net8.0 Extract tables from PDF files (port of tabula-java using PdfPig). Csv and Tsv writers. https://github.com/BobLd/tabula-sharp - 0.1.4-alpha001 + 0.1.4 BobLd pdf, extract, table, tabula, pdfpig, parse, extraction, csv, tsv, excel, export MIT diff --git a/Tabula.Json/Tabula.Json.csproj b/Tabula.Json/Tabula.Json.csproj index 8b35abc..900ae85 100644 --- a/Tabula.Json/Tabula.Json.csproj +++ b/Tabula.Json/Tabula.Json.csproj @@ -4,7 +4,7 @@ netstandard2.0;net462;net471;net6.0;net8.0 Extract tables from PDF files (port of tabula-java using PdfPig). Json writer. https://github.com/BobLd/tabula-sharp - 0.1.4-alpha001 + 0.1.4 BobLd BobLd pdf, extract, table, tabula, pdfpig, parse, extraction, json, export diff --git a/Tabula/Tabula.csproj b/Tabula/Tabula.csproj index c6708b3..6b24b72 100644 --- a/Tabula/Tabula.csproj +++ b/Tabula/Tabula.csproj @@ -4,7 +4,7 @@ netstandard2.0;net462;net471;net6.0;net8.0 Extract tables from PDF files (port of tabula-java using PdfPig). https://github.com/BobLd/tabula-sharp - 0.1.4-alpha001 + 0.1.4 BobLd BobLd pdf, extract, table, tabula, pdfpig, parse, extraction, export