X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FReaction%2FUI%2FWidgetClass.pm;h=e1a797bb601dfa1fc608a9c2638012d656b476f7;hb=1ef7b9da7545471cbab981e32d42dee14267beb6;hp=ac6feaf028a31c9985f28b5b9da78268157abf8b;hpb=d7b00a506917b0fc21c7781985ea65293870fbbc;p=catagits%2FReaction.git

diff --git a/lib/Reaction/UI/WidgetClass.pm b/lib/Reaction/UI/WidgetClass.pm
index ac6feaf..e1a797b 100644
--- a/lib/Reaction/UI/WidgetClass.pm
+++ b/lib/Reaction/UI/WidgetClass.pm
@@ -9,106 +9,129 @@ use aliased 'Reaction::UI::WidgetClass::_OVER';
 
 no warnings 'once';
 
-class WidgetClass, which {
-
-  # for local() for fragment wrap
-  our ($next_call, $fragment_args, $current_widget, $do_render, $new_args);
-
-  after 'do_import' => sub {
-    my ($self, $package) = @_;
-    Devel::Declare->install_declarator(
-      $package, 'fragment', DECLARE_NAME,
-      sub { },
-      sub {
-        WidgetClass->handle_fragment(@_);
-      }
-    );
-  };
+use namespace::clean -except => [ qw(meta) ];
 
-  after 'setup_and_cleanup' => sub {
-    my ($self, $package) = @_;
-    {
-      no strict 'refs';
-      delete ${"${package}::"}{'fragment'};
-    }
-    #Devel::Declare->teardown_for($package);
-  };
 
-  overrides exports_for_package => sub {
-    my ($self, $package) = @_;
-    return (super(),
-      over => sub {
-        my ($collection) = @_;
-        confess "too many args, should be: over \$collection" if @_ > 1;
-        _OVER->new(collection => $collection);
-      },
-      render => sub {
-        my ($name, $over) = @_;
-
-        my $sig = "should be: render 'name' or render 'name' => over \$coll";
-        if (!defined $name) { confess "name undefined: $sig"; }
-        if (ref $name) { confess "name not string: $sig"; }
-        if (defined $over && !(blessed($over) && $over->isa(_OVER))) {
-          confess "invalid args after name, $sig";
-        }
-        $do_render->($package, $current_widget, $name, $over);
-      },
-      arg => sub {
-        my ($name, $value) = @_;
-
-        my $sig = "should be: arg 'name' => \$value";
-        if (@_ < 2) { confess "Not enough arguments, $sig"; }
-        if (!defined $name) { confess "name undefined, $sig"; }
-        if (ref $name) { confess "name is not a string, $sig"; }
-
-        $new_args->{$name} = $value;
-      },
-      call_next => sub {
-        confess "args passed, should be just call_next; or call_next();"
-          if @_;
-        $next_call->(@$fragment_args);
-      },
-      event_id => sub {
-        my ($name) = @_;
-        $_{viewport}->event_id_for($name);
-      },
-      event_uri => sub {
-        my ($events) = @_;
-        my $vp = $_{viewport};
-        my %args = map{ $vp->event_id_for($_) => $events->{$_} } keys %$events;
-        $vp->ctx->req->uri_with(\%args);
-      },
-    );
-  };
+# for local() for fragment wrap
+our ($next_call, $fragment_args, $current_widget, $do_render, $new_args);
 
-  overrides default_base => sub { ('Reaction::UI::Widget') };
+after 'do_import' => sub {
+  my ($self, $package) = @_;
+  Devel::Declare->install_declarator(
+    $package, 'fragment', DECLARE_NAME,
+    sub { },
+    sub {
+      WidgetClass->handle_fragment(@_);
+    }
+  );
+};
 
-  implements handle_fragment => as {
-    my ($self, $name, $proto, $code) = @_;
+after 'setup_and_cleanup' => sub {
+  my ($self, $package) = @_;
+  {
+    no strict 'refs';
+    delete ${"${package}::"}{'fragment'};
+  }
+  #Devel::Declare->teardown_for($package);
+};
+override exports_for_package => sub {
+  my ($self, $package) = @_;
+  return (super(),
+    over => sub {
+      my ($collection) = @_;
+      confess "too many args, should be: over \$collection" if @_ > 1;
+      _OVER->new(collection => $collection);
+    },
+    render => sub {
+      my ($name, $over) = @_;
+
+      my $sig = "should be: render 'name' or render 'name' => over \$coll";
+      if (!defined $name) { confess "name undefined: $sig"; }
+      if (ref $name) { confess "name not string: $sig"; }
+      if (defined $over && !(blessed($over) && $over->isa(_OVER))) {
+        confess "invalid args after name, $sig";
+      }
+      $do_render->($package, $current_widget, $name, $over);
+    },
+    arg => sub {
+      my ($name, $value) = @_;
+
+      my $sig = "should be: arg 'name' => \$value";
+      if (@_ < 2) {
+        $name ||= 'undef';
+        $value ||= 'undef';
+        confess "Not enough arguments, $sig, got: $name => $value";
+      }
+      if (!defined $name) { confess "name undefined, $sig"; }
+      if (ref $name) { confess "name is not a string, $sig"; }
+
+      $new_args->{$name} = $value;
+    },
+    localized => sub {
+      my($value) = @_;
+      return $_{self}->view->localize($value);
+    },
+    call_next => sub {
+      confess "args passed, should be just call_next; or call_next();"
+        if @_;
+      $next_call->(@$fragment_args);
+    },
+    event_id => sub {
+      my ($name) = @_;
+      $_{viewport}->event_id_for($name);
+    },
+    event_uri => sub {
+      my ($events) = @_;
+      my $vp = $_{viewport};
+      my %args = map{ $vp->event_id_for($_) => $events->{$_} } keys %$events;
+      $vp->ctx->req->uri_with(\%args);
+    },
+    attrs => sub {
+      my ($attrs) = @_;
+      return join(' ', map {
+        my $text = $attrs->{$_};
+        for ($text) {
+            s/&/&amp;/g;
+            s/</&lt;/g;
+            s/>/&gt;/g;
+            s/"/&quot;/g;
+        }
+        qq{$_="${text}"};
+      } keys %$attrs);
+    },
+    implements => sub {
+      my ($name, $sub) = @_;
+      $package->meta->add_method($name, $sub);
+    },
+  );
+};
+override default_base => sub { ('Reaction::UI::Widget') };
+sub handle_fragment {
+  my ($self, $name, $proto, $code) = @_;
 #warn ($self, $name, $code);
-    return ("_fragment_${name}" => $self->wrap_as_fragment($code));
+  return ("_fragment_${name}" => $self->wrap_as_fragment($code));
+};
+sub wrap_as_fragment {
+  my ($self, $code) = @_;
+  return sub {
+    local $next_call;
+    if (ref $_[0] eq 'CODE') { # inside 'around' modifier
+      $next_call = shift;
+    }
+    local $fragment_args = \@_;
+
+    # $self->$method($do_render, \%_, $new_args)
+    local $current_widget = $_[0];
+    local $do_render = $_[1];
+    local *_ = \%{$_[2]};
+    local $_ = $_[2]->{_};
+    local $new_args = $_[3];
+    $code->(@_);
   };
+};
 
-  implements wrap_as_fragment => as {
-    my ($self, $code) = @_;
-    return sub {
-      local $next_call;
-      if (ref $_[0] eq 'CODE') { # inside 'around' modifier
-        $next_call = shift;
-      }
-      local $fragment_args = \@_;
-
-      # $self->$method($do_render, \%_, $new_args)
-      local $current_widget = $_[0];
-      local $do_render = $_[1];
-      local *_ = \%{$_[2]};
-      local $_ = $_[2]->{_};
-      local $new_args = $_[3];
-      $code->(@_);
-    };
-  };
+__PACKAGE__->meta->make_immutable;
 
-};
 
 1;