add repeat_between option to repeat filter

[catagits/HTML-Zoom.git] / lib / HTML / Zoom / FilterBuilder.pm

diff --git a/lib/HTML/Zoom/FilterBuilder.pm b/lib/HTML/Zoom/FilterBuilder.pm
index 0d4be1a..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') {
@@ -84,7 +88,8 @@ sub remove_attribute {
 
 sub collect {
   my ($self, $options) = @_;
-  my ($into, $passthrough, $inside) = @{$options}{qw(into passthrough inside)};
+  my ($into, $passthrough, $content, $filter) =
+    @{$options}{qw(into passthrough content filter)};
   sub {
     my ($evt, $stream) = @_;
     # We wipe the contents of @$into here so that other actions depending
@@ -92,15 +97,16 @@ sub collect {
     # I -suspect- it's better for that state reset to be managed here; if it
     # ever becomes painful the decision should be revisited
     if ($into) {
-      @$into = $inside ? () : ($evt);
+      @$into = $content ? () : ($evt);
     }
     if ($evt->{is_in_place_close}) {
-      return $evt if $passthrough || $inside;
+      return $evt if $passthrough || $content;
       return;
     }
     my $name = $evt->{name};
     my $depth = 1;
-    my $_next = $inside ? 'peek' : 'next';
+    my $_next = $content ? 'peek' : 'next';
+    $stream = $filter->($stream) if $filter;
     my $collector = $self->_stream_from_code(sub {
       return unless $stream;
       while (my ($evt) = $stream->$_next) {
@@ -108,21 +114,26 @@ sub collect {
         $depth-- if ($evt->{type} eq 'CLOSE');
         unless ($depth) {
           undef $stream;
-          return if $inside;
+          return if $content;
           push(@$into, $evt) if $into;
           return $evt if $passthrough;
           return;
         }
         push(@$into, $evt) if $into;
-        $stream->next if $inside;
+        $stream->next if $content;
         return $evt if $passthrough;
       }
       die "Never saw closing </${name}> before end of source";
     });
-    return ($passthrough||$inside) ? [ $evt, $collector ] : $collector;
+    return ($passthrough||$content) ? [ $evt, $collector ] : $collector;
   };
 }
 
+sub collect_content {
+  my ($self, $options) = @_;
+  $self->collect({ %{$options||{}}, content => 1 })
+}
+
 sub add_before {
   my ($self, $events) = @_;
   sub { return $self->_stream_from_array(@$events, $_[0]) };
@@ -141,7 +152,7 @@ sub add_after {
   };
 }
 
-sub prepend_inside {
+sub prepend_content {
   my ($self, $events) = @_;
   sub {
     my ($evt) = @_;
@@ -155,9 +166,9 @@ sub prepend_inside {
   };
 }
 
-sub append_inside {
+sub append_content {
   my ($self, $events) = @_;
-  my $coll_proto = $self->collect({ passthrough => 1, inside => 1 });
+  my $coll_proto = $self->collect({ passthrough => 1, content => 1 });
   sub {
     my ($evt) = @_;
     if ($evt->{is_in_place_close}) {
@@ -196,19 +207,60 @@ sub replace {
   };
 }
 
+sub replace_content {
+  my ($self, $replace_with, $options) = @_;
+  $self->replace($replace_with, { %{$options||{}}, content => 1 })
+}
+
 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);
 }
 
+sub repeat_content {
+  my ($self, $repeat_for, $options) = @_;
+  $self->repeat($repeat_for, { %{$options||{}}, content => 1 })
+}
+
 1;