summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2011-02-21 15:38:37 -0600
committerJesse Luehrs <doy@tozt.net>2011-02-21 15:38:37 -0600
commit61839366b807e9e8f6818020508d765efed945b5 (patch)
tree010460a707c787a4ab2a8ba0feeaa6d07b192f72 /lib
parentb7f33292fd44a52fdb9f6145c43c717f6585d88c (diff)
downloadbread-board-declare-61839366b807e9e8f6818020508d765efed945b5.tar.gz
bread-board-declare-61839366b807e9e8f6818020508d765efed945b5.zip
handle attribute overriding better
Diffstat (limited to 'lib')
-rw-r--r--lib/MooseX/Bread/Board/Meta/Role/Attribute.pm11
-rw-r--r--lib/MooseX/Bread/Board/Meta/Role/Class.pm27
-rw-r--r--lib/MooseX/Bread/Board/Role/Object.pm1
3 files changed, 11 insertions, 28 deletions
diff --git a/lib/MooseX/Bread/Board/Meta/Role/Attribute.pm b/lib/MooseX/Bread/Board/Meta/Role/Attribute.pm
index 52e5a7c..2622e84 100644
--- a/lib/MooseX/Bread/Board/Meta/Role/Attribute.pm
+++ b/lib/MooseX/Bread/Board/Meta/Role/Attribute.pm
@@ -48,14 +48,17 @@ has constructor_name => (
predicate => 'has_constructor_name',
);
+has associated_service => (
+ is => 'rw',
+ isa => 'Bread::Board::Service',
+ predicate => 'has_associated_service',
+);
+
after attach_to_class => sub {
my $self = shift;
return unless $self->service;
- my $meta = $self->associated_class;
- my $attr_reader = $self->get_read_method;
-
my %params = (
associated_attribute => $self,
name => $self->name,
@@ -93,7 +96,7 @@ after attach_to_class => sub {
}
}
- $meta->add_service($service) if $service;
+ $self->associated_service($service) if $service;
};
after _process_options => sub {
diff --git a/lib/MooseX/Bread/Board/Meta/Role/Class.pm b/lib/MooseX/Bread/Board/Meta/Role/Class.pm
index e48c9f6..66c18ac 100644
--- a/lib/MooseX/Bread/Board/Meta/Role/Class.pm
+++ b/lib/MooseX/Bread/Board/Meta/Role/Class.pm
@@ -4,31 +4,12 @@ use Moose::Role;
use Bread::Board::Service;
use List::MoreUtils qw(any);
-has services => (
- traits => ['Array'],
- isa => 'ArrayRef[Bread::Board::Service]',
- default => sub { [] },
- handles => {
- add_service => 'push',
- services => 'elements',
- has_services => 'count',
- },
-);
-
-sub has_any_services {
- my $self = shift;
- return any { $_->has_services }
- grep { Moose::Util::does_role($_, __PACKAGE__) }
- map { $_->meta }
- $self->linearized_isa;
-}
-
sub get_all_services {
my $self = shift;
- return map { $_->services }
- grep { Moose::Util::does_role($_, __PACKAGE__) }
- map { $_->meta }
- $self->linearized_isa;
+ return map { $_->associated_service }
+ grep { $_->has_associated_service }
+ grep { Moose::Util::does_role($_, 'MooseX::Bread::Board::Meta::Role::Attribute') }
+ $self->get_all_attributes;
}
before superclasses => sub {
diff --git a/lib/MooseX/Bread/Board/Role/Object.pm b/lib/MooseX/Bread/Board/Role/Object.pm
index 6eaf87d..e99e5ed 100644
--- a/lib/MooseX/Bread/Board/Role/Object.pm
+++ b/lib/MooseX/Bread/Board/Role/Object.pm
@@ -13,7 +13,6 @@ after BUILD => sub {
my $self = shift;
my $meta = Class::MOP::class_of($self);
- return unless $meta->has_any_services;
for my $service ($meta->get_all_services) {
if ($service->isa('MooseX::Bread::Board::BlockInjection')) {