add repeat_between option to repeat filter

diff --git a/lib/HTML/Zoom/FilterBuilder.pm b/lib/HTML/Zoom/FilterBuilder.pm

index 0659cca..d6dcb40 100644 (file)
--- a/lib/HTML/Zoom/FilterBuilder.pm
+++ b/lib/HTML/Zoom/FilterBuilder.pm
@@ -19,7 +19,11 @@ sub _stream_from_proto {
   my ($self, $proto) = @_;
   my $ref = ref $proto;
   if (not $ref) {
-    return $self->_stream_from_array({ type => 'TEXT', raw => $proto });
+    require HTML::Zoom::Parser::BuiltIn;
+    return $self->_stream_from_array({
+      type => 'TEXT',
+      raw => HTML::Zoom::Parser::BuiltIn->html_escape($proto)
+    });
   } elsif ($ref eq 'ARRAY') {
     return $self->_stream_from_array(@$proto);
   } elsif ($ref eq 'CODE') {
@@ -211,14 +215,45 @@ sub replace_content {
 sub repeat {
   my ($self, $repeat_for, $options) = @_;
   $options->{into} = \my @into;
-  my $map_repeat = sub {
-    local $_ = $self->_stream_from_array(@into);
-    $_[0]->($_)
-  };
+  my @between;
+  my $repeat_between = delete $options->{repeat_between};
+  if ($repeat_between) {
+    require HTML::Zoom::SelectorParser;
+    require HTML::Zoom::FilterStream;
+    my $sp = HTML::Zoom::SelectorParser->new;
+    my $filter = $self->collect({ into => \@between });
+    $options->{filter} = sub {
+      HTML::Zoom::FilterStream->new({
+        stream => $_[0],
+        match => $sp->parse_selector($repeat_between),
+        filter => $filter
+      })
+    };
+  }
   my $repeater = sub {
-    $self->_stream_from_proto($repeat_for)
-         ->map($map_repeat)
-         ->flatten
+    my $s = $self->_stream_from_proto($repeat_for);
+    # We have to test $repeat_between not @between here because
+    # at the point we're constructing our return stream @between
+    # hasn't been populated yet - but we can test @between in the
+    # map routine because it has been by then and that saves us doing
+    # the extra stream construction if we don't need it.
+    if ($repeat_between) {
+      $s->map(sub {
+            local $_ = $self->_stream_from_array(@into);
+            (@between && $s->peek)
+              ? $self->_stream_concat(
+                  $_[0]->($_), $self->_stream_from_array(@between)
+                )
+              : $_[0]->($_)
+          })
+        ->flatten;
+    } else {
+      $s->map(sub {
+            local $_ = $self->_stream_from_array(@into);
+            $_[0]->($_)
+          })
+        ->flatten;
+    }
   };
   $self->replace($repeater, $options);
 }
diff --git a/lib/HTML/Zoom/Parser/BuiltIn.pm b/lib/HTML/Zoom/Parser/BuiltIn.pm

index 8985999..30da5d6 100644 (file)
--- a/lib/HTML/Zoom/Parser/BuiltIn.pm
+++ b/lib/HTML/Zoom/Parser/BuiltIn.pm
@@ -102,4 +102,8 @@ sub _simple_escape {
   $str;
 }
 
+sub html_escape { _simple_escape($_[1]) }
+
+sub html_unescape { _simple_unescape($_[1]) }
+
 1;
diff --git a/t/actions.t b/t/actions.t

index 790962f..1267bd3 100644 (file)
--- a/t/actions.t
+++ b/t/actions.t
@@ -301,4 +301,37 @@ is(
   'repeat_content with filter ok'
 );
 
+is(
+  run_for {
+    my @between;
+    $_->repeat_content(
+      [
+        sub {
+          filter
+            filter($_ => '.name' => $r_content->('mst'))
+            => '.career' => $r_content->('Chainsaw Wielder')
+        },
+        sub {
+          filter
+            filter($_ => '.name' => $r_content->('mdk'))
+            => '.career' => $r_content->('Adminion')
+        },
+      ],
+      { repeat_between => 'hr' }
+    )
+  },
+  q{<body>
+  <div class="main">
+    <span class="hilight name">mst</span>
+    <span class="career">Chainsaw Wielder</span>
+    <hr />
+    <span class="hilight name">mdk</span>
+    <span class="career">Adminion</span>
+    
+  </div>
+</body>
+},
+  'repeat_content using repeat_between ok'
+);
+
 done_testing;
lib/HTML/Zoom/FilterBuilder.pm		patch \| blob \| blame \| history
lib/HTML/Zoom/Parser/BuiltIn.pm		patch \| blob \| blame \| history
t/actions.t		patch \| blob \| blame \| history