Fix stray joiner which showed up while appending empty value to text.

mrmaloof · Jul 2, 2015 · 6027969 · 6027969
1 parent 808551f
commit 6027969
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/lib/Template/Flute/HTML.pm b/lib/Template/Flute/HTML.pm
@@ -669,7 +669,9 @@ sub _elt_indicate_replacements {
             $elt->{"flute_$name"}->{rep_sub} = sub {
                 my ($elt, $str) = @_;
 				$str ||= '';
-                $elt->set_text($elt->{"flute_$name"}->{rep_text_orig} . $joiner . $str);
+                if (! $joiner || $str =~ /\S/) {
+                    $elt->set_text($elt->{"flute_$name"}->{rep_text_orig} . $joiner . $str);
+                }
             };
         }
         elsif ($sob->{op} eq 'toggle' && exists $sob->{args}

diff --git a/t/values/append.t b/t/values/append.t
@@ -5,7 +5,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 6;
+use Test::More tests => 7;
 use Template::Flute;
 
 my ($spec, $html, $flute, $out);
@@ -45,6 +45,22 @@ $out = $flute->process;
 like ($out, qr%<div class="test">FOO&amp;BAR</div>%,
     "value with op=append and joiner=&");
 
+# simple append with joiner without value
+$spec = q{<specification>
+<value name="test" op="append" joiner="&amp;"/>
+</specification>
+};
+
+$flute = Template::Flute->new(template => $html,
+                              specification => $spec,
+                              values => {test => ''},
+                             );
+
+$out = $flute->process;
+
+like ($out, qr%<div class="test">FOO</div>%,
+    "value with op=append, joiner=& and empty value");
+
 # simple append with joiner which doesn't escape
 $spec = q{<specification>
 <value name="test" op="append" joiner="|"/>