You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by sg...@apache.org on 2021/10/05 19:27:46 UTC
[freemarker-generator] 01/02: FREEMARKER-195 [freemarker-generator]
Cleanup code and examples
This is an automated email from the ASF dual-hosted git repository.
sgoeschl pushed a commit to branch FREEMARKER-195
in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git
commit d9d9ed21b05de3a2a3a70805249c51e928147328
Author: Siegfried Goeschl <si...@gmail.com>
AuthorDate: Tue Oct 5 16:53:34 2021 +0200
FREEMARKER-195 [freemarker-generator] Cleanup code and examples
---
.../src/app/examples/templates/datasources.ftl | 1 -
.../src/app/scripts/run-examples.bat | 3 ++
.../src/app/scripts/run-examples.sh | 3 ++
.../csv/confluence/transform.ftl | 40 ++++++++++++++++++++++
.../freemarker/generator/cli/ExamplesTest.java | 1 +
5 files changed, 47 insertions(+), 1 deletion(-)
diff --git a/freemarker-generator-cli/src/app/examples/templates/datasources.ftl b/freemarker-generator-cli/src/app/examples/templates/datasources.ftl
index 866ba3a..2b0a8f8 100644
--- a/freemarker-generator-cli/src/app/examples/templates/datasources.ftl
+++ b/freemarker-generator-cli/src/app/examples/templates/datasources.ftl
@@ -85,7 +85,6 @@ DataSources.find("*"): ${dataSources?api.find("*")?size}
DataSources.find("uri", "*.md"): ${dataSources?api.find("uri", "*.md")?size}
DataSources.find("extension", "md"): ${dataSources?api.find("extension", "md")?size}
-
<#if dataSources?has_content>
<#list dataSources as dataSource>
[#${dataSource?counter}] - ${dataSource.name}
diff --git a/freemarker-generator-cli/src/app/scripts/run-examples.bat b/freemarker-generator-cli/src/app/scripts/run-examples.bat
index 2b6211b..551b5c1 100644
--- a/freemarker-generator-cli/src/app/scripts/run-examples.bat
+++ b/freemarker-generator-cli/src/app/scripts/run-examples.bat
@@ -62,6 +62,9 @@ REM =========================================================================
REM CSV
REM =========================================================================
+echo "templates\freemarker-generator\csv\confluence\transform.ftl"
+%FREEMARKER_CMD% -t freemarker-generator\csv\confluence\transform.ftl examples\data\csv\contract.csv > target\out\contract.txt
+
echo "templates\freemarker-generator\csv\html\transform.ftl"
%FREEMARKER_CMD% -t freemarker-generator\csv\html\transform.ftl examples\data\csv\contract.csv > target\out\contract.html
diff --git a/freemarker-generator-cli/src/app/scripts/run-examples.sh b/freemarker-generator-cli/src/app/scripts/run-examples.sh
index 63302fd..979f0b1 100755
--- a/freemarker-generator-cli/src/app/scripts/run-examples.sh
+++ b/freemarker-generator-cli/src/app/scripts/run-examples.sh
@@ -67,6 +67,9 @@ $FREEMARKER_CMD -i '${tools.dataframe.print(tools.dataframe.fromMaps(tools.gson.
# CSV
#############################################################################
+echo "templates/freemarker-generator/csv/confluence/transform.ftl"
+$FREEMARKER_CMD -t freemarker-generator/csv/confluence/transform.ftl examples/data/csv/contract.csv > target/out/contract.txt || { echo >&2 "Test failed. Aborting."; exit 1; }
+
echo "templates/freemarker-generator/csv/html/transform.ftl"
$FREEMARKER_CMD -t freemarker-generator/csv/html/transform.ftl examples/data/csv/contract.csv > target/out/contract.html || { echo >&2 "Test failed. Aborting."; exit 1; }
diff --git a/freemarker-generator-cli/src/app/templates/freemarker-generator/csv/confluence/transform.ftl b/freemarker-generator-cli/src/app/templates/freemarker-generator/csv/confluence/transform.ftl
new file mode 100644
index 0000000..35857db
--- /dev/null
+++ b/freemarker-generator-cli/src/app/templates/freemarker-generator/csv/confluence/transform.ftl
@@ -0,0 +1,40 @@
+<#--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<#import "/freemarker-generator/lib/commons-csv.ftl" as csv />
+<#assign dataSource = dataSources[0]>
+<#assign csvParser = tools.csv.parse(dataSource, csv.sourceFormat())>
+<#assign headers = (csvParser.getHeaderMap()!{})?keys>
+<#assign records = csvParser.records>
+<#--------------------------------------------------------------------------->
+<#compress>
+ <@writeHeaders headers/>
+ <@writeColums records/>
+</#compress>
+<#--------------------------------------------------------------------------->
+<#macro writeHeaders headers>
+ <#if headers?has_content>
+ || ${headers?join(" || ", "")} ||
+ </#if>
+</#macro>
+<#--------------------------------------------------------------------------->
+<#macro writeColums columns>
+ <#if columns?has_content>
+ <#list columns as column>
+ | ${column.iterator()?join(" | ", "")} |
+ </#list>
+ </#if>
+</#macro>
\ No newline at end of file
diff --git a/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/ExamplesTest.java b/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/ExamplesTest.java
index d8eb993..0aa2399 100644
--- a/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/ExamplesTest.java
+++ b/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/ExamplesTest.java
@@ -55,6 +55,7 @@ public class ExamplesTest extends AbstractMainTest {
@Test
public void shouldRunCsvExamples() throws IOException {
+ assertValid(execute("-t freemarker-generator/csv/confluence/transform.ftl src/app/examples/data/csv/contract.csv"));
assertValid(execute("-t freemarker-generator/csv/html/transform.ftl src/app/examples/data/csv/contract.csv"));
assertValid(execute("-t freemarker-generator/csv/md/transform.ftl src/app/examples/data/csv/contract.csv"));
assertValid(execute("-t src/app/examples/templates/csv/shell/curl.ftl src/app/examples/data/csv/user.csv"));