X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FReaction%2FUI%2FRenderingContext%2FTT.pm;h=a29d8d4031f18c37a748326741e70570bf03cdd4;hb=a0ff2c8198d7cfcdefad1cbbaf339bd849a9c2c0;hp=e925ff611280752cd8895567fd05f8f08ac53703;hpb=f2fef590a7283ea919bdaa51bac9d433e8785a09;p=catagits%2FReaction.git

diff --git a/lib/Reaction/UI/RenderingContext/TT.pm b/lib/Reaction/UI/RenderingContext/TT.pm
index e925ff6..a29d8d4 100644
--- a/lib/Reaction/UI/RenderingContext/TT.pm
+++ b/lib/Reaction/UI/RenderingContext/TT.pm
@@ -4,123 +4,67 @@ use Reaction::Class;
 use aliased 'Reaction::UI::RenderingContext';
 use aliased 'Template::View';
 
-class TT is RenderingContext, which {
+use namespace::clean -except => [ qw(meta) ];
+extends RenderingContext;
 
-  has 'iter_class' => (
-    is => 'ro', required => 1,
-    default => sub { 'Reaction::UI::Renderer::TT::Iter'; },
-  );
 
-  our $body;
 
-  implements 'dispatch' => as {
-    my ($self, $render_tree, $args) = @_;
+our $body;
+sub dispatch {
+  my ($self, $render_tree, $args) = @_;
 #warn "-- dispatch start\n";
-    local $body = '';
-    my %args_copy = %$args;
-    foreach my $to_render (@$render_tree) {
-      my ($type, @to) = @$to_render;
-      if ($type eq '-layout') {
-        my ($lset, $fname, $next) = @to;
-        local $args_copy{call_next} =
-          (@$next
-            ? sub { $self->dispatch($next, $args); }
-            : '' # no point running internal dispatch if nothing -to- dispatch
-          );
-        $self->render($lset, $fname, \%args_copy);
-      } elsif ($type eq '-render') {
-        my ($widget, $fname, $over) = @to;
-        #warn "@to";
-        if (defined $over) {
-          $over->each(sub {
-            local $args_copy{_} = $_[0];
-            $body .= $widget->render($fname, $self, \%args_copy);
-          });
-        } else {
+  local $body = '';
+  my %args_copy = %$args;
+  foreach my $to_render (@$render_tree) {
+    my ($type, @to) = @$to_render;
+    if ($type eq '-layout') {
+      my ($lset, $fname, $next) = @to;
+      local $args_copy{call_next} =
+        (@$next
+          ? sub { $self->dispatch($next, $args); }
+          : '' # no point running internal dispatch if nothing -to- dispatch
+        );
+      $self->render($lset, $fname, \%args_copy);
+    } elsif ($type eq '-render') {
+      my ($widget, $fname, $over) = @to;
+      #warn "@to";
+      if (defined $over) {
+        my $count = 0;
+        $over->each(sub {
+          local $args_copy{_} = $_[0];
+          local $args_copy{count} = ++$count;
           $body .= $widget->render($fname, $self, \%args_copy);
-        }
+        });
+      } else {
+        $body .= $widget->render($fname, $self, \%args_copy);
       }
     }
+  }
 #warn "-- dispatch end, body: ${body}\n-- end body\nbacktrace: ".Carp::longmess()."\n-- end trace\n";
-    return $body;
-  };
-        
-  implements 'render' => as {
-    my ($self, $lset, $fname, $args) = @_;
-
-    confess "\$body not in scope" unless defined($body);
-  
-    # foreach non-_ prefixed key in the args
-    # build a subref for this key that passes self so the generator has a
-    # rendering context when [% key %] is evaluated by TT as $val->()
-    # (assuming it's a subref - if not just pass through)
-  
-    my $tt_args = {
-      map {
-        my $arg = $args->{$_};
-        ($_ => (ref $arg eq 'CODE' ? sub { $arg->($self, $args) } : $arg))
-      } grep { !/^_/ } keys %$args
-    };
-  
-    # if there's an _ key that's our current topic (decalarative syntax
-    # sees $_ as $_{_}) so build an iterator around it.
-  
-    # There's possibly a case for making everything an iterator but I think
-    # any fragment should only have a single multiple arg
-  
-    # we also create a 'pos' shortcut to content.pos for brevity
-  
-    if (my $topic = $args->{_}) {
-      my $iter = $self->iter_class->new(
-        $topic, $self
-      );
-      $tt_args->{content} = $iter;
-      $tt_args->{pos} = sub { $iter->pos };
-    }
-    $body .= $lset->tt_view->include($fname, $tt_args);
-#warn "rendered ${fname}, body length now ".length($body)."\n";
-  };
-
+  return $body;
 };
-  
-package Reaction::UI::Renderer::TT::Iter;
+sub render {
+  my ($self, $lset, $fname, $args) = @_;
 
-use overload (
-  q{""} => 'stringify',
-  fallback => 1
-);
+  confess "\$body not in scope" unless defined($body);
 
-sub pos { shift->{pos} }
+  # foreach non-_ prefixed key in the args
+  # build a subref for this key that passes self so the generator has a
+  # rendering context when [% key %] is evaluated by TT as $val->()
+  # (assuming it's a subref - if not just pass through)
 
-sub new {
-  my ($class, $cr, $rctx) = @_;
-  bless({ rctx => $rctx, cr => $cr, pos => 0 }, $class);
-}
+  my $tt_args = {
+    map {
+      my $arg = $args->{$_};
+      ($_ => (ref $arg eq 'CODE' ? sub { $arg->($self, $args) } : $arg))
+    } grep { !/^_/ } keys %$args
+  };
 
-sub next {
-  my $self = shift;
-  $self->{pos}++;
-  my $next = $self->{cr}->();
-  return unless $next;
-  return sub { $next->($self->{rctx}) };
-}
+  $body .= $lset->tt_view->include($fname, $tt_args);
+#warn "rendered ${fname}, body length now ".length($body)."\n";
+};
 
-sub all {
-  my $self = shift;
-  my @all;
-  while (my $e = $self->next) {
-    push(@all, $e);
-  }
-  \@all;
-}
+__PACKAGE__->meta->make_immutable;
 
-sub stringify {
-  my $self = shift;
-  my $res = '';
-  foreach my $e (@{$self->all}) {
-    $res .= $e->();
-  }
-  $res;
-}
 
 1;