factor out ArrayStream, update new stream types to respect peek

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

diff --git a/lib/HTML/Zoom/StreamUtils.pm b/lib/HTML/Zoom/StreamUtils.pm
index 6c571fc..3b2f921 100644 (file)
--- a/lib/HTML/Zoom/StreamUtils.pm
+++ b/lib/HTML/Zoom/StreamUtils.pm
@@ -8,6 +8,7 @@ use Scalar::Util ();
 
 use HTML::Zoom::CodeStream;
 use HTML::Zoom::FilterStream;
+use HTML::Zoom::ArrayStream;
 
 sub stream_from_code {
   my ($self, $code) = @_;
@@ -20,10 +21,10 @@ sub stream_from_code {
 sub stream_from_array {
   my $self = shift;
   my @array = @_;
-  $self->stream_from_code(sub {
-    return unless @array;
-    return shift @array;
-  });
+  HTML::Zoom::ArrayStream->new({
+    array => \@array,
+    zconfig => $self->_zconfig,
+  })
 }
 
 sub stream_concat {
@@ -41,7 +42,7 @@ sub stream_from_proto {
   } elsif ($ref eq 'ARRAY') {
     return $self->stream_from_array(@$proto);
   } elsif ($ref eq 'CODE') {
-    return $self->stream_from_code($proto);
+    return $proto->();
   } elsif ($ref eq 'SCALAR') {
     return $self->_zconfig->parser->html_to_stream($$proto);
   } elsif (Scalar::Util::blessed($proto) && $proto->can('to_stream')) {