revert r620

[catagits/Reaction.git] / lib / Reaction / UI / ViewPort / Object.pm

diff --git a/lib/Reaction/UI/ViewPort/Object.pm b/lib/Reaction/UI/ViewPort/Object.pm
index 9730b5f..4fa04d9 100644 (file)
--- a/lib/Reaction/UI/ViewPort/Object.pm
+++ b/lib/Reaction/UI/ViewPort/Object.pm
@@ -11,6 +11,7 @@ use aliased 'Reaction::UI::ViewPort::Field::DateTime';
 use aliased 'Reaction::UI::ViewPort::Field::RelatedObject';
 use aliased 'Reaction::UI::ViewPort::Field::Array';
 use aliased 'Reaction::UI::ViewPort::Field::Collection';
+use aliased 'Reaction::UI::ViewPort::Field::File';
 
 use aliased 'Reaction::InterfaceModel::Object' => 'IM_Object';
 
@@ -21,12 +22,12 @@ class Object is 'Reaction::UI::ViewPort', which {
   has model  => (is => 'ro', isa => IM_Object, required => 1);
   has fields => (is => 'ro', isa => 'ArrayRef', lazy_build => 1);
 
-  has field_args    => (is => 'ro');
+  has field_args    => (is => 'rw');
   has field_order   => (is => 'ro', isa => 'ArrayRef');
 
   has builder_cache   => (is => 'ro', isa => 'HashRef',  lazy_build => 1);
-  has ordered_fields  => (is => 'ro', isa => 'ArrayRef', lazy_build => 1);
   has excluded_fields => (is => 'ro', isa => 'ArrayRef', lazy_build => 1);
+  has computed_field_order => (is => 'ro', isa => 'ArrayRef', lazy_build => 1);
 
   implements BUILD => as {
     my ($self, $args) = @_;
@@ -42,7 +43,7 @@ class Object is 'Reaction::UI::ViewPort', which {
     my $obj  = $self->model;
     my $args = $self->has_field_args ? $self->field_args : {};
     my @fields;
-    for my $field_name (@{ $self->ordered_fields }) {
+    for my $field_name (@{ $self->computed_field_order }) {
       my $attr = $obj->meta->find_attribute_by_name($field_name);
       my $meth = $self->builder_cache->{$field_name} ||= $self->get_builder_for($attr);
       my $field = $self->$meth($attr, ($args->{$field_name} || {}));
@@ -51,7 +52,7 @@ class Object is 'Reaction::UI::ViewPort', which {
     return \@fields;
   };
 
-  implements _build_ordered_fields => as {
+  implements _build_computed_field_order => as {
     my ($self) = @_;
     my %excluded = map { $_ => undef } @{ $self->excluded_fields };
     #treat _$field_name as private and exclude fields with no reader
@@ -74,11 +75,13 @@ class Object is 'Reaction::UI::ViewPort', which {
       my $constraint = $attr->type_constraint;
       my $base_name = $constraint->name;
       my $tried_isa = 0;
+      my @tried;
     CONSTRAINT: while (defined($constraint)) {
         my $name = $constraint->name;
         $name = $attr->_isa_metadata if($name eq '__ANON__');
         if (eval { $name->can('meta') } && !$tried_isa++) {
           foreach my $class ($name->meta->class_precedence_list) {
+            push(@tried, $class);
             my $mangled_name = $class;
             $mangled_name =~ s/:+/_/g;
             my $builder = "_build_fields_for_type_${mangled_name}";
@@ -86,6 +89,7 @@ class Object is 'Reaction::UI::ViewPort', which {
           }
         }
         if (defined($name)) {
+          push(@tried, $name);
           unless (defined($base_name)) {
             $base_name = "(anon subtype of ${name})";
           }
@@ -97,7 +101,9 @@ class Object is 'Reaction::UI::ViewPort', which {
         $constraint = $constraint->parent;
       }
       if (!defined($constraint)) {
-        confess "Can't build field ${attr_name} of type ${base_name} without $builder method or _build_fields_for_type_<type> method for type or any supertype";
+        confess "Can't build field ${attr_name} of type ${base_name} without "
+                ."$builder method or _build_fields_for_type_<type> method "
+                ."for type or any supertype (tried ".join(', ', @tried).")";
       }
     } else {
       confess "Can't build field ${attr} without $builder method or type constraint";
@@ -138,7 +144,7 @@ class Object is 'Reaction::UI::ViewPort', which {
   };
 
   #XXX
-  implements _build_fields_for_type_Password => as { return };
+  implements _build_fields_for_type_Reaction_Types_Core_Password => as { return };
 
   implements _build_fields_for_type_Str => as {
     my ($self, $attr, $args) = @_;
@@ -146,12 +152,12 @@ class Object is 'Reaction::UI::ViewPort', which {
     $self->_build_simple_field(attribute => $attr, class => String, %$args);
   };
 
-  implements _build_fields_for_type_SimpleStr => as {
+  implements _build_fields_for_type_Reaction_Types_Core_SimpleStr => as {
     my ($self, $attr, $args) = @_;
     $self->_build_simple_field(attribute => $attr, class => String, %$args);
   };
 
-  implements _build_fields_for_type_DateTime => as {
+  implements _build_fields_for_type_Reaction_Types_DateTime_DateTime => as {
     my ($self, $attr, $args) = @_;
     $self->_build_simple_field(attribute => $attr, class => DateTime, %$args);
   };
@@ -167,6 +173,11 @@ class Object is 'Reaction::UI::ViewPort', which {
     $self->_build_simple_field(attribute => $attr, class => Array, %$args);
   };
 
+  implements _build_fields_for_type_File => as {
+    my ($self, $attr, $args) = @_;
+    $self->_build_simple_field(attribute => $attr, class => File, %$args);
+  };
+
   implements _build_fields_for_type_Reaction_InterfaceModel_Object => as {
     my ($self, $attr, $args) = @_;
     #XXX
@@ -181,3 +192,71 @@ class Object is 'Reaction::UI::ViewPort', which {
 };
 
 1;
+
+__END__;
+
+=head1 NAME
+
+Reaction::UI::ViewPort::Object
+
+=head1 DESCRIPTION
+
+=head1 ATTRIBUTES
+
+=head2 model
+
+=head2 fields
+
+=head2 field_args
+
+=head2 field_order
+
+=head2 builder_cache
+
+=head2 excluded_fields
+
+=head2 computed_field_order
+
+=head1 INTERNAL METHODS
+
+These methods, although stable, are subject to change without notice. These are meant
+to be used only by developers. End users should refrain from using these methods to
+avoid potential breakages.
+
+=head2 BUILD
+
+=head2 get_builder_for
+
+=head2 _build_simple_field
+
+=head2 _build_fields_for_type_Num
+
+=head2 _build_fields_for_type_Int
+
+=head2 _build_fields_for_type_Bool
+
+=head2 _build_fields_for_type_Password
+
+=head2 _build_fields_for_type_Str
+
+=head2 _build_fields_for_type_SimpleStr
+
+=head2 _build_fields_for_type_DateTime
+
+=head2 _build_fields_for_type_Enum
+
+=head2 _build_fields_for_type_ArrayRef
+
+=head2 _build_fields_for_type_Reaction_InterfaceModel_Object
+
+=head2 _build_fields_for_type_Reaction_InterfaceModel_Collection
+
+=head1 AUTHORS
+
+See L<Reaction::Class> for authors.
+
+=head1 LICENSE
+
+See L<Reaction::Class> for the license.
+
+=cut