(yegor256#1460) Introduce Flattened and use it where relevant

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

@@ -24,6 +24,8 @@
 package org.cactoos.text;
 
 import org.cactoos.Text;
+import org.cactoos.scalar.ScalarOf;
+import org.cactoos.scalar.Ternary;
 
 /**
  * Abbreviates a Text using ellipses.
@@ -80,32 +82,24 @@ public Abbreviated(final String text, final int max) {
      * Ctor.
      * @param text The Text
      * @param max Max width of the result string
-     * @todo #1287:30min Introduce `text.Flatten` that takes a `Scalar` of `Text`
-     *  and call `value()` then `asString()` on it. Add some tests for it (including
-     *  for `equals`). Then replace the code below by a composition of `text.Flatten`
-     *  and `scalar.Ternary`. Then do the same for `PrefixOf` and `SuffixOf` using
-     *  `text.Sub`.
      */
     public Abbreviated(final Text text, final int max) {
         super(
-            new TextOf(
-                () -> {
-                    final Text abbreviated;
-                    if (text.asString().length() <= max) {
-                        abbreviated = text;
-                    } else {
-                        abbreviated = new FormattedText(
-                            "%s%s",
-                            new Sub(
-                                text,
-                                0,
-                                max - Abbreviated.ELLIPSES.length()
-                            ).asString(),
-                            Abbreviated.ELLIPSES
-                        );
-                    }
-                    return abbreviated.asString();
-                }
+            new Flattened(
+                new Ternary<>(
+                    new ScalarOf<>(() -> new Sticky(text)),
+                    (Text t) -> t.asString().length() <= max,
+                    t -> t,
+                    t -> new FormattedText(
+                        "%s%s",
+                        new Sub(
+                            t,
+                            0,
+                            max - Abbreviated.ELLIPSES.length()
+                        ),
+                        Abbreviated.ELLIPSES
+                    )
+                )
             )
         );
     }

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

@@ -24,6 +24,7 @@
 package org.cactoos.text;
 
 import org.cactoos.Text;
+import org.cactoos.scalar.ScalarOf;
 import org.cactoos.scalar.Ternary;
 
 /**
@@ -32,6 +33,7 @@
  * no other characters are changed.
  *
  * @since 0.46
+ * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
  */
 public final class Capitalized extends TextEnvelope {
 
@@ -50,23 +52,24 @@ public Capitalized(final String text) {
      */
     public Capitalized(final Text text) {
         super(
-            new TextOf(
-                () -> {
-                    return new Ternary<Text>(
-                        new IsBlank(text),
-                        () -> text,
-                        () -> new Joined(
-                            "",
-                            new TextOf(
-                                Character.toChars(
-                                    Character.toTitleCase(
-                                        text.asString().codePointAt(0)
-                                    )
+            new Flattened(
+                new Ternary<>(
+                    new ScalarOf<>(() -> new Sticky(text)),
+                    (Text t) -> new IsBlank(t).value(),
+                    t -> t,
+                    t -> new Joined(
+                        "",
+                        new TextOf(
+                            Character.toChars(
+                                Character.toTitleCase(
+                                    t.asString().codePointAt(0)
                                 )
-                            ),
-                            new Sub(text, 1)
                             )
-                    ).value().asString();
-                }));
+                        ),
+                        new Sub(t, 1)
+                    )
+                )
+            )
+        );
     }
 }

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

@@ -0,0 +1,45 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017-2020 Yegor Bugayenko
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package org.cactoos.text;
+
+import org.cactoos.Scalar;
+import org.cactoos.Text;
+import org.cactoos.scalar.Mapped;
+
+/**
+ * {@link Text} from {@link Scalar}.
+ *
+ * <p>There is no thread-safety guarantee.
+ *
+ * @since 0.46
+ */
+public final class Flattened extends TextEnvelope {
+    /**
+     * Ctor.
+     * @param sclr The text
+     */
+    public Flattened(final Scalar<Text> sclr) {
+        super(new TextOf(new Mapped<>(Text::asString, sclr)));
+    }
+}

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

@@ -43,16 +43,16 @@ public final class PaddedStart extends TextEnvelope {
     public PaddedStart(
         final Text text, final int length, final char symbol) {
         super(
-            new TextOf(
+            new Flattened(
                 () -> {
                     final String original = text.asString();
                     return new Joined(
                         new TextOf(""),
                         new Repeated(
                             new TextOf(symbol), length - original.length()
                         ),
-                        text
-                    ).asString();
+                        new TextOf(original)
+                    );
                 }
             )
         );

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

@@ -23,6 +23,11 @@
  */
 package org.cactoos.text;
 
+import org.cactoos.Text;
+import org.cactoos.func.FuncOf;
+import org.cactoos.scalar.ScalarOf;
+import org.cactoos.scalar.Ternary;
+
 /**
  * Returns a text that is before given boundary.
  *
@@ -38,18 +43,23 @@ public final class PrefixOf extends TextEnvelope {
      * @param boundary String to which text will be split
      */
     public PrefixOf(final String text, final String boundary) {
+        this(new TextOf(text), boundary);
+    }
+
+    /**
+     * Ctor.
+     * @param text Text representing the text value
+     * @param boundary String to which text will be split
+     */
+    public PrefixOf(final Text text, final String boundary) {
         super(
-            new TextOf(
-                () -> {
-                    final String prefix;
-                    final int idx = text.indexOf(boundary);
-                    if (idx >= 0) {
-                        prefix = text.substring(0, idx);
-                    } else {
-                        prefix = text;
-                    }
-                    return prefix;
-                }
+            new Flattened(
+                new Ternary<>(
+                    new ScalarOf<>(() -> new Sticky(text)),
+                    (Text t) -> t.asString().indexOf(boundary) >= 0,
+                    t -> new Sub(t, new FuncOf<>(0), s -> s.indexOf(boundary)),
+                    t -> t
+                )
             )
         );
     }

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

@@ -23,9 +23,10 @@
  */
 package org.cactoos.text;
 
+import org.cactoos.Func;
 import org.cactoos.Scalar;
 import org.cactoos.Text;
-import org.cactoos.scalar.Unchecked;
+import org.cactoos.func.FuncOf;
 
 /**
  * Extract a substring from a Text.
@@ -60,7 +61,16 @@ public Sub(final String text, final int strt, final int finish) {
      * @param strt Start position in the text
      */
     public Sub(final Text text, final int strt) {
-        this(text, () -> strt, () -> text.asString().length());
+        this(text, new FuncOf<>(strt));
+    }
+
+    /**
+     * Ctor.
+     * @param text The Text
+     * @param strt Start position in the text
+     */
+    public Sub(final Text text, final Func<String, Integer> strt) {
+        this(text, strt, s -> s.length());
     }
 
     /**
@@ -81,7 +91,7 @@ public Sub(final Text text, final int strt, final int finish) {
      */
     public Sub(final Text text, final Scalar<Integer> strt,
         final Scalar<Integer> finish) {
-        this(text, new Unchecked<>(strt), new Unchecked<>(finish));
+        this(text, new FuncOf<>(strt), new FuncOf<>(finish));
     }
 
     /**
@@ -90,16 +100,16 @@ public Sub(final Text text, final Scalar<Integer> strt,
      * @param start Start position in the text
      * @param end End position in the text
      */
-    public Sub(final Text text, final Unchecked<Integer> start,
-        final Unchecked<Integer> end) {
+    public Sub(final Text text, final Func<String, Integer> start,
+        final Func<String, Integer> end) {
         super(
             new Mapped(
                 origin -> {
-                    int begin = start.value();
+                    int begin = start.apply(origin);
                     if (begin < 0) {
                         begin = 0;
                     }
-                    int finish = end.value();
+                    int finish = end.apply(origin);
                     if (origin.length() < finish) {
                         finish = origin.length();
                     }

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

@@ -23,6 +23,10 @@
  */
 package org.cactoos.text;
 
+import org.cactoos.Text;
+import org.cactoos.scalar.ScalarOf;
+import org.cactoos.scalar.Ternary;
+
 /**
  * Returns a text that is after given boundary.
  *
@@ -38,18 +42,26 @@ public final class SuffixOf extends TextEnvelope {
      * @param boundary String after which text will be split
      */
     public SuffixOf(final String text, final String boundary) {
+        this(new TextOf(text), boundary);
+    }
+
+    /**
+     * Ctor.
+     * @param text Text representing the text value
+     * @param boundary String after which text will be split
+     */
+    public SuffixOf(final Text text, final String boundary) {
         super(
-            new TextOf(
-                () -> {
-                    final String suffix;
-                    final int idx = text.indexOf(boundary);
-                    if (idx >= 0) {
-                        suffix = text.substring(idx + boundary.length());
-                    } else {
-                        suffix = "";
-                    }
-                    return suffix;
-                }
+            new Flattened(
+                new Ternary<>(
+                    new ScalarOf<>(() -> new Sticky(text)),
+                    (Text t) -> t.asString().indexOf(boundary) >= 0,
+                    t -> new Sub(
+                        t,
+                        s -> s.indexOf(boundary) + boundary.length()
+                    ),
+                    t -> new TextOf("")
+                )
             )
         );
     }