X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoo%2FRole.pm;h=21b304af78c20ab34cc7fc7bb6edc1cdbad11b3b;hb=e18659958c8a6bf3fc60b9531e40acbea275076f;hp=256b191e3bb1a698b9492b8cf2e0ea7bbc8338ae;hpb=a668eb674ab882c664d5b5f7e92e850a0bcb6afa;p=gitmo%2FMoo.git diff --git a/lib/Moo/Role.pm b/lib/Moo/Role.pm index 256b191..21b304a 100644 --- a/lib/Moo/Role.pm +++ b/lib/Moo/Role.pm @@ -2,13 +2,18 @@ package Moo::Role; use strictures 1; use Moo::_Utils; +use Role::Tiny (); use base qw(Role::Tiny); +our $VERSION = '1.003001'; +$VERSION = eval $VERSION; + require Moo::sification; BEGIN { *INFO = \%Role::Tiny::INFO } our %INFO; +our %APPLY_DEFAULTS; sub _install_tracked { my ($target, $name, $code) = @_; @@ -20,18 +25,30 @@ sub import { my $target = caller; my ($me) = @_; strictures->import; - return if $INFO{$target}; # already exported into this package - $INFO{$target} = {}; + if ($Moo::MAKERS{$target} and $Moo::MAKERS{$target}{is_class}) { + die "Cannot import Moo::Role into a Moo class"; + } + $INFO{$target} ||= {}; # get symbol table reference - my $stash = do { no strict 'refs'; \%{"${target}::"} }; + my $stash = _getstash($target); _install_tracked $target => has => sub { - my ($name, %spec) = @_; - ($INFO{$target}{accessor_maker} ||= do { - require Method::Generate::Accessor; - Method::Generate::Accessor->new - })->generate_method($target, $name, \%spec); - push @{$INFO{$target}{attributes}||=[]}, $name, \%spec; - $me->_maybe_reset_handlemoose($target); + my $name_proto = shift; + my @name_proto = ref $name_proto eq 'ARRAY' ? @$name_proto : $name_proto; + if (@_ % 2 != 0) { + require Carp; + Carp::croak("Invalid options for " . join(', ', map "'$_'", @name_proto) + . " attribute(s): even number of arguments expected, got " . scalar @_) + } + my %spec = @_; + foreach my $name (@name_proto) { + my $spec_ref = @name_proto > 1 ? +{%spec} : \%spec; + ($INFO{$target}{accessor_maker} ||= do { + require Method::Generate::Accessor; + Method::Generate::Accessor->new + })->generate_method($target, $name, $spec_ref); + push @{$INFO{$target}{attributes}||=[]}, $name, $spec_ref; + $me->_maybe_reset_handlemoose($target); + } }; # install before/after/around subs foreach my $type (qw(before after around)) { @@ -49,6 +66,9 @@ sub import { $me->apply_roles_to_package($target, @_); $me->_maybe_reset_handlemoose($target); }; + return if $INFO{$target}{is_role}; # already exported into this package + $INFO{$target}{is_role} = 1; + *{_getglob("${target}::meta")} = $me->can('meta'); # grab all *non-constant* (stash slot is not a scalarref) subs present # in the symbol table and store their refaddrs (no need to forcibly # inflate constant subs into real subs) - also add '' to here (this @@ -63,6 +83,13 @@ sub import { } } +# duplicate from Moo::Object +sub meta { + require Moo::HandleMoose::FakeMetaClass; + my $class = ref($_[0])||$_[0]; + bless({ name => $class }, 'Moo::HandleMoose::FakeMetaClass'); +} + sub unimport { my $target = caller; _unimport_coderefs($target, $INFO{$target}); @@ -83,10 +110,12 @@ sub _inhale_if_moose { and ( $INC{"Moose.pm"} and $meta = Class::MOP::class_of($role) + and $meta->isa('Moose::Meta::Role') ) or ( - $INC{"Mouse.pm"} + Mouse::Util->can('find_meta') and $meta = Mouse::Util::find_meta($role) + and $meta->isa('Mouse::Meta::Role') ) ) { $INFO{$role}{methods} = { @@ -100,14 +129,33 @@ sub _inhale_if_moose { $INFO{$role}{requires} = [ $meta->get_required_method_list ]; $INFO{$role}{attributes} = [ map +($_ => do { - my $spec = { %{$meta->get_attribute($_)} }; + my $attr = $meta->get_attribute($_); + my $is_mouse = $meta->isa('Mouse::Meta::Role'); + my $spec = { %{ $is_mouse ? $attr : $attr->original_options } }; + if ($spec->{isa}) { - require Moose::Util::TypeConstraints; - my $tc = Moose::Util::TypeConstraints::find_or_create_isa_type_constraint($spec->{isa}); + + my $get_constraint = do { + my $pkg = $is_mouse + ? 'Mouse::Util::TypeConstraints' + : 'Moose::Util::TypeConstraints'; + _load_module($pkg); + $pkg->can('find_or_create_isa_type_constraint'); + }; + + my $tc = $get_constraint->($spec->{isa}); my $check = $tc->_compiled_type_constraint; - $spec->{isa} = sub { &$check or die "Type constraint failed for $_[0]" }; + + $spec->{isa} = sub { + &$check or die "Type constraint failed for $_[0]" + }; + if ($spec->{coerce}) { - $spec->{coerce} = $tc->coercion->_compiled_type_coercion; + + # Mouse has _compiled_type_coercion straight on the TC object + $spec->{coerce} = $tc->${\( + $tc->can('coercion')||sub { $_[0] } + )}->_compiled_type_coercion; } } $spec; @@ -129,29 +177,30 @@ sub _inhale_if_moose { } require Class::Method::Modifiers if @$mods; $INFO{$role}{inhaled_from_moose} = 1; + $INFO{$role}{is_role} = 1; } } sub _maybe_make_accessors { - my ($self, $role, $target) = @_; + my ($self, $target, $role) = @_; my $m; - if ($INFO{$role}{inhaled_from_moose} + if ($INFO{$role} && $INFO{$role}{inhaled_from_moose} or $INC{"Moo.pm"} and $m = Moo->_accessor_maker_for($target) and ref($m) ne 'Method::Generate::Accessor') { - $self->_make_accessors($role, $target); + $self->_make_accessors($target, $role); } } sub _make_accessors_if_moose { - my ($self, $role, $target) = @_; - if ($INFO{$role}{inhaled_from_moose}) { - $self->_make_accessors($role, $target); + my ($self, $target, $role) = @_; + if ($INFO{$role} && $INFO{$role}{inhaled_from_moose}) { + $self->_make_accessors($target, $role); } } sub _make_accessors { - my ($self, $role, $target) = @_; + my ($self, $target, $role) = @_; my $acc_gen = ($Moo::MAKERS{$target}{accessor} ||= do { require Method::Generate::Accessor; Method::Generate::Accessor->new @@ -167,30 +216,37 @@ sub _make_accessors { } } +sub role_application_steps { + qw(_handle_constructor _maybe_make_accessors), + $_[0]->SUPER::role_application_steps; +} + sub apply_roles_to_package { my ($me, $to, @roles) = @_; - $me->_inhale_if_moose($_) for @roles; + foreach my $role (@roles) { + $me->_inhale_if_moose($role); + die "${role} is not a Moo::Role" unless $INFO{$role}; + } $me->SUPER::apply_roles_to_package($to, @roles); } sub apply_single_role_to_package { my ($me, $to, $role) = @_; $me->_inhale_if_moose($role); - $me->_handle_constructor($to, $INFO{$role}{attributes}); - $me->_maybe_make_accessors($role, $to); + die "${role} is not a Moo::Role" unless $INFO{$role}; $me->SUPER::apply_single_role_to_package($to, $role); } sub create_class_with_roles { my ($me, $superclass, @roles) = @_; - my $new_name = join( - '__WITH__', $superclass, my $compose_name = join '__AND__', @roles - ); + my ($new_name, $compose_name) = $me->_composite_name($superclass, @roles); return $new_name if $Role::Tiny::COMPOSED{class}{$new_name}; - $me->_inhale_if_moose($_) for @roles; + foreach my $role (@roles) { + $me->_inhale_if_moose($role); + } my $m; if ($INC{"Moo.pm"} @@ -207,23 +263,61 @@ sub create_class_with_roles { $me->SUPER::create_class_with_roles($superclass, @roles); foreach my $role (@roles) { - die "${role} is not a Role::Tiny" unless my $info = $INFO{$role}; + die "${role} is not a Role::Tiny" unless $INFO{$role}; } - $Moo::MAKERS{$new_name} = {}; + $Moo::MAKERS{$new_name} = {is_class => 1}; - $me->_handle_constructor( - $new_name, [ map @{$INFO{$_}{attributes}||[]}, @roles ], $superclass - ); + $me->_handle_constructor($new_name, $_) for @roles; return $new_name; } +sub apply_roles_to_object { + my ($me, $object, @roles) = @_; + my $new = $me->SUPER::apply_roles_to_object($object, @roles); + + my $apply_defaults = $APPLY_DEFAULTS{ref $new} ||= do { + my %attrs = map { @{$INFO{$_}{attributes}||[]} } @roles; + + if ($INC{'Moo.pm'} + and keys %attrs + and my $con_gen = Moo->_constructor_maker_for(ref $new) + and my $m = Moo->_accessor_maker_for(ref $new)) { + require Sub::Quote; + + my $specs = $con_gen->all_attribute_specs; + + my $assign = ''; + my %captures; + foreach my $name ( keys %attrs ) { + my $spec = $specs->{$name}; + if ($m->has_eager_default($name, $spec)) { + my ($has, $has_cap) + = $m->generate_simple_has('$_[0]', $name, $spec); + my ($code, $pop_cap) + = $m->generate_use_default('$_[0]', $name, $spec, $has); + + $assign .= $code; + @captures{keys %$has_cap, keys %$pop_cap} + = (values %$has_cap, values %$pop_cap); + } + } + Sub::Quote::quote_sub($assign, \%captures); + } + else { + sub {}; + } + }; + $new->$apply_defaults; + return $new; +} + sub _composable_package_for { my ($self, $role) = @_; my $composed_name = 'Role::Tiny::_COMPOSABLE::'.$role; return $composed_name if $Role::Tiny::COMPOSED{role}{$composed_name}; - $self->_make_accessors_if_moose($role, $composed_name); + $self->_make_accessors_if_moose($composed_name, $role); $self->SUPER::_composable_package_for($role); } @@ -233,14 +327,15 @@ sub _install_single_modifier { } sub _handle_constructor { - my ($me, $to, $attr_info, $superclass) = @_; + my ($me, $to, $role) = @_; + my $attr_info = $INFO{$role} && $INFO{$role}{attributes}; return unless $attr_info && @$attr_info; if ($INFO{$to}) { push @{$INFO{$to}{attributes}||=[]}, @$attr_info; } else { # only fiddle with the constructor if the target is a Moo class if ($INC{"Moo.pm"} - and my $con = Moo->_constructor_maker_for($to, $superclass)) { + and my $con = Moo->_constructor_maker_for($to)) { # shallow copy of the specs since the constructor will assign an index $con->register_attribute_specs(map ref() ? { %$_ } : $_, @$attr_info); } @@ -269,7 +364,7 @@ Moo::Role - Minimal Object Orientation support for Roles 1; -else where +And elsewhere: package Some::Class; @@ -302,6 +397,10 @@ imported by this module. Declares an attribute for the class to be composed into. See L for all options. +=head1 SUPPORT + +See L for support and contact information. + =head1 AUTHORS See L for authors. @@ -309,5 +408,3 @@ See L for authors. =head1 COPYRIGHT AND LICENSE See L for the copyright and license. - -=cut