Fix to View.pm (oops) and the ability of using sub{} blocks with a localized %_ to...

diff --git a/lib/Reaction/UI/View.pm b/lib/Reaction/UI/View.pm
index fa98030..5c26113 100644 (file)
--- a/lib/Reaction/UI/View.pm
+++ b/lib/Reaction/UI/View.pm
@@ -27,7 +27,7 @@ class View which {
   sub BUILD{
     my $self = shift;
     my $skin_name = $self->skin_name;
-    my $skin_path = $app->path_to('share','skin',$skin_name);
+    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;
   }

diff --git a/lib/Reaction/UI/WidgetClass.pm b/lib/Reaction/UI/WidgetClass.pm
index 9eadc35..9e40936 100644 (file)
--- a/lib/Reaction/UI/WidgetClass.pm
+++ b/lib/Reaction/UI/WidgetClass.pm
@@ -144,7 +144,7 @@ class WidgetClass, which {
             };
           };
         };
-            
+
       # must also handle just $_ later for wrap
       } else {
         # unrecognised -foo
@@ -195,7 +195,7 @@ class WidgetClass, which {
 
     my @extra_keys = keys %args_extra;
     my @extra_gen = values %args_extra;
-    
+
     my $meth = sub {
       my ($self, $rctx, $args) = @_;
       confess "No rendering context passed" unless $rctx;
@@ -223,7 +223,7 @@ class WidgetClass, which {
 
     my $sig = 'should be: key => $_ or key => $_{name} or key => func("name", "method")';
 
-    my (@func_to, @func_spec, @copy_from, @copy_to);
+    my (@func_to, @func_spec, @copy_from, @copy_to, @sub_spec, @sub_to);
     foreach my $key (keys %$argspec) {
       my $val = $argspec->{$key};
       if (ref($val) eq 'ARRAY') {
@@ -233,6 +233,16 @@ class WidgetClass, which {
         my $topic_key = $1;
         push(@copy_from, $topic_key);
         push(@copy_to, $key);
+      }  elsif (ref($val) eq 'CODE') {
+      #LOOK AT ME
+        my $sub = sub{
+          my $inner_args = shift;
+          local *_ = \%{$inner_args};
+          local $_ = $inner_args->{'_'};
+          return $val->();
+        };
+        push(@sub_spec, $sub);
+        push(@sub_to, $key);
       } else {
         confess "Invalid args member for ${key}, ${sig}";
       }
@@ -247,13 +257,17 @@ class WidgetClass, which {
         my ($key, $meth) = @{$_};
         $outer_args->{$key}->$meth; # [ 'a, 'b' ] ~~ ->{'a'}->b
       } @func_spec);
+      #LOOK AT ME
+      @{$args}{@sub_to} = (map { $_->($outer_args) } @sub_spec);
 #warn Dumper($args).' ';
       return $args;
     };
   };
-      
+
 };
 
+1;
+
 package Reaction::UI::WidgetClass::TopicHash;
 
 use Tie::Hash;
@@ -266,6 +280,8 @@ sub FETCH {
 
 1;
 
+__END__;
+
 =head1 NAME
 
 Reaction::UI::WidgetClass