Merge branch '__rultor'

src/main/java/org/cactoos/text/TextOf.java

@@ -32,12 +32,20 @@
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Locale;
 import org.cactoos.Bytes;
 import org.cactoos.Input;
 import org.cactoos.Scalar;
 import org.cactoos.io.BytesOf;
 import org.cactoos.io.InputOf;
 import org.cactoos.iterable.Mapped;
+import org.cactoos.scalar.StickyScalar;
+import org.cactoos.time.Iso;
 
 /**
  * TextOf
@@ -341,6 +349,56 @@ public TextOf(final InputStream input) {
         this(new InputOf(new InputStreamReader(input, StandardCharsets.UTF_8)));
     }
 
+    /**
+     * Formats date using ISO date time format.
+     * @param date The date to format.
+     * @since 1.0
+     */
+    public TextOf(final LocalDate date) {
+        this(date, new Iso().value());
+    }
+
+    /**
+     * Formats date using provided date time format string using default locale.
+     * @param date The date to format.
+     * @param format The format to use.
+     * @since 1.0
+     */
+    public TextOf(final LocalDate date, final String format) {
+        this(date, format, Locale.getDefault(Locale.Category.FORMAT));
+    }
+
+    /**
+     * Formats the date using the provided format string using the provided
+     * locale.
+     * @param date The date to format.
+     * @param format The format string to use.
+     * @param locale The locale to use.
+     * @since 1.0
+     */
+    public TextOf(final LocalDate date, final String format,
+        final Locale locale) {
+        this(date, DateTimeFormatter.ofPattern(format, locale));
+    }
+
+    /**
+     * Formats the date using the provided formatter.
+     * @param date The date to format.
+     * @param formatter The formatter to use.
+     * @since 1.0
+     */
+    public TextOf(final LocalDate date, final DateTimeFormatter formatter) {
+        this(
+            new StickyScalar<>(
+                () -> formatter.format(
+                    ZonedDateTime.of(
+                        date, LocalTime.MIN, ZoneId.systemDefault()
+                    )
+                )
+            )
+        );
+    }
+
     /**
      * Ctor.
      *

src/main/java/org/cactoos/time/Iso.java

@@ -30,7 +30,7 @@
  * The formatter.
  * @since 0.27
  */
-final class Iso implements Scalar<DateTimeFormatter> {
+public final class Iso implements Scalar<DateTimeFormatter> {
 
     @Override
     public DateTimeFormatter value() {

src/main/java/org/cactoos/time/package-info.java

@@ -26,9 +26,10 @@
  * Time.
  *
  * @since 1.0
- * @todo #980:30min Classes from package {@link org.cactoos.time} which are
+ * @todo #1006:30min Classes from package {@link org.cactoos.time} which are
  *  ending with `AsText` are extending TextEnvelope. It means that they are
  *  instances of {@link org.cactoos.Text}. They should be merged with
  *  {@link org.cactoos.text.TextOf} as ctor(s).
+ *  Tests should be moved to TextOfTest.
  */
 package org.cactoos.time;

src/test/java/org/cactoos/text/TextOfTest.java

@@ -28,12 +28,19 @@
 import java.io.InputStream;
 import java.io.StringReader;
 import java.nio.charset.StandardCharsets;
+import java.text.MessageFormat;
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.time.ZoneId;
+import java.util.Locale;
 import org.cactoos.io.BytesOf;
 import org.cactoos.io.InputOf;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
+import org.hamcrest.core.IsNot;
 import org.junit.Test;
 import org.llorllale.cactoos.matchers.Assertion;
+import org.llorllale.cactoos.matchers.IsBlank;
 import org.llorllale.cactoos.matchers.TextHasString;
 import org.llorllale.cactoos.matchers.TextIs;
 
@@ -313,4 +320,51 @@ public void printsStackTraceFromArray() {
             new TextHasString("org.cactoos.text.TextOfTest")
         );
     }
+
+    @Test
+    public void readsLocalDateFormattedWithFormatString() {
+        final LocalDate date = LocalDate.of(2017, 12, 13);
+        new Assertion<>(
+            "Can't format a LocalDate with format.",
+            () -> new TextOf(date, "yyyy-MM-dd HH:mm:ss"),
+            new TextIs("2017-12-13 00:00:00")
+        ).affirm();
+    }
+
+    @Test
+    public void readsLocalDateFormattedWithFormatStringWithLocale() {
+        final LocalDate date = LocalDate.of(2017, 12, 13);
+        new Assertion<>(
+            "Can't format a LocalDate with format using locale.",
+            () -> new TextOf(
+                date, "yyyy MMM dd. HH.mm.ss", Locale.FRENCH
+            ),
+            new TextIs("2017 déc. 13. 00.00.00")
+        ).affirm();
+    }
+
+    @Test
+    public void readsLocalDateFormattedAsIsoDateTime() throws IOException {
+        final LocalDate date = LocalDate.of(2017, 12, 13);
+        new Assertion<>(
+            "Can't format a LocalDate with default/ISO format.",
+            () -> new TextOf(date),
+            new TextIs(
+                MessageFormat.format(
+                "2017-12-13T00:00:00{0}",
+                date.atTime(LocalTime.MIN).atZone(ZoneId.systemDefault())
+                    .getOffset().toString()
+                )
+            )
+        ).affirm();
+    }
+
+    @Test
+    public void readsCurrentLocalDateAsText() throws IOException {
+        new Assertion<>(
+            "Can't format a LocalDate with ISO format.",
+            () -> new TextOf(LocalDate.now()).asString(),
+            new IsNot<>(new IsBlank())
+        );
+    }
 }