#742 XeChain with Scalar

yegor256 · Aug 8, 2017 · 5888370 · 5888370
1 parent 6e31a42
commit 5888370
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 12 deletions.
diff --git a/src/main/java/org/takes/rs/xe/RsXembly.java b/src/main/java/org/takes/rs/xe/RsXembly.java
@@ -103,7 +103,7 @@ public RsXembly(final Node dom, final Iterable<XeSource> sources) {
      * @param src Source
      */
     public RsXembly(final XeSource src) {
-        this(emptyDocument(), src);
+        this(RsXembly.emptyDocument(), src);
     }
 
     /**

diff --git a/src/main/java/org/takes/rs/xe/XeChain.java b/src/main/java/org/takes/rs/xe/XeChain.java
@@ -26,6 +26,7 @@
 import java.io.IOException;
 import java.util.Arrays;
 import lombok.EqualsAndHashCode;
+import org.takes.Scalar;
 import org.xembly.Directive;
 import org.xembly.Directives;
 
@@ -54,12 +55,28 @@ public XeChain(final XeSource... src) {
      * @param items Sources
      */
     public XeChain(final Iterable<XeSource> items) {
+        this(
+            new Scalar<Iterable<XeSource>>() {
+                @Override
+                public Iterable<XeSource> get() {
+                    return items;
+                }
+            }
+        );
+    }
+
+    /**
+     * Ctor.
+     * @param items Sources
+     * @since 1.5
+     */
+    public XeChain(final Scalar<Iterable<XeSource>> items) {
         super(
             new XeSource() {
                 @Override
                 public Iterable<Directive> toXembly() throws IOException {
                     final Directives dirs = new Directives();
-                    for (final XeSource src : items) {
+                    for (final XeSource src : items.get()) {
                         dirs.push().append(src.toXembly()).pop();
                     }
                     return dirs;

diff --git a/src/main/java/org/takes/rs/xe/XeWhen.java b/src/main/java/org/takes/rs/xe/XeWhen.java
@@ -64,20 +64,57 @@ public XeSource get() {
      * @param condition Condition
      * @param source Xembly source
      */
+    public XeWhen(final boolean condition, final Scalar<XeSource> source) {
+        this(
+            new Scalar<Boolean>() {
+                @Override
+                public Boolean get() {
+                    return condition;
+                }
+            },
+            source
+        );
+    }
+
+    /**
+     * Ctor.
+     * @param condition Condition
+     * @param source Xembly source
+     * @since 1.5
+     */
+    public XeWhen(final Scalar<Boolean> condition, final XeSource source) {
+        this(
+            condition,
+            new Scalar<XeSource>() {
+                @Override
+                public XeSource get() {
+                    return source;
+                }
+            }
+        );
+    }
+
+    /**
+     * Ctor.
+     * @param condition Condition
+     * @param source Xembly source
+     * @since 1.5
+     */
     @SuppressWarnings
         (
             {
                 "PMD.CallSuperInConstructor",
                 "PMD.ConstructorOnlyInitializesOrCallOtherConstructors"
             }
         )
-    public XeWhen(final boolean condition, final Scalar<XeSource> source) {
+    public XeWhen(final Scalar<Boolean> condition,
+        final Scalar<XeSource> source) {
         super(
             new XeSource() {
                 @Override
                 public Iterable<Directive> toXembly() throws IOException {
                     final Iterable<Directive> dirs;
-                    if (condition) {
+                    if (condition.get()) {
                         dirs = source.get().toXembly();
                     } else {
                         dirs = Collections.emptyList();

diff --git a/src/main/resources/org/takes/facets/flash/flash.xsl b/src/main/resources/org/takes/facets/flash/flash.xsl
@@ -25,13 +25,15 @@
     xmlns="http://www.w3.org/1999/xhtml" version="1.0">
     <xsl:template name="takes_flash">
         <xsl:param name="flash"/>
-        <p>
-            <xsl:attribute name="class">
-                <xsl:text>flash</xsl:text>
-                <xsl:text> flash-</xsl:text>
-                <xsl:value-of select="$flash/level"/>
-            </xsl:attribute>
-            <xsl:value-of select="$flash/message"/>
-        </p>
+        <xsl:if test="$flash/message">
+            <p>
+                <xsl:attribute name="class">
+                    <xsl:text>flash</xsl:text>
+                    <xsl:text> flash-</xsl:text>
+                    <xsl:value-of select="$flash/level"/>
+                </xsl:attribute>
+                <xsl:value-of select="$flash/message"/>
+            </p>
+        </xsl:if>
     </xsl:template>
 </xsl:stylesheet>