From 5bd48a403162f157cfdaefb8ffce13f1eb123b33 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 14 Mar 2023 22:15:20 -0700 Subject: [PATCH 1/3] Renamed package from rife2 to rife --- lib/src/main/java/{rife2 => rife}/render/Capitalize.java | 2 +- lib/src/main/java/{rife2 => rife}/render/EncodeBase64.java | 2 +- lib/src/main/java/{rife2 => rife}/render/EncodeHtml.java | 2 +- .../main/java/{rife2 => rife}/render/EncodeHtmlEntities.java | 2 +- lib/src/main/java/{rife2 => rife}/render/EncodeJson.java | 2 +- lib/src/main/java/{rife2 => rife}/render/EncodeQp.java | 2 +- lib/src/main/java/{rife2 => rife}/render/EncodeUnicode.java | 2 +- lib/src/main/java/{rife2 => rife}/render/EncodeUrl.java | 2 +- lib/src/main/java/{rife2 => rife}/render/EncodeXml.java | 2 +- lib/src/main/java/{rife2 => rife}/render/Lowercase.java | 2 +- lib/src/main/java/{rife2 => rife}/render/Rot13.java | 2 +- lib/src/main/java/{rife2 => rife}/render/SwapCase.java | 2 +- lib/src/main/java/{rife2 => rife}/render/Trim.java | 2 +- lib/src/main/java/{rife2 => rife}/render/Uncapitalize.java | 2 +- lib/src/main/java/{rife2 => rife}/render/Uppercase.java | 2 +- lib/src/main/java/{rife2 => rife}/render/Year.java | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) rename lib/src/main/java/{rife2 => rife}/render/Capitalize.java (98%) rename lib/src/main/java/{rife2 => rife}/render/EncodeBase64.java (98%) rename lib/src/main/java/{rife2 => rife}/render/EncodeHtml.java (98%) rename lib/src/main/java/{rife2 => rife}/render/EncodeHtmlEntities.java (98%) rename lib/src/main/java/{rife2 => rife}/render/EncodeJson.java (98%) rename lib/src/main/java/{rife2 => rife}/render/EncodeQp.java (99%) rename lib/src/main/java/{rife2 => rife}/render/EncodeUnicode.java (98%) rename lib/src/main/java/{rife2 => rife}/render/EncodeUrl.java (98%) rename lib/src/main/java/{rife2 => rife}/render/EncodeXml.java (98%) rename lib/src/main/java/{rife2 => rife}/render/Lowercase.java (98%) rename lib/src/main/java/{rife2 => rife}/render/Rot13.java (99%) rename lib/src/main/java/{rife2 => rife}/render/SwapCase.java (99%) rename lib/src/main/java/{rife2 => rife}/render/Trim.java (98%) rename lib/src/main/java/{rife2 => rife}/render/Uncapitalize.java (98%) rename lib/src/main/java/{rife2 => rife}/render/Uppercase.java (98%) rename lib/src/main/java/{rife2 => rife}/render/Year.java (98%) diff --git a/lib/src/main/java/rife2/render/Capitalize.java b/lib/src/main/java/rife/render/Capitalize.java similarity index 98% rename from lib/src/main/java/rife2/render/Capitalize.java rename to lib/src/main/java/rife/render/Capitalize.java index 71f007e..a2e838f 100644 --- a/lib/src/main/java/rife2/render/Capitalize.java +++ b/lib/src/main/java/rife/render/Capitalize.java @@ -15,7 +15,7 @@ * */ -package rife2.render; +package rife.render; import rife.template.Template; import rife.template.ValueRenderer; diff --git a/lib/src/main/java/rife2/render/EncodeBase64.java b/lib/src/main/java/rife/render/EncodeBase64.java similarity index 98% rename from lib/src/main/java/rife2/render/EncodeBase64.java rename to lib/src/main/java/rife/render/EncodeBase64.java index b47fbc8..4b495fd 100644 --- a/lib/src/main/java/rife2/render/EncodeBase64.java +++ b/lib/src/main/java/rife/render/EncodeBase64.java @@ -15,7 +15,7 @@ * */ -package rife2.render; +package rife.render; import rife.template.Template; import rife.template.ValueRenderer; diff --git a/lib/src/main/java/rife2/render/EncodeHtml.java b/lib/src/main/java/rife/render/EncodeHtml.java similarity index 98% rename from lib/src/main/java/rife2/render/EncodeHtml.java rename to lib/src/main/java/rife/render/EncodeHtml.java index 90b0bb8..1194c45 100644 --- a/lib/src/main/java/rife2/render/EncodeHtml.java +++ b/lib/src/main/java/rife/render/EncodeHtml.java @@ -15,7 +15,7 @@ * */ -package rife2.render; +package rife.render; import rife.template.Template; import rife.template.ValueRenderer; diff --git a/lib/src/main/java/rife2/render/EncodeHtmlEntities.java b/lib/src/main/java/rife/render/EncodeHtmlEntities.java similarity index 98% rename from lib/src/main/java/rife2/render/EncodeHtmlEntities.java rename to lib/src/main/java/rife/render/EncodeHtmlEntities.java index 459c3b0..42fad25 100644 --- a/lib/src/main/java/rife2/render/EncodeHtmlEntities.java +++ b/lib/src/main/java/rife/render/EncodeHtmlEntities.java @@ -15,7 +15,7 @@ * */ -package rife2.render; +package rife.render; import rife.template.Template; import rife.template.ValueRenderer; diff --git a/lib/src/main/java/rife2/render/EncodeJson.java b/lib/src/main/java/rife/render/EncodeJson.java similarity index 98% rename from lib/src/main/java/rife2/render/EncodeJson.java rename to lib/src/main/java/rife/render/EncodeJson.java index 1820d0f..e9eed9c 100644 --- a/lib/src/main/java/rife2/render/EncodeJson.java +++ b/lib/src/main/java/rife/render/EncodeJson.java @@ -15,7 +15,7 @@ * */ -package rife2.render; +package rife.render; import rife.template.Template; import rife.template.ValueRenderer; diff --git a/lib/src/main/java/rife2/render/EncodeQp.java b/lib/src/main/java/rife/render/EncodeQp.java similarity index 99% rename from lib/src/main/java/rife2/render/EncodeQp.java rename to lib/src/main/java/rife/render/EncodeQp.java index 70241db..ccff9a2 100644 --- a/lib/src/main/java/rife2/render/EncodeQp.java +++ b/lib/src/main/java/rife/render/EncodeQp.java @@ -15,7 +15,7 @@ * */ -package rife2.render; +package rife.render; import rife.template.Template; import rife.template.ValueRenderer; diff --git a/lib/src/main/java/rife2/render/EncodeUnicode.java b/lib/src/main/java/rife/render/EncodeUnicode.java similarity index 98% rename from lib/src/main/java/rife2/render/EncodeUnicode.java rename to lib/src/main/java/rife/render/EncodeUnicode.java index 2b08365..938b580 100644 --- a/lib/src/main/java/rife2/render/EncodeUnicode.java +++ b/lib/src/main/java/rife/render/EncodeUnicode.java @@ -15,7 +15,7 @@ * */ -package rife2.render; +package rife.render; import rife.template.Template; import rife.template.ValueRenderer; diff --git a/lib/src/main/java/rife2/render/EncodeUrl.java b/lib/src/main/java/rife/render/EncodeUrl.java similarity index 98% rename from lib/src/main/java/rife2/render/EncodeUrl.java rename to lib/src/main/java/rife/render/EncodeUrl.java index 0eb0f0b..05e3f85 100644 --- a/lib/src/main/java/rife2/render/EncodeUrl.java +++ b/lib/src/main/java/rife/render/EncodeUrl.java @@ -15,7 +15,7 @@ * */ -package rife2.render; +package rife.render; import rife.template.Template; import rife.template.ValueRenderer; diff --git a/lib/src/main/java/rife2/render/EncodeXml.java b/lib/src/main/java/rife/render/EncodeXml.java similarity index 98% rename from lib/src/main/java/rife2/render/EncodeXml.java rename to lib/src/main/java/rife/render/EncodeXml.java index 51d4802..7e1dd48 100644 --- a/lib/src/main/java/rife2/render/EncodeXml.java +++ b/lib/src/main/java/rife/render/EncodeXml.java @@ -15,7 +15,7 @@ * */ -package rife2.render; +package rife.render; import rife.template.Template; import rife.template.ValueRenderer; diff --git a/lib/src/main/java/rife2/render/Lowercase.java b/lib/src/main/java/rife/render/Lowercase.java similarity index 98% rename from lib/src/main/java/rife2/render/Lowercase.java rename to lib/src/main/java/rife/render/Lowercase.java index f98a268..b4de6bd 100644 --- a/lib/src/main/java/rife2/render/Lowercase.java +++ b/lib/src/main/java/rife/render/Lowercase.java @@ -15,7 +15,7 @@ * */ -package rife2.render; +package rife.render; import rife.template.Template; import rife.template.ValueRenderer; diff --git a/lib/src/main/java/rife2/render/Rot13.java b/lib/src/main/java/rife/render/Rot13.java similarity index 99% rename from lib/src/main/java/rife2/render/Rot13.java rename to lib/src/main/java/rife/render/Rot13.java index cad83e4..e7ce2b9 100644 --- a/lib/src/main/java/rife2/render/Rot13.java +++ b/lib/src/main/java/rife/render/Rot13.java @@ -15,7 +15,7 @@ * */ -package rife2.render; +package rife.render; import rife.template.Template; import rife.template.ValueRenderer; diff --git a/lib/src/main/java/rife2/render/SwapCase.java b/lib/src/main/java/rife/render/SwapCase.java similarity index 99% rename from lib/src/main/java/rife2/render/SwapCase.java rename to lib/src/main/java/rife/render/SwapCase.java index 3759a02..943e98d 100644 --- a/lib/src/main/java/rife2/render/SwapCase.java +++ b/lib/src/main/java/rife/render/SwapCase.java @@ -15,7 +15,7 @@ * */ -package rife2.render; +package rife.render; import rife.template.Template; import rife.template.ValueRenderer; diff --git a/lib/src/main/java/rife2/render/Trim.java b/lib/src/main/java/rife/render/Trim.java similarity index 98% rename from lib/src/main/java/rife2/render/Trim.java rename to lib/src/main/java/rife/render/Trim.java index b2738b2..985b102 100644 --- a/lib/src/main/java/rife2/render/Trim.java +++ b/lib/src/main/java/rife/render/Trim.java @@ -15,7 +15,7 @@ * */ -package rife2.render; +package rife.render; import rife.template.Template; import rife.template.ValueRenderer; diff --git a/lib/src/main/java/rife2/render/Uncapitalize.java b/lib/src/main/java/rife/render/Uncapitalize.java similarity index 98% rename from lib/src/main/java/rife2/render/Uncapitalize.java rename to lib/src/main/java/rife/render/Uncapitalize.java index 9428299..45682fb 100644 --- a/lib/src/main/java/rife2/render/Uncapitalize.java +++ b/lib/src/main/java/rife/render/Uncapitalize.java @@ -15,7 +15,7 @@ * */ -package rife2.render; +package rife.render; import rife.template.Template; import rife.template.ValueRenderer; diff --git a/lib/src/main/java/rife2/render/Uppercase.java b/lib/src/main/java/rife/render/Uppercase.java similarity index 98% rename from lib/src/main/java/rife2/render/Uppercase.java rename to lib/src/main/java/rife/render/Uppercase.java index 839bb1e..7101db7 100644 --- a/lib/src/main/java/rife2/render/Uppercase.java +++ b/lib/src/main/java/rife/render/Uppercase.java @@ -15,7 +15,7 @@ * */ -package rife2.render; +package rife.render; import rife.template.Template; import rife.template.ValueRenderer; diff --git a/lib/src/main/java/rife2/render/Year.java b/lib/src/main/java/rife/render/Year.java similarity index 98% rename from lib/src/main/java/rife2/render/Year.java rename to lib/src/main/java/rife/render/Year.java index d37cd31..adc21ca 100644 --- a/lib/src/main/java/rife2/render/Year.java +++ b/lib/src/main/java/rife/render/Year.java @@ -15,7 +15,7 @@ * */ -package rife2.render; +package rife.render; import rife.template.Template; import rife.template.ValueRenderer; From b92b01a6cc4f60266ea7bc19a21f52ae1eb8d506 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Wed, 15 Mar 2023 02:08:27 -0700 Subject: [PATCH 2/3] Added DateIso, DateTimeIso, DateTimeRfc2822 and TimeIso --- README.md | 8 +++ lib/src/main/java/rife/render/DateIso.java | 56 +++++++++++++++++++ .../main/java/rife/render/DateTimeIso.java | 54 ++++++++++++++++++ .../java/rife/render/DateTimeRfc2822.java | 54 ++++++++++++++++++ lib/src/main/java/rife/render/TimeIso.java | 54 ++++++++++++++++++ 5 files changed, 226 insertions(+) create mode 100644 lib/src/main/java/rife/render/DateIso.java create mode 100644 lib/src/main/java/rife/render/DateTimeIso.java create mode 100644 lib/src/main/java/rife/render/DateTimeRfc2822.java create mode 100644 lib/src/main/java/rife/render/TimeIso.java diff --git a/README.md b/README.md index c2ace52..574d51d 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,12 @@ This project provides a set of template renderers. - **rife.render.Capitalize** - Capitalizes a template value. +- **rife.render.DateIso** + - Renders the current date in ISO 8061 format. +- **rife.render.DateTimeIso** + - Renders the current date and time in ISO 8061 format. +- **rife.render.DateTimeRfc2822** + - Renders the current date and time in RFC 2822 format. - **rife.render.EncodeBase64** - Encodes a template value to Base64. - **rife.render.EncodeHtml** @@ -29,6 +35,8 @@ This project provides a set of template renderers. - Translates a template value to/from ROT13. - **rife.render.SwapCase** - Swap case of a template value. +- **rife.render.TimeIso** + - Renders the current time in ISO 8061 format. - **rife.render.Trim** - Removes leading and trailing whitespace from a template value. - **rife.render.Uncapitalize** diff --git a/lib/src/main/java/rife/render/DateIso.java b/lib/src/main/java/rife/render/DateIso.java new file mode 100644 index 0000000..c32cccb --- /dev/null +++ b/lib/src/main/java/rife/render/DateIso.java @@ -0,0 +1,56 @@ +/* + * Copyright 2023 the original author or authors. + * + * Licensed 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 + * + * https://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. + * + */ + +package rife.render; + +import rife.template.Template; +import rife.template.ValueRenderer; +import rife.tools.Localization; + +import java.text.DateFormat; +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; + +/** + *

Return the current date in ISO 8601 format.

+ * + *

Usage:

+ * + * 
+ *   <!--v render:rife.render.DateIso/-->
+ *   {{v render:rife.render.DateIso}}
+ *
+ * + * @author Erik C. Thauvin + * @since 1.0 + */ +public class DateIso implements ValueRenderer { + /** + * ISO 8601 date and time formatter. + */ + static public final DateTimeFormatter iso8601Formatter = + DateTimeFormatter.ofPattern("yyyy-MM-dd").withLocale(Localization.getLocale()); + + + /** + * {@inheritDoc} + */ + @Override + public String render(Template template, String valueId, String differentiator) { + return ZonedDateTime.now().format(iso8601Formatter); + } +} diff --git a/lib/src/main/java/rife/render/DateTimeIso.java b/lib/src/main/java/rife/render/DateTimeIso.java new file mode 100644 index 0000000..23dbb45 --- /dev/null +++ b/lib/src/main/java/rife/render/DateTimeIso.java @@ -0,0 +1,54 @@ +/* + * Copyright 2023 the original author or authors. + * + * Licensed 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 + * + * https://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. + * + */ + +package rife.render; + +import rife.template.Template; +import rife.template.ValueRenderer; +import rife.tools.Localization; + +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; + +/** + *

Return the current date and time in ISO 8601 format.

+ * + *

Usage:

+ * + * 
+ *   <!--v render:rife.render.DateTimeIso/-->
+ *   {{v render:rife.render.DateTimeIso}}
+ *
+ * + * @author Erik C. Thauvin + * @since 1.0 + */ +public class DateTimeIso implements ValueRenderer { + /** + * ISO 8601 date and time formatter. + */ + static public final DateTimeFormatter iso8601Formatter = + DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssXXXXX").withLocale(Localization.getLocale()); + + /** + * {@inheritDoc} + */ + @Override + public String render(Template template, String valueId, String differentiator) { + return ZonedDateTime.now().format(iso8601Formatter); + } +} diff --git a/lib/src/main/java/rife/render/DateTimeRfc2822.java b/lib/src/main/java/rife/render/DateTimeRfc2822.java new file mode 100644 index 0000000..551828f --- /dev/null +++ b/lib/src/main/java/rife/render/DateTimeRfc2822.java @@ -0,0 +1,54 @@ +/* + * Copyright 2023 the original author or authors. + * + * Licensed 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 + * + * https://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. + * + */ + +package rife.render; + +import rife.template.Template; +import rife.template.ValueRenderer; +import rife.tools.Localization; + +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; + +/** + *

Return the current date and time in RFC 2822 format.

+ * + *

Usage:

+ * + * 
+ *   <!--v render:rife.render.DateTimeRfc2822/-->
+ *   {{v render:rife.render.DateTimeRfc2822}}
+ *
+ * + * @author Erik C. Thauvin + * @since 1.0 + */ +public class DateTimeRfc2822 implements ValueRenderer { + /** + * RFC 2822 date and time formatter. + */ + static public final DateTimeFormatter rfc2822Formatter = + DateTimeFormatter.ofPattern("EEE, d MMM yyyy HH:mm:ss zzz").withLocale(Localization.getLocale()); + + /** + * {@inheritDoc} + */ + @Override + public String render(Template template, String valueId, String differentiator) { + return ZonedDateTime.now().format(rfc2822Formatter); + } +} diff --git a/lib/src/main/java/rife/render/TimeIso.java b/lib/src/main/java/rife/render/TimeIso.java new file mode 100644 index 0000000..191cfc9 --- /dev/null +++ b/lib/src/main/java/rife/render/TimeIso.java @@ -0,0 +1,54 @@ +/* + * Copyright 2023 the original author or authors. + * + * Licensed 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 + * + * https://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. + * + */ + +package rife.render; + +import rife.template.Template; +import rife.template.ValueRenderer; +import rife.tools.Localization; + +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; + +/** + *

Return the current time in ISO 8601 format.

+ * + *

Usage:

+ * + * 
+ *   <!--v render:rife.render.TimeIso/-->
+ *   {{v render:rife.render.TimeIso}}
+ *
+ * + * @author Erik C. Thauvin + * @since 1.0 + */ +public class TimeIso implements ValueRenderer { + /** + * ISO 8601 time formatter. + */ + static public final DateTimeFormatter iso8601Formatter = + DateTimeFormatter.ofPattern("HH:mm:ss").withLocale(Localization.getLocale()); + + /** + * {@inheritDoc} + */ + @Override + public String render(Template template, String valueId, String differentiator) { + return ZonedDateTime.now().format(iso8601Formatter); + } +} From 76256f74683b3957ea7a5590b1822ba3508b8b57 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Wed, 15 Mar 2023 02:09:34 -0700 Subject: [PATCH 3/3] Added some tests --- .idea/misc.xml | 27 +++++++++ lib/build.gradle.kts | 1 + lib/src/main/java/rife/render/DateIso.java | 1 - lib/src/main/java/rife/render/SwapCase.java | 1 + .../test/java/rife/render/TestDateTime.java | 57 +++++++++++++++++++ lib/src/test/java/rife/render/TestEncode.java | 34 +++++++++++ lib/src/test/java/rife/render/ValueBean.java | 34 +++++++++++ lib/src/test/resources/templates/dateIso.html | 1 + .../test/resources/templates/dateTimeIso.html | 1 + .../resources/templates/dateTimeRfc2822.html | 1 + .../test/resources/templates/encodeUrl.html | 2 + lib/src/test/resources/templates/timeIso.html | 1 + lib/src/test/resources/templates/year.html | 2 + 13 files changed, 162 insertions(+), 1 deletion(-) create mode 100644 lib/src/test/java/rife/render/TestDateTime.java create mode 100644 lib/src/test/java/rife/render/TestEncode.java create mode 100644 lib/src/test/java/rife/render/ValueBean.java create mode 100644 lib/src/test/resources/templates/dateIso.html create mode 100644 lib/src/test/resources/templates/dateTimeIso.html create mode 100644 lib/src/test/resources/templates/dateTimeRfc2822.html create mode 100644 lib/src/test/resources/templates/encodeUrl.html create mode 100644 lib/src/test/resources/templates/timeIso.html create mode 100644 lib/src/test/resources/templates/year.html diff --git a/.idea/misc.xml b/.idea/misc.xml index 1eb8d79..2d17eca 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -17,6 +17,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts index 3f2e9ce..2bd34c1 100644 --- a/lib/build.gradle.kts +++ b/lib/build.gradle.kts @@ -25,6 +25,7 @@ dependencies { testImplementation(platform("org.junit:junit-bom:5.9.2")) testImplementation("org.junit.jupiter:junit-jupiter") + testImplementation("org.assertj:assertj-core:3.24.2") } configurations { diff --git a/lib/src/main/java/rife/render/DateIso.java b/lib/src/main/java/rife/render/DateIso.java index c32cccb..d5565d4 100644 --- a/lib/src/main/java/rife/render/DateIso.java +++ b/lib/src/main/java/rife/render/DateIso.java @@ -21,7 +21,6 @@ import rife.template.Template; import rife.template.ValueRenderer; import rife.tools.Localization; -import java.text.DateFormat; import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; diff --git a/lib/src/main/java/rife/render/SwapCase.java b/lib/src/main/java/rife/render/SwapCase.java index 943e98d..f534915 100644 --- a/lib/src/main/java/rife/render/SwapCase.java +++ b/lib/src/main/java/rife/render/SwapCase.java @@ -40,6 +40,7 @@ public class SwapCase implements ValueRenderer { * @param src the String to swap the case of * @return the modified String or null */ + @SuppressWarnings("PMD.AvoidReassigningLoopVariables") public static String swapCase(final String src) { if (src == null || src.isEmpty()) { return src; diff --git a/lib/src/test/java/rife/render/TestDateTime.java b/lib/src/test/java/rife/render/TestDateTime.java new file mode 100644 index 0000000..6d7e538 --- /dev/null +++ b/lib/src/test/java/rife/render/TestDateTime.java @@ -0,0 +1,57 @@ +/* + * Copyright 2023 the original author or authors. + * + * Licensed 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 + * + * https://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. + * + */ + +package rife.render; + +import org.junit.jupiter.api.Test; +import rife.template.TemplateFactory; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatCode; + +class TestDateTime { + @Test + void testDateIso() { + var t = TemplateFactory.HTML.get("dateIso"); + assertThatCode(() -> DateIso.iso8601Formatter.parse(t.getContent())).doesNotThrowAnyException(); + } + + @Test + void testDateTimeIso() { + var t = TemplateFactory.HTML.get("dateTimeIso"); + assertThatCode(() -> DateTimeIso.iso8601Formatter.parse(t.getContent())).doesNotThrowAnyException(); + } + + @Test + void testDateTimeRfc2822() { + var t = TemplateFactory.HTML.get("dateTimeRfc2822"); + assertThatCode(() -> DateTimeRfc2822.rfc2822Formatter.parse(t.getContent())).doesNotThrowAnyException(); + } + + @Test + void testTimeIso() { + var t = TemplateFactory.HTML.get("timeIso"); + assertThatCode(() -> TimeIso.iso8601Formatter.parse(t.getContent())).doesNotThrowAnyException(); + } + + @Test + void testYear() { + var t = TemplateFactory.HTML.get("year"); + var year = java.time.Year.now().toString(); + assertThat(t.getContent()).isEqualTo(year + "
\n" + year); + } +} diff --git a/lib/src/test/java/rife/render/TestEncode.java b/lib/src/test/java/rife/render/TestEncode.java new file mode 100644 index 0000000..edff752 --- /dev/null +++ b/lib/src/test/java/rife/render/TestEncode.java @@ -0,0 +1,34 @@ +/* + * Copyright 2023 the original author or authors. + * + * Licensed 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 + * + * https://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. + * + */ + +package rife.render; + +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import rife.template.TemplateFactory; + +import static org.assertj.core.api.Assertions.assertThat; +class TestEncode { + @Disabled("Until renderer can access beans") + @Test + void testEncodeUrl() { + var t = TemplateFactory.HTML.get("encodeUrl"); + t.setBean(new ValueBean("a test &")); + var encodedValue = "a%20test%20%26"; + assertThat(t.getContent()).isEqualTo(encodedValue + "
\n" + encodedValue); + } +} diff --git a/lib/src/test/java/rife/render/ValueBean.java b/lib/src/test/java/rife/render/ValueBean.java new file mode 100644 index 0000000..6bf98fc --- /dev/null +++ b/lib/src/test/java/rife/render/ValueBean.java @@ -0,0 +1,34 @@ +/* + * Copyright 2023 the original author or authors. + * + * Licensed 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 + * + * https://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. + * + */ + +package rife.render; + +public class ValueBean { + private String value; + + ValueBean(String value) { + this.value = value; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +} diff --git a/lib/src/test/resources/templates/dateIso.html b/lib/src/test/resources/templates/dateIso.html new file mode 100644 index 0000000..754a329 --- /dev/null +++ b/lib/src/test/resources/templates/dateIso.html @@ -0,0 +1 @@ +{{v render:rife.render.DateIso/}} \ No newline at end of file diff --git a/lib/src/test/resources/templates/dateTimeIso.html b/lib/src/test/resources/templates/dateTimeIso.html new file mode 100644 index 0000000..b4f05a1 --- /dev/null +++ b/lib/src/test/resources/templates/dateTimeIso.html @@ -0,0 +1 @@ +{{v render:rife.render.DateTimeIso/}} \ No newline at end of file diff --git a/lib/src/test/resources/templates/dateTimeRfc2822.html b/lib/src/test/resources/templates/dateTimeRfc2822.html new file mode 100644 index 0000000..c2ec0de --- /dev/null +++ b/lib/src/test/resources/templates/dateTimeRfc2822.html @@ -0,0 +1 @@ +{{v render:rife.render.DateTimeRfc2822/}} \ No newline at end of file diff --git a/lib/src/test/resources/templates/encodeUrl.html b/lib/src/test/resources/templates/encodeUrl.html new file mode 100644 index 0000000..9203592 --- /dev/null +++ b/lib/src/test/resources/templates/encodeUrl.html @@ -0,0 +1,2 @@ +}
+{{v render:rife.render.EncodeUrl:value/}} \ No newline at end of file diff --git a/lib/src/test/resources/templates/timeIso.html b/lib/src/test/resources/templates/timeIso.html new file mode 100644 index 0000000..08c13b5 --- /dev/null +++ b/lib/src/test/resources/templates/timeIso.html @@ -0,0 +1 @@ +{{v render:rife.render.TimeIso/}} \ No newline at end of file diff --git a/lib/src/test/resources/templates/year.html b/lib/src/test/resources/templates/year.html new file mode 100644 index 0000000..15637e5 --- /dev/null +++ b/lib/src/test/resources/templates/year.html @@ -0,0 +1,2 @@ +
+{{v render:rife.render.Year/}} \ No newline at end of file