#21: Add org.cactoos.Text to Path entities

dgroup · Oct 29, 2018 · 949d338 · 949d338
1 parent c56cfb1
commit 949d338
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 8 deletions.
diff --git a/src/main/java/com/github/dgroup/velocity/path/PathOf.java b/src/main/java/com/github/dgroup/velocity/path/PathOf.java
@@ -23,11 +23,11 @@
  */
 package com.github.dgroup.velocity.path;
 
-import java.io.File;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.text.MessageFormat;
 import org.cactoos.Scalar;
+import org.cactoos.Text;
 import org.cactoos.scalar.UncheckedScalar;
 
 /**
@@ -45,10 +45,10 @@ public final class PathOf implements Scalar<Path> {
     /**
      * Ctor.
      * @param pattern The path pattern for {@link MessageFormat#format}.
-     *  The default delimiter is OS depended path separator.
+     *  The default delimiter is `/` path separator.
      */
     public PathOf(final String pattern) {
-        this(pattern, File.separator);
+        this(pattern, '/');
     }
 
     /**
@@ -57,7 +57,15 @@ public PathOf(final String pattern) {
      * @param args The arguments for {@link MessageFormat#format}.
      */
     public PathOf(final String pattern, final Object args) {
-        this(() -> Paths.get(MessageFormat.format(pattern, args)));
+        this(() -> MessageFormat.format(pattern, args));
+    }
+
+    /**
+     * Ctor.
+     * @param path The path to resource.
+     */
+    public PathOf(final Text path) {
+        this(() -> Paths.get(path.asString()));
     }
 
     /**

diff --git a/src/main/java/com/github/dgroup/velocity/path/RelativePath.java b/src/main/java/com/github/dgroup/velocity/path/RelativePath.java
@@ -23,11 +23,11 @@
  */
 package com.github.dgroup.velocity.path;
 
-import java.io.File;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.text.MessageFormat;
 import org.cactoos.Scalar;
+import org.cactoos.Text;
 import org.cactoos.scalar.UncheckedScalar;
 
 /**
@@ -47,10 +47,10 @@ public final class RelativePath implements Scalar<String> {
     /**
      * Ctor.
      * @param pattern The path pattern for {@link MessageFormat#format}.
-     *  The default delimiter is OS depended path separator.
+     *  The default delimiter is '/' path separator.
      */
     public RelativePath(final String pattern) {
-        this(pattern, File.separator);
+        this(pattern, '/');
     }
 
     /**
@@ -59,7 +59,15 @@ public RelativePath(final String pattern) {
      * @param args The arguments for {@link MessageFormat#format}.
      */
     public RelativePath(final String pattern, final Object... args) {
-        this(() -> MessageFormat.format(pattern, args));
+        this((Scalar<String>) () -> MessageFormat.format(pattern, args));
+    }
+
+    /**
+     * Ctor.
+     * @param path The path to resource.
+     */
+    public RelativePath(final Text path) {
+        this((Scalar<String>) path::asString);
     }
 
     /**