X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FReaction%2FUI%2FLayoutSet.pm;h=77a0dac663c38ad922b0a733d9ac4dd6a9cac0bf;hb=13427367a812499857225b741a6aec2a15194aba;hp=b19c92bfe3a9dab05544ff0c98293fd7bdf2dbbd;hpb=e22de1011c40b639cc4b6e5586a9e0defe855285;p=catagits%2FReaction.git

diff --git a/lib/Reaction/UI/LayoutSet.pm b/lib/Reaction/UI/LayoutSet.pm
index b19c92b..77a0dac 100644
--- a/lib/Reaction/UI/LayoutSet.pm
+++ b/lib/Reaction/UI/LayoutSet.pm
@@ -5,49 +5,95 @@ use File::Spec;
 
 class LayoutSet which {
 
-  has 'fragments' => (is => 'ro', default => sub { {} });
+  has 'layouts' => (is => 'ro', default => sub { {} });
 
   has 'name' => (is => 'ro', required => 1);
 
-  has 'source_file' => (is => 'rw', lazy_fail => 1);
-  has 'file_extension'=> (isa => 'Str', is => 'rw', lazy_build => 1);
+  has 'source_file' => (is => 'ro', required => 1);
 
-  implements build_file_extension => as { 'html' };
+  has 'widget_class' => (
+    is => 'rw', lazy_fail => 1, predicate => 'has_widget_class'
+  );
+
+  has 'widget_type' => (is => 'rw', lazy_build => 1);
+
+  has 'super' => (is => 'rw', predicate => 'has_super');
 
   implements 'BUILD' => as {
     my ($self, $args) = @_;
     my @path = @{$args->{search_path}||[]};
-    confess "No search_path provided" unless @path;
-    my $found;
-    my $ext = $self->file_extension;
-    SEARCH: foreach my $path (@path) {
-      my $cand = $path->file($self->name . ".${ext}");
-      #print STDERR $cand,"\n";
-      if ($cand->stat) {
-        $self->_load_file($cand);
-        $found = 1;
-        last SEARCH;
-      }
+    confess "No skin object provided" unless $args->{skin};
+    $self->_load_file($self->source_file, $args);
+    unless ($self->has_widget_class) {
+      $self->widget_class($args->{skin}->widget_class_for($self));
     }
-    confess "Unable to load file for LayoutSet ".$self->name unless $found;
   };
 
+  implements 'widget_order_for' => as {
+    my ($self, $name) = @_;
+    return (
+      ($self->has_layout($name)
+        ? ([ $self->widget_class, $self ]) #;
+        : ()),
+      ($self->has_super
+        ? ($self->super->widget_order_for($name))
+        : ()),
+    );
+  };
+
+  implements 'layout_names' => as {
+    my ($self) = @_;
+    my %seen;
+    return [
+      grep { !$seen{$_}++ }
+        keys %{shift->layouts},
+        ($self->has_super
+          ? (@{$self->super->layout_names})
+          : ())
+    ];
+  };
+
+  implements 'has_layout' => as { exists $_[0]->layouts->{$_[1]} };
+
   implements '_load_file' => as {
-    my ($self, $file) = @_;
+    my ($self, $file, $build_args) = @_;
     my $data = $file->slurp;
-    my $fragments = $self->fragments;
-    # cheesy match for "=for layout fragmentname ... =something"
+    my $layouts = $self->layouts;
+    # cheesy match for "=for layout name ... =something"
     # final split group also handles last in file, (?==) is lookahead
-    # assertion for '=' so "=for layout fragment1 ... =for layout fragment2"
-    # doesn't have the match pos go past the latter = and lose fragment2
-    while ($data =~ m/=for layout (.*?)\n(.+?)(?:\n(?==)|$)/sg) {
-      my ($fname, $text) = ($1, $2);
-      $fragments->{$fname} = $text;
+    # assertion for '=' so "=for layout name1 ... =for layout name2"
+    # doesn't have the match pos go past the latter = and lose name2
+    while ($data =~ m/=(.*?)\n(.*?)(?:\n(?==)|$)/sg) {
+      my ($data, $text) = ($1, $2);
+      if ($data =~ /^for layout (\S+)/) {
+        my $fname = $1;
+        $text =~ s/^(?:\s*\r?\n)+//; #remove leading empty lines
+        $text =~ s/[\s\r\n]+$//;     #remove trailing whitespace
+        $layouts->{$fname} = $text;
+      } elsif ($data =~ /^extends (\S+)/) {
+        my $super_name = $1;
+        my $skin;
+        if ($super_name eq 'NEXT') {
+          confess "No next skin and layout extends NEXT"
+            unless $build_args->{next_skin};
+          $skin = $build_args->{next_skin};
+          $super_name = $self->name;
+        } else {
+          $skin = $build_args->{skin};
+        }
+        $self->super($skin->create_layout_set($super_name));
+      } elsif ($data =~ /^widget (\S+)/) {
+        my $widget_type = $1;
+        $self->widget_type($1);
+      } elsif ($data =~ /^cut/) {
+        # no-op
+      } else {
+        confess "Unparseable directive ${data}";
+      }
     }
-    $self->source_file($file);
   };
 
-  implements 'widget_type' => as {
+  implements '_build_widget_type' => as {
     my ($self) = @_;
     my $widget = join('',   map { ucfirst($_) } split('_', $self->name));
     $widget    = join('::', map { ucfirst($_) } split('/', $widget));