(no commit message)

[catagits/Reaction.git] / lib / Reaction / UI / View.pm

diff --git a/lib/Reaction/UI/View.pm b/lib/Reaction/UI/View.pm
index 987909c..1f7c00c 100644 (file)
--- a/lib/Reaction/UI/View.pm
+++ b/lib/Reaction/UI/View.pm
@@ -8,7 +8,8 @@ use Reaction::UI::RenderingContext;
 
 class View which {
 
-  has '_layout_set_cache' => (is => 'ro', default => sub { {} });
+  has '_layout_set_cache'   => (is => 'ro', default => sub { {} });
+  has '_widget_class_cache' => (is => 'ro', default => sub { {} });
 
   has 'app' => (is => 'ro', required => 1);
 
@@ -18,6 +19,16 @@ class View which {
 
   has 'rendering_context_class' => (is => 'ro', lazy_build => 1);
 
+  implements '_build_layout_set_class' => as {
+    my ($self) = @_;
+    return $self->find_related_class('LayoutSet');
+  };
+
+  implements '_build_rendering_context_class' => as {
+    my ($self) = @_;
+    return $self->find_related_class('RenderingContext');
+  };
+
   implements 'COMPONENT' => as {
     my ($class, $app, $args) = @_;
     return $class->new(%{$args||{}}, app => $app);
@@ -26,6 +37,7 @@ class View which {
   sub BUILD{
     my $self = shift;
     my $skin_name = $self->skin_name;
+    #XXX i guess we will add the path to installed reaction templates here
     my $skin_path = $self->app->path_to('share','skin',$skin_name);
     confess("'${skin_path}' is not a valid path for skin '${skin_name}'")
       unless -d $skin_path;
@@ -58,15 +70,27 @@ class View which {
     my ($self, $layout_set) = @_;
     my $base = $self->blessed;
     my $tail = $layout_set->widget_type;
-    my $class = join('::', $base, 'Widget', $tail);
-    eval { Class::MOP::load_class($class) };
-    confess "Couldn't load widget '$class': $@" if $@;
-    return $class;
+    my $lset_name = $layout_set->name;
+    # eventually more stuff will go here i guess?
+    my $app_name = ref $self->app || $self->app;
+    my $cache = $self->_widget_class_cache;
+    return $cache->{ $lset_name } if exists $cache->{ $lset_name };
+
+    my @search_path = ($base, $app_name, 'Reaction::UI');
+    my @haystack    = map { join '::', $_, 'Widget', $tail } @search_path;
+    for my $class (@haystack){
+      #here we should throw if exits and error instead of eating the error
+      #only next when !exists
+      eval { Class::MOP::load_class($class) };
+      #$@ ? next : return  $class;
+      $@ ? next : return $cache->{ $lset_name } = $class;
+    }
+    confess "Couldn't load widget '$tail': tried: @haystack";
   };
 
   implements 'layout_set_for' => as {
     my ($self, $vp) = @_;
-    print STDERR "Getting layoutset for VP ".(ref($vp) || "SC:".$vp)."\n";
+    #print STDERR "Getting layoutset for VP ".(ref($vp) || "SC:".$vp)."\n";
     my $lset_name = eval { $vp->layout };
     confess "Couldn't call layout method on \$vp arg ${vp}: $@" if $@;
     unless (length($lset_name)) {
@@ -75,7 +99,7 @@ class View which {
       my @fragments = split('::', $last);
       $_ = join("_", split(/(?=[A-Z])/, $_)) for @fragments;
       $lset_name = lc(join('/', @fragments));
-      print STDERR "--- $vp_class is rendered as $lset_name\n";
+      #print STDERR "--- $vp_class is rendered as $lset_name\n";
     }
     my $cache = $self->_layout_set_cache;
     return $cache->{$lset_name} ||= $self->create_layout_set($lset_name);
@@ -104,11 +128,6 @@ class View which {
     confess "Unable to find related ${rel} class for ${own_class}";
   };
 
-  implements 'build_layout_set_class' => as {
-    my ($self) = @_;
-    return $self->find_related_class('LayoutSet');
-  };
-
   implements 'layout_set_args_for' => as {
     my ($self, $name) = @_;
     return (name => $name, search_path => $self->layout_search_path);
@@ -132,11 +151,6 @@ class View which {
            );
   };
 
-  implements 'build_rendering_context_class' => as {
-    my ($self) = @_;
-    return $self->find_related_class('RenderingContext');
-  };
-
   implements 'rendering_context_args_for' => as {
     return ();
   };