rework skin path handling

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

diff --git a/lib/Reaction/UI/View.pm b/lib/Reaction/UI/View.pm
index 92aa7c5..358fcf1 100644 (file)
--- a/lib/Reaction/UI/View.pm
+++ b/lib/Reaction/UI/View.pm
@@ -5,16 +5,24 @@ use Reaction::Class;
 # declaring dependencies
 use Reaction::UI::LayoutSet;
 use Reaction::UI::RenderingContext;
+use aliased 'Reaction::UI::Skin';
+use aliased 'Path::Class::Dir';
 
 class View which {
 
-  has '_layout_set_cache'   => (is => 'ro', default => sub { {} });
-  has '_widget_class_cache' => (is => 'ro', default => sub { {} });
+  has '_widget_cache' => (is => 'ro', default => sub { {} });
+
+  has '_layout_set_cache' => (is => 'ro', default => sub { {} });
 
   has 'app' => (is => 'ro', required => 1);
 
   has 'skin_name' => (is => 'ro', required => 1);
 
+  has 'skin' => (
+    is => 'ro', lazy_build => 1,
+    handles => [ qw(create_layout_set search_path_for_type) ]
+  );
+
   has 'layout_set_class' => (is => 'ro', lazy_build => 1);
 
   has 'rendering_context_class' => (is => 'ro', lazy_build => 1);
@@ -29,62 +37,43 @@ class View which {
     return $self->find_related_class('RenderingContext');
   };
 
+  implements '_build_skin' => as {
+    my ($self) = @_;
+    Skin->new(
+      name => $self->skin_name, view => $self,
+      # path_to returns a File, not a Dir. Thanks, Catalyst.
+      skin_base_dir => Dir->new($self->app->path_to('share', 'skin')),
+    );
+  };
+
   implements 'COMPONENT' => as {
     my ($class, $app, $args) = @_;
     return $class->new(%{$args||{}}, app => $app);
   };
 
-  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;
-  }
-
   implements 'render_window' => as {
     my ($self, $window) = @_;
     my $root_vp = $window->focus_stack->vp_head;
     my $rctx = $self->create_rendering_context;
-    $self->render_viewport($rctx, $root_vp);
+    my ($widget, $args) = $self->render_viewport_args($root_vp);
+    $widget->render(widget => $rctx, $args);
   };
 
-  implements 'render_viewport' => as {
-    my ($self, $rctx, $vp) = @_;
+  implements 'render_viewport_args' => as {
+    my ($self, $vp) = @_;
     my $layout_set = $self->layout_set_for($vp);
     my $widget = $self->widget_for($vp, $layout_set);
-    $widget->render($rctx);
+    return ($widget, { viewport => $vp });
   };
 
   implements 'widget_for' => as {
     my ($self, $vp, $layout_set) = @_;
-    return $self->widget_class_for($layout_set)
-                ->new(
-                    view => $self, viewport => $vp, layout_set => $layout_set
-                  );
-  };
-
-  implements 'widget_class_for' => as {
-    my ($self, $layout_set) = @_;
-    my $base = $self->blessed;
-    my $tail = $layout_set->widget_type;
-    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";
+    return
+      $self->_widget_cache->{$layout_set->name}
+        ||= $layout_set->widget_class
+                       ->new(
+                           view => $self, layout_set => $layout_set
+                         );
   };
 
   implements 'layout_set_for' => as {
@@ -104,11 +93,8 @@ class View which {
     return $cache->{$lset_name} ||= $self->create_layout_set($lset_name);
   };
 
-  implements 'create_layout_set' => as {
-    my ($self, $name) = @_;
-    return $self->layout_set_class->new(
-             $self->layout_set_args_for($name),
-           );
+  implements 'layout_set_file_extension' => as {
+    confess View." is abstract, you must subclass it";
   };
 
   implements 'find_related_class' => as {
@@ -127,21 +113,6 @@ class View which {
     confess "Unable to find related ${rel} class for ${own_class}";
   };
 
-  implements 'layout_set_args_for' => as {
-    my ($self, $name) = @_;
-    return (name => $name, search_path => $self->layout_search_path);
-  };
-
-  implements 'layout_search_path' => as {
-    my ($self) = @_;
-    return $self->search_path_for_type('layout');
-  };
-
-  implements 'search_path_for_type' => as {
-    my ($self, $type) = @_;
-    return [ $self->app->path_to('share','skin',$self->skin_name,$type) ];
-  };
-
   implements 'create_rendering_context' => as {
     my ($self, @args) = @_;
     return $self->rendering_context_class->new(
@@ -154,6 +125,10 @@ class View which {
     return ();
   };
 
+  implements 'layout_set_args_for' => as {
+    return ();
+  };
+
 };
 
 1;