X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FReaction%2FUI%2FViewPort%2FField.pm;h=f6da89546ecdfd50adbd95541c8dac7cb1c0da39;hb=87b8ba852e9d46795d7540086884a86326949321;hp=1712c75167fc3ce4390c5afeca1b11d97ef96150;hpb=664d660c64b882714d87f3a8dc7491723042ae0c;p=catagits%2FReaction.git

diff --git a/lib/Reaction/UI/ViewPort/Field.pm b/lib/Reaction/UI/ViewPort/Field.pm
index 1712c75..f6da895 100644
--- a/lib/Reaction/UI/ViewPort/Field.pm
+++ b/lib/Reaction/UI/ViewPort/Field.pm
@@ -1,103 +1,70 @@
 package Reaction::UI::ViewPort::Field;
 
 use Reaction::Class;
+use aliased 'Reaction::InterfaceModel::Object';
+use aliased 'Reaction::Meta::InterfaceModel::Object::ParameterAttribute';
 
 class Field is 'Reaction::UI::ViewPort', which {
 
-  has name => (
-    isa => 'Str', is => 'rw', required => 1
-  );
+  has value        => (is => 'rw', lazy_build => 1);
+  has name         => (is => 'rw', isa => 'Str', lazy_build => 1);
+  has label        => (is => 'rw', isa => 'Str', lazy_build => 1);
+  has value_string => (is => 'rw', isa => 'Str', lazy_build => 1);
 
-  has action => (
-    isa => 'Reaction::InterfaceModel::Action',
-    is => 'ro', required => 0, predicate => 'has_action',
-  );
+  has model     => (is => 'ro', isa => Object,             required => 1);
+  has attribute => (is => 'ro', isa => ParameterAttribute, required => 1);
 
-  has attribute => (
-    isa => 'Reaction::Meta::InterfaceModel::Action::ParameterAttribute',
-    is => 'ro', predicate => 'has_attribute',
-  );
-
-  has value => (
-    is => 'rw', lazy_build => 1, trigger_adopt('value'),
-    clearer => 'clear_value',
-  );
-
-  has needs_sync => (
-    isa => 'Int', is => 'rw', default => 0
-  );
-
-  has label => (isa => 'Str', is => 'rw', lazy_build => 1);
-
-  has message => (
-    isa => 'Str', is => 'rw', required => 1, default => sub { '' }
-  );
-
-  implements BUILD => as {
-    my ($self) = @_;
-    if (!$self->has_attribute != !$self->has_action) {
-      confess "Should have both action and attribute or neither";
-    }
-  };
+  implements _build_name => as { shift->attribute->name };
 
   implements _build_label => as {
-    my ($self) = @_;
-    my $label = join(' ', map { ucfirst } split('_', $self->name));
-    # print STDERR "Field " . $self->name . " has label '$label'\n";
-    return $label;
+    join(' ', map { ucfirst } split('_', shift->name));
   };
 
   implements _build_value => as {
     my ($self) = @_;
-    if ($self->has_attribute) {
-      my $reader = $self->attribute->get_read_method;
-      my $predicate = $self->attribute->predicate;
-      if (!$predicate || $self->action->$predicate) {
-        return $self->action->$reader;
-      }
-    }
-    return '';
+    my $reader = $self->attribute->get_read_method;
+    return $self->model->$reader;
   };
 
-  implements adopt_value => as {
+  implements _model_has_value => as {
     my ($self) = @_;
-    $self->needs_sync(1) if $self->has_attribute;
+    my $predicate = $self->attribute->predicate;
+
+    if (!$predicate || $self->model->$predicate
+        || ($self->attribute->is_lazy
+            && !$self->attribute->is_lazy_fail)
+      ) {
+      # either model attribute has a value now or can build it
+      return 1;
+    }
+    return 0;
   };
 
-  implements value_string => as { shift->value };
-
-  implements sync_to_action => as {
+  implements _build_value_string => as {
     my ($self) = @_;
-    return unless $self->needs_sync && $self->has_attribute && $self->has_value;
-    my $attr = $self->attribute;
-    if (my $tc = $attr->type_constraint) {
-      my $value = $self->value;
-      if ($tc->has_coercion) {
-        $value = $tc->coercion->coerce($value);
-      }
-      my $error = $tc->validate($self->value);
-      if (defined $error) {
-        $self->message($error);
-        return;
-      }
-    }
-    my $writer = $attr->get_write_method;
-    confess "No writer for attribute" unless defined($writer);
-    $self->action->$writer($self->value);
-    $self->needs_sync(0);
+    # XXX need the defined test because the IM lazy builds from
+    # the model and DBIC can have nullable fields and DBIC doesn't
+    # have a way to tell us that doesn't force value inflation (extra
+    # SELECTs for belongs_to) so basically we're screwed.
+    return ($self->_model_has_value && defined($self->value)
+              ? $self->_value_string_from_value
+              : $self->_empty_string_value);
   };
 
-  implements sync_from_action => as {
-    my ($self) = @_;
-    return unless !$self->needs_sync && $self->has_attribute;
-    $self->message($self->action->error_for($self->attribute)||'');
+  implements _value_string_from_value => as {
+    shift->value;
   };
 
-  override accept_events => sub { ('value', super()) };
+  implements _empty_string_value => as { '' };
+
+  implements value_is_required => as {
+    shift->attribute->is_required;
+  };
 
 };
 
 1;
+__END__;
 
 =head1 NAME
 
@@ -105,59 +72,19 @@ Reaction::UI::ViewPort::Field
 
 =head1 DESCRIPTION
 
-This viewport is the base class for all field types.
-
 =head1 ATTRIBUTES
 
-=head2 name
-
-=head2 action
-
-L<Reaction::InterfaceModel::Action>
+=head2 model
 
 =head2 attribute
 
-L<Reaction::Meta::InterfaceModel::Action::ParameterAttribute>
-
 =head2 value
 
-=head2 needs_sync
+=head2 name
 
 =head2 label
 
-User friendly label, by default is based on the name.
-
-=head2 message
-
-Optional string relating to the field.
-
-=head1 SEE ALSO
-
-=head2 L<Reaction::UI::ViewPort>
-
-=head2 L<Reaction::UI::ViewPort::DisplayField>
-
-=head2 L<Reaction::UI::ViewPort::Field::Boolean>
-
-=head2 L<Reaction::UI::ViewPort::Field::ChooseMany>
-
-=head2 L<Reaction::UI::ViewPort::Field::ChooseOne>
-
-=head2 L<Reaction::UI::ViewPort::Field::DateTime>
-
-=head2 L<Reaction::UI::ViewPort::Field::File>
-
-=head2 L<Reaction::UI::ViewPort::Field::HiddenArray>
-
-=head2 L<Reaction::UI::ViewPort::Field::Number>
-
-=head2 L<Reaction::UI::ViewPort::Field::Password>
-
-=head2 L<Reaction::UI::ViewPort::Field::String>
-
-=head2 L<Reaction::UI::ViewPort::Field::Text>
-
-=head2 L<Reaction::UI::ViewPort::Field::TimeRange>
+=head2 value_string
 
 =head1 AUTHORS