cleanup of hard to read layout_args code

[catagits/Reaction.git] / lib / Reaction / UI / ViewPort / Collection / Grid.pm

diff --git a/lib/Reaction/UI/ViewPort/Collection/Grid.pm b/lib/Reaction/UI/ViewPort/Collection/Grid.pm
index 329dc18..d24b96e 100644 (file)
--- a/lib/Reaction/UI/ViewPort/Collection/Grid.pm
+++ b/lib/Reaction/UI/ViewPort/Collection/Grid.pm
@@ -6,59 +6,27 @@ use aliased 'Reaction::InterfaceModel::Collection' => 'IM_Collection';
 use aliased 'Reaction::UI::ViewPort::Collection::Grid::Member';
 
 use namespace::clean -except => [ qw(meta) ];
+use MooseX::Types::Moose qw/ArrayRef HashRef Int/;
 extends 'Reaction::UI::ViewPort::Collection';
 
-
-
-has field_order     => ( is => 'ro', isa => 'ArrayRef', lazy_build => 1);
-has excluded_fields => ( is => 'ro', isa => 'ArrayRef', lazy_build => 1);
-has _raw_field_labels => (
-  is       => 'rw', isa => 'HashRef',
-  init_arg => 'field_labels',
-  default  => sub { {} },
-);
-has field_labels => (
-  is         => 'ro', isa => 'HashRef',
-  lazy_build => 1, init_arg => undef,
+with 'Reaction::UI::ViewPort::Role::FieldArgs';
+
+has member_action_count => (
+  is => 'rw',
+  isa => Int,
+  required => 1,
+  lazy => 1,
+  default => sub {
+    my $self = shift;
+    for (@{ $self->members }) {
+      my $protos = $_->action_prototypes;
+      return scalar(keys(%$protos));
+    }
+    return 1;
+  },
 );
 
-has computed_field_order => (is => 'ro', isa => 'ArrayRef', lazy_build => 1);
-
-####################################
 sub _build_member_class { Member };
-sub _build_field_labels {
-  my $self = shift;
-  my %labels = %{$self->_raw_field_labels};
-  for my $field ( @{$self->computed_field_order}) {
-    next if $labels{$field};
-    $labels{$field} = join(' ', map{ ucfirst } split('_', $field));
-  }
-  return \%labels;
-};
-sub _build_field_order { []; };
-sub _build_excluded_fields { []; };
-sub _build_computed_field_order {
-  my ($self) = @_;
-  my %excluded = map { $_ => undef } @{ $self->excluded_fields };
-  #treat _$field_name as private and exclude fields with no reader
-  my @names = grep { $_ !~ /^_/ && !exists($excluded{$_})} map { $_->name }
-    grep {
-      !($_->has_type_constraint &&
-        ($_->type_constraint->is_a_type_of('ArrayRef') ||
-         eval {$_->type_constraint->name->isa('Reaction::InterfaceModel::Collection')} ||
-         eval { $_->_isa_metadata->isa('Reaction::InterfaceModel::Collection') }
-        )
-       )  }
-      grep { defined $_->get_read_method }
-        $self->current_collection->member_type->parameter_attributes;
-
-  return $self->sort_by_spec($self->field_order, \@names);
-};
-
-before _build_members => sub {
-  my ($self) = @_;
-  $self->member_args->{computed_field_order} ||= $self->computed_field_order;
-};
 
 __PACKAGE__->meta->make_immutable;
 
@@ -82,10 +50,29 @@ homogenous collection of Reaction::InterfaceModel::Objects as a grid.
 
 =head2 excluded_fields
 
+List of field names to exclude.
+
+=head2 included_fields
+
+List of field names to include. If both C<included_fields> and
+C<excluded_fields> are specified the result is those fields which
+are in C<included_fields> and not in C<excluded_fields>.
+
+=head2 included_fields
+
+List of field names to include. If both C<included_fields> and
+C<excluded_fields> are specified the result is those fields which
+are in C<included_fields> and not in C<excluded_fields>.
+
+
 =head2 field_labels
 
+=head2 _raw_field_labels
+
 =head2 computed_field_order
 
+=head2 member_action_count
+
 =head1 INTERNAL METHODS
 
 These methods, although stable, are subject to change without notice. These are meant