diff options
author | groditi <groditi@03d0b0b2-0e1a-0410-a411-fdb2f4bd65d7> | 2009-12-14 21:03:04 +0000 |
---|---|---|
committer | groditi <groditi@03d0b0b2-0e1a-0410-a411-fdb2f4bd65d7> | 2009-12-14 21:03:04 +0000 |
commit | f1a74541734521d2b5013bcd577860d98ff727f5 (patch) | |
tree | 81446076153c98a8686df432673f0ee16bb80940 /lib/Reaction | |
parent | 26fa3b8aef9774f0ebd25fcbda6297cb263417e9 (diff) | |
parent | a722f3e3e226a7319f69722de01c06792b3cf2c3 (diff) | |
download | reaction-f1a74541734521d2b5013bcd577860d98ff727f5.tar.gz reaction-f1a74541734521d2b5013bcd577860d98ff727f5.zip |
r31712@martha (orig r1247): groditi | 2009-10-02 17:02:01 -0400
whoops compile error
r32396@martha (orig r1251): wreis | 2009-11-04 14:37:47 -0500
undo r1236
r32468@martha (orig r1254): edenc | 2009-11-16 16:48:46 -0500
r15979@debian (orig r1252): edenc | 2009-11-10 21:45:38 -0300
branching for clone-and-inherit workaround
r15980@debian (orig r1253): edenc | 2009-11-10 21:50:34 -0300
working around Moose glitch via parameterized roles
r32469@martha (orig r1255): edenc | 2009-11-16 17:06:25 -0500
added clone and inherit fix to Field::Mutable::HiddenArray
r32618@martha (orig r1256): edenc | 2009-12-04 16:35:06 -0500
fixed hash deref bug in the base controller
Diffstat (limited to 'lib/Reaction')
-rw-r--r-- | lib/Reaction/InterfaceModel/Reflector/DBIC.pm | 2 | ||||
-rw-r--r-- | lib/Reaction/UI/Controller.pm | 10 | ||||
-rw-r--r-- | lib/Reaction/UI/ViewPort/Field/Mutable/ChooseMany.pm | 4 | ||||
-rw-r--r-- | lib/Reaction/UI/ViewPort/Field/Mutable/File.pm | 5 | ||||
-rw-r--r-- | lib/Reaction/UI/ViewPort/Field/Mutable/HiddenArray.pm | 4 | ||||
-rw-r--r-- | lib/Reaction/UI/ViewPort/Field/Role/Mutable.pm | 29 | ||||
-rw-r--r-- | lib/Reaction/UI/ViewPort/Field/Role/Mutable/Simple.pm | 17 | ||||
-rw-r--r-- | lib/Reaction/UI/ViewPort/Role/Actions.pm | 10 |
8 files changed, 50 insertions, 31 deletions
diff --git a/lib/Reaction/InterfaceModel/Reflector/DBIC.pm b/lib/Reaction/InterfaceModel/Reflector/DBIC.pm index 38d9025..96bc262 100644 --- a/lib/Reaction/InterfaceModel/Reflector/DBIC.pm +++ b/lib/Reaction/InterfaceModel/Reflector/DBIC.pm @@ -153,7 +153,7 @@ sub reflect_schema { superclasses => [$base], ( @$roles ? (roles => $roles) : ()), ); - + # sources => undef, #default to qr/./ # sources => [], #default to nothing # sources => qr//, #DWIM, treated as [qr//] diff --git a/lib/Reaction/UI/Controller.pm b/lib/Reaction/UI/Controller.pm index 764ed4e..0ff1c2c 100644 --- a/lib/Reaction/UI/Controller.pm +++ b/lib/Reaction/UI/Controller.pm @@ -15,7 +15,7 @@ with( sub build_per_context_instance { my ($self, $c, @args) = @_; my $class = ref($self) || $self; - my $newself = $class->new($self->_application, {%$self, context => $c, @args}); + my $newself = $class->new($self->_application, {%{$self || {}}, context => $c, @args}); return $newself; } @@ -118,7 +118,7 @@ controller configuration. For example to override the default number of items in a CRUD list action: __PACKAGE__->config( - action => { + action => { list => { ViewPort => { per_page => 50 } }, } ); @@ -142,7 +142,7 @@ TODO: explain how next_action as a scalar gets converted to the redirect arrayre =head2 pop_viewport_to $vp Call L<Reaction::UI::FocusStack/pop_viewport> or -L<Reaction::UI::FocusStack/pop_viewport_to> on +L<Reaction::UI::FocusStack/pop_viewport_to> on the C<< $c->stash->{focus_stack} >>. =head2 redirect_to $c, $to, $captures, $args, $attrs @@ -168,7 +168,7 @@ $args if not supplied. =head2 make_context_closure The purpose of this method is to prevent memory leaks. -It weakens the context object, often denoted $c, and passes it as the +It weakens the context object, often denoted $c, and passes it as the first argument to the sub{} that is passed to the make_context_closure method. In other words, @@ -181,7 +181,7 @@ make_context_closure returns sub { $sub_you_gave_it->($weak_c, @_) To further expound up this useful construct consider code written before make_context_closure was created: - on_apply_callback => + on_apply_callback => sub { $self->after_search( $c, @_ ); } diff --git a/lib/Reaction/UI/ViewPort/Field/Mutable/ChooseMany.pm b/lib/Reaction/UI/ViewPort/Field/Mutable/ChooseMany.pm index 1b7a411..227ad33 100644 --- a/lib/Reaction/UI/ViewPort/Field/Mutable/ChooseMany.pm +++ b/lib/Reaction/UI/ViewPort/Field/Mutable/ChooseMany.pm @@ -11,11 +11,11 @@ use namespace::clean -except => [ qw(meta) ]; use MooseX::Types::Moose qw/ArrayRef/; extends 'Reaction::UI::ViewPort::Field'; -with 'Reaction::UI::ViewPort::Field::Role::Mutable'; +with 'Reaction::UI::ViewPort::Field::Role::Mutable' => { value_type => 'ArrayRef' }; with 'Reaction::UI::ViewPort::Field::Role::Choices'; #MUST BE HERE, BELOW THE 'does', OR THE TRIGGER WILL NOT HAPPEN! -has '+value' => (isa => ArrayRef); +#has '+value' => (isa => ArrayRef); around value => sub { my $orig = shift; diff --git a/lib/Reaction/UI/ViewPort/Field/Mutable/File.pm b/lib/Reaction/UI/ViewPort/Field/Mutable/File.pm index 4318eee..5c1b35d 100644 --- a/lib/Reaction/UI/ViewPort/Field/Mutable/File.pm +++ b/lib/Reaction/UI/ViewPort/Field/Mutable/File.pm @@ -6,9 +6,8 @@ use Reaction::Class; use namespace::clean -except => [ qw(meta) ]; extends 'Reaction::UI::ViewPort::Field'; -with 'Reaction::UI::ViewPort::Field::Role::Mutable::Simple'; - -has '+value' => (isa => Upload); +with 'Reaction::UI::ViewPort::Field::Role::Mutable::Simple' + => { value_type => Upload }; override apply_our_events => sub { my ($self, $events) = @_; diff --git a/lib/Reaction/UI/ViewPort/Field/Mutable/HiddenArray.pm b/lib/Reaction/UI/ViewPort/Field/Mutable/HiddenArray.pm index 77df3de..a54dfc5 100644 --- a/lib/Reaction/UI/ViewPort/Field/Mutable/HiddenArray.pm +++ b/lib/Reaction/UI/ViewPort/Field/Mutable/HiddenArray.pm @@ -6,9 +6,9 @@ use MooseX::Types::Moose qw/ArrayRef/; extends 'Reaction::UI::ViewPort::Field'; -with 'Reaction::UI::ViewPort::Field::Role::Mutable'; +with 'Reaction::UI::ViewPort::Field::Role::Mutable' => { value_type => 'ArrayRef' }; -has '+value' => (isa => ArrayRef); +#has '+value' => (isa => ArrayRef); around value => sub { my $orig = shift; diff --git a/lib/Reaction/UI/ViewPort/Field/Role/Mutable.pm b/lib/Reaction/UI/ViewPort/Field/Role/Mutable.pm index 94953f4..16ae93f 100644 --- a/lib/Reaction/UI/ViewPort/Field/Role/Mutable.pm +++ b/lib/Reaction/UI/ViewPort/Field/Role/Mutable.pm @@ -1,26 +1,46 @@ package Reaction::UI::ViewPort::Field::Role::Mutable; -use Reaction::Role; +use MooseX::Role::Parameterized; use aliased 'Reaction::InterfaceModel::Action'; use aliased 'Reaction::Meta::InterfaceModel::Action::ParameterAttribute'; use MooseX::Types::Moose qw/Int Str/; - use namespace::clean -except => [ qw(meta) ]; +=pod + +15:24 mst:» I'm not sure I understand why the +foo is overwriting my after'ed clear_value +15:24 mst:» but I would argue it shouldn't do that +15:25 @doy:» because has '+foo' is creating an entirely new attribute +15:25 @doy:» and just copying the meta-attribute's attributes into it +15:25 @doy:» so it's creating a new clearer sub in the subclass +15:27 rafl:» mst: for that case, i tend to just parameterize the role on whatever i might want to override in its attribute definitions + +=cut + +parameter value_type => ( + predicate => 'has_value_type' +); + +role { + +my $p = shift; + has model => (is => 'ro', isa => Action, required => 1); has attribute => (is => 'ro', isa => ParameterAttribute, required => 1); has value => ( - is => 'rw', lazy_build => 1, trigger_adopt('value'), + is => 'rw', lazy_build => 1, trigger => sub { shift->adopt_value }, clearer => 'clear_value', + $p->has_value_type? (isa => $p->value_type) : () ); + has needs_sync => (is => 'rw', isa => Int, default => 0); #should be bool? has message => (is => 'rw', isa => Str, clearer => 'clear_message'); has is_modified => ( #sould be bool? - is => 'ro', writer => '_set_modified', + is => 'ro', writer => '_set_modified', required => 1, default => 1, init_arg => undef ); @@ -111,6 +131,7 @@ sub sync_from_action { around accept_events => sub { ('value', shift->(@_)) }; +}; 1; diff --git a/lib/Reaction/UI/ViewPort/Field/Role/Mutable/Simple.pm b/lib/Reaction/UI/ViewPort/Field/Role/Mutable/Simple.pm index e19fa61..d8ca473 100644 --- a/lib/Reaction/UI/ViewPort/Field/Role/Mutable/Simple.pm +++ b/lib/Reaction/UI/ViewPort/Field/Role/Mutable/Simple.pm @@ -1,14 +1,23 @@ package Reaction::UI::ViewPort::Field::Role::Mutable::Simple; -use Reaction::Role; +use MooseX::Role::Parameterized; use aliased 'Reaction::UI::ViewPort::Field::Role::Mutable'; use namespace::clean -except => [ qw(meta) ]; -with Mutable; + +parameter value_type => ( + predicate => 'has_value_type' +); + +role { + +my $p = shift; + +with Mutable, $p->has_value_type ? { value_type => $p->value_type } : (); has value_string => ( - is => 'rw', lazy_build => 1, trigger_adopt('value_string'), + is => 'rw', lazy_build => 1, trigger => sub { shift->adopt_value_string }, clearer => 'clear_value', ); @@ -44,6 +53,6 @@ around accept_events => sub { ('value_string', shift->(@_)) }; around force_events => sub { (value_string => '', shift->(@_)) }; - +}; 1; diff --git a/lib/Reaction/UI/ViewPort/Role/Actions.pm b/lib/Reaction/UI/ViewPort/Role/Actions.pm index 9e57921..ceb9bfe 100644 --- a/lib/Reaction/UI/ViewPort/Role/Actions.pm +++ b/lib/Reaction/UI/ViewPort/Role/Actions.pm @@ -63,21 +63,11 @@ sub _build_actions { my $label = exists $proto->{label} ? $proto->{label} : $proto_name; my $layout = exists $proto->{layout} ? $proto->{layout} : 'uri'; - my $layout_args; - if( exists $proto->{layout_args} ){ - if( ref($proto->{layout_args}) eq 'CODE' ){ - $layout_args = $proto->{layout_args}->($target, $ctx); - } else { - $layout_args = $proto->{layout_args}; - } - } - my $action = Reaction::UI::ViewPort::URI->new( location => join ('-', $loc, 'action', $i++), uri => ( ref($uri) eq 'CODE' ? $uri->($target, $ctx) : $uri ), display => ( ref($label) eq 'CODE' ? $label->($target, $ctx) : $label ), layout => $layout, - ( ref($layout_args) eq 'HASH' ? (layout_args => $layout_args) : () ), ); push(@act, $action); } |