--- trunk/lib/Strix/View/User.pm 2008/07/10 21:17:43 91 +++ trunk/lib/Frey/Web/Item.pm 2008/07/16 14:17:46 143 @@ -1,69 +1,62 @@ -package Strix::View::User; +package Frey::Web::Item; use Data::Dump qw/dump/; use Carp qw/carp/; -use metaclass 'Moose::Meta::Class' => ( - attribute_metaclass => 'Continuity::Meta::Attribute::FormField' -); - use Moose; - -extends 'Continuity::Widget'; +extends 'Frey'; +with 'Frey::Web::Field'; +with 'Frey::Web::Layout'; #with 'BonusTypes'; -sub edit_delete_buttons { - my $self = shift; +use Moose::Util::TypeConstraints; - return unless $self->_fey; +enum 'Render_as' => qw( view edit none ); +has render_as => ( is => 'rw', isa => 'Render_as', required => 1, default => 'view' ); - $self->add_button( 'Edit' => sub { - $self->remove_button( 'Delete' ); - $self->rename_button( 'Edit' => 'Save' ); - my $out = $self->render_edit; - my $f = $self->next($out); - my $hash = $self->set_from_hash($f); - $self->_fey->update( %$hash ); - $self->rename_button( 'Save' => 'Edit' ); - $self->delete_button; - }); - $self->delete_button; -} +has fey => ( + is => 'rw', + isa => 'Object', # FIXME Strix::User? +# required => 1, # XXX if we require it we can't have Add form +); -sub delete_button { - my $self = shift; - $self->add_button('Delete' => sub { - print STDERR "delete ID @{[$self->id]}!\n"; - $self->_fey->delete; - $self->next("Deleted id @{[$self->id]}!"); - $self->render_as( 'deleted' ); - Strix::Schema->ClearObjectCaches(); # XXX important! - }); -} +has fey_class => ( + is => 'rw', + isa => 'Str', + required => 1, +); -sub main { - my ( $self ) = @_; +has 'display_columns' => ( + is => 'rw', + isa => 'ArrayRef[Str]', + lazy_build => 1, +); - if ( ! $self->_fey ) { - $self->add_button( 'Add' => sub { - my $f = shift; - my $hash = $self->set_from_hash($f); - delete( $hash->{id} ); # FIXME clear primary key - my $u = Strix::User->insert( %$hash ); - warn "Inserted ",$u->id; - # XXX store object for later - $self->_fey( $u ); - # put ID in widget, so that it know it's not new - $self->id( $u->id ); - $self->render_as( 'view' ); - $self->edit_delete_buttons; - $self->remove_button( 'Add' ); - }); +sub set_from_hash { + my ($self, $f) = @_; + my $attrmap = $self->fey->meta->get_attribute_map if $self->fey; + my $hash; + foreach my $name ( @{ $self->display_columns } ) { + my $field_name = $self->field_name($name); + if(defined $f->{$field_name}) { + $hash->{ $name } = $f->{$field_name}; + + if ( defined $attrmap->{$name} ) { + my $writer = $attrmap->{$name}->get_write_method; + $self->fey->$writer($f->{$field_name}); + } else { + warn "can't store value back into fey->$name"; + } + } } + warn "# set_from_hash ", $self->uuid," produced hash = ",dump( $hash ) if $hash; + return $hash; +} - $self->edit_delete_buttons; +sub main { + my ( $self ) = @_; - warn "# ",$self->uuid, " [", $self->id ,"] _fey = ",dump( $self->_fey ); + warn "# item ",$self->uuid, " fey = ",dump( $self->fey ) if $self->debug; while(1) { my $out; @@ -79,100 +72,40 @@ warn ">>> ",length($out),"\n"; my $f = $self->next($out); $self->set_from_hash($f); - $self->exec_buttons($f); + $self->exec_callbacks($f); } }; -sub render_edit { - my $self = shift; - warn "# render_edit ",$self->id," ",$self->uuid, " ", $self->_layout, "\n"; - my $out = $self->render_iterator( sub { - #warn "# edit render_iterator ",dump( @_ ); - my ( $name, $field_name, $label, $val ) = @_; - return if $name =~ /^_/; - return qq| - - $label - - - - - | if $self->_layout eq 'table'; - return qq| -
- -
- -
-
- |; - }); - $self->render_wrapper_class( $out, 'editform' ); -} - -sub render_view { - my $self = shift; - warn "# render_view ",$self->id," ",$self->uuid," ", $self->_layout,"\n"; - my $out = $self->render_iterator( sub { - #warn "# view render_iterator ",dump( @_ ); - my ( $name, $field_name, $label, $val ) = @_; - return if $name =~ /^_/; - return qq|$label$val| if $self->_layout eq 'table'; - return qq| -
-
$label
-
$val
-
- - |; - }); - $self->render_wrapper_class( $out, 'view' ); +sub field_value { + my ( $self, $name ) = @_; + my $val = ''; + $val = $self->fey->$name if $self->fey && $self->fey->can($name); + return $val; } -sub render_wrapper_class { - my ( $self, $out, $class ) = @_; - if ( length($out) == 0 ) { - carp "no output, skipping"; - return ''; - } - $out =~ s/^\t+//mg; # XXX compress output - return $out . qq|| . $self->render_buttons . qq|| if $self->_layout eq 'table'; - return qq|
| . $out . $self->render_buttons . qq|
|; +sub field_label { + my ( $self, $name ) = @_; + my $label = ucfirst($name); + return $label; } -use Data::Dump qw/dump/; - -use Strix::User; -my $m = Strix::User->meta; - -foreach ( $m->get_attribute_list ) { - my $attr = $m->get_attribute( $_ ); - warn ">> $_\n"; - - # FIXME primary key would have to be read-only! - - has $_ => ( - is => $attr->_is_metadata, - label => ucfirst($_), - required => $attr->is_required, - ); +sub _build_display_columns { + my $self = shift; -} + my $m = $self->fey_class->meta; -has _fey => ( - is => 'rw', - label => 'Fey object', - isa => 'Strix::User', -); + my @cols; -use Moose::Util::TypeConstraints; + foreach ( $m->get_attribute_list ) { + my $attr = $m->get_attribute( $_ ); + warn "_build_display_columns $_\n" if $self->debug; + # FIXME primary key would have to be read-only! + push @cols, $_; + } -enum 'Layouts' => qw( div table ); + warn "## display_columns ",dump( @cols ) if $self->debug; -has _layout => ( - is => 'rw', - isa => 'Layouts', - default => 'div', -); + return \@cols; +} 1;