make then() work on streams and fix up replace_content on in_place_close elements

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

diff --git a/lib/HTML/Zoom/StreamBase.pm b/lib/HTML/Zoom/StreamBase.pm
index 96edbf0..e9bee1c 100644 (file)
--- a/lib/HTML/Zoom/StreamBase.pm
+++ b/lib/HTML/Zoom/StreamBase.pm
@@ -2,57 +2,82 @@ package HTML::Zoom::StreamBase;
 
 use strict;
 use warnings FATAL => 'all';
+use HTML::Zoom::TransformBuilder;
+
+sub _zconfig { shift->{_zconfig} }
 
 sub peek {
   my ($self) = @_;
   if (exists $self->{_peeked}) {
     return ($self->{_peeked});
   }
-  if (my ($peeked) = $self->next) {
+  if (my ($peeked) = $self->_next) {
     return ($self->{_peeked} = $peeked);
   }
   return;
 }
 
+sub next {
+  my ($self) = @_;
+
+  # peeked entry so return that
+
+  if (exists $self->{_peeked}) {
+    return (delete $self->{_peeked});
+  }
+
+  $self->_next;
+}
+
+
 sub flatten {
-  my $source_stream = shift;
-  require HTML::Zoom::CodeStream;
-  my $cur_stream;
-  HTML::Zoom::CodeStream->new({
-    code => sub {
-      return unless $source_stream;
-      my $next;
-      until (($next) = ($cur_stream ? $cur_stream->next : ())) {
-#::Dwarn $source_stream;
-        unless (($cur_stream) = $source_stream->next) {
-          undef $source_stream; return;
-        }
-      }
-#::Dwarn $next;
-      return $next;
-    }
+  my $self = shift;
+  require HTML::Zoom::FlattenedStream;
+  HTML::Zoom::FlattenedStream->new({
+    source => $self,
+    zconfig => $self->_zconfig
   });
 }
 
 sub map {
-  my ($source_stream, $map_func) = @_;
-  require HTML::Zoom::CodeStream;
-  HTML::Zoom::CodeStream->new({
-    code => sub {
-      return unless $source_stream;
-      # If we were aiming for a "true" perl-like map then we should
-      # elegantly handle the case where the map function returns 0 events
-      # and the case where it returns >1 - if you're reading this comment
-      # because you wanted it to do that, now would be the time to fix it :)
-      if (my ($next) = $source_stream->next) {
-        #### XXXX collapsing this into a return doesn't work. what the
-        #### flying fornication ... -- mst
-        my $mapped = do { local $_ = $next; $map_func->($next) };
-        return $mapped;
-      }
-      undef $source_stream; return;
-    }
+  my ($self, $mapper) = @_;
+  require HTML::Zoom::MappedStream;
+  HTML::Zoom::MappedStream->new({
+    source => $self, mapper => $mapper, zconfig => $self->_zconfig
+  });
+}
+
+sub with_filter {
+  my ($self, $selector, $filter) = @_;
+  my $match = $self->_parse_selector($selector);
+  $self->_zconfig->stream_utils->wrap_with_filter($self, $match, $filter);
+}
+
+sub with_transform {
+  my ($self, $transform) = @_;
+  $transform->apply_to_stream($self);
+}
+
+sub select {
+  my ($self, $selector) = @_;
+  return HTML::Zoom::TransformBuilder->new({
+    zconfig => $self->_zconfig,
+    selector => $selector,
+    filters => [],
+    proto => $self,
   });
 }
 
+sub then {
+  my ($self) = @_;
+  # see notes in HTML/Zoom.pm for why this needs to be fixed
+  $self->select($self->transform->selector);
+}
+
+sub apply {
+  my ($self, $code) = @_;
+  local $_ = $self;
+  $self->$code;
+}
+
 1;