Checking in changes prior to tagging of version 0.40. Changelog diff is:

[gitmo/Mouse.git] / lib / Mouse / Meta / Role.pm

diff --git a/lib/Mouse/Meta/Role.pm b/lib/Mouse/Meta/Role.pm
index a3579b6..4c53da3 100644 (file)
--- a/lib/Mouse/Meta/Role.pm
+++ b/lib/Mouse/Meta/Role.pm
@@ -35,6 +35,13 @@ sub is_anon_role{
 
 sub get_roles { $_[0]->{roles} }
 
+sub calculate_all_roles {
+    my $self = shift;
+    my %seen;
+    return grep { !$seen{ $_->name }++ }
+           ($self, map  { $_->calculate_all_roles } @{ $self->get_roles });
+}
+
 sub get_required_method_list{
     return @{ $_[0]->{required_methods} };
 }
@@ -179,6 +186,8 @@ sub apply {
 
     my %args = (@_ == 1) ? %{ $_[0] } : @_;
 
+    my $instance;
+
     if($applicant->isa('Mouse::Meta::Class')){  # Application::ToClass
         $args{_to} = 'class';
     }
@@ -187,14 +196,12 @@ sub apply {
     }
     else{                                       # Appplication::ToInstance
         $args{_to} = 'instance';
+        $instance = $applicant;
 
-        my $metaclass = (Mouse::Util::class_of($applicant) || 'Mouse::Meta::Class')->create_anon_class(
-            superclasses => [ref $applicant],
+        $applicant = (Mouse::Util::class_of($instance) || 'Mouse::Meta::Class')->create_anon_class(
+            superclasses => [ref $instance],
             cache        => 1,
         );
-        bless $applicant, $metaclass->name; # rebless
-
-        $applicant = $metaclass;
     }
 
     if($args{alias} && !exists $args{-alias}){
@@ -224,6 +231,14 @@ sub apply {
     $self->_apply_methods($applicant, \%args);
     $self->_apply_modifiers($applicant, \%args);
     $self->_append_roles($applicant, \%args);
+
+
+    if(defined $instance){ # Application::ToInstance
+        # rebless instance
+        bless $instance, $applicant->name;
+        $applicant->_initialize_object($instance, $instance);
+    }
+
     return;
 }
 
@@ -306,6 +321,10 @@ __END__
 
 Mouse::Meta::Role - The Mouse Role metaclass
 
+=head1 VERSION
+
+This document describes Mouse version 0.40
+
 =head1 SEE ALSO
 
 L<Moose::Meta::Role>