handle caching of anon classes better, when role/class params are used

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

diff --git a/lib/Moose/Meta/Role.pm b/lib/Moose/Meta/Role.pm
index 4e6eee8..af4c774 100644 (file)
--- a/lib/Moose/Meta/Role.pm
+++ b/lib/Moose/Meta/Role.pm
@@ -582,10 +582,45 @@ sub is_anon_role     { shift->is_anon(@_)     }
 sub _anon_cache_key {
     my $class = shift;
     my %options = @_;
+
+    # XXX fix this duplication (see MMC::_anon_cache_key
+    my $roles = Data::OptList::mkopt(($options{roles} || []), {
+        moniker  => 'role',
+        val_test => sub { ref($_[0]) eq 'HASH' },
+    });
+
+    my @role_keys;
+    for my $role_spec (@$roles) {
+        my ($role, $params) = @$role_spec;
+        $params = { %$params };
+
+        my $key = blessed($role) ? $role->name : $role;
+
+        if ($params && %$params) {
+            my $alias    = delete $params->{'-alias'}
+                        || delete $params->{'alias'}
+                        || {};
+            my $excludes = delete $params->{'-excludes'}
+                        || delete $params->{'excludes'}
+                        || [];
+            $excludes = [$excludes] unless ref($excludes) eq 'ARRAY';
+
+            if (%$params) {
+                warn "Roles with parameters cannot be cached. Consider "
+                   . "applying the parameters before calling "
+                   . "create_anon_class, or using 'weaken => 0' instead";
+                return;
+            }
+
+            $key .= '<' . join('+', 'a', join('%', %$alias),
+                                    'e', join('%', @$excludes)) . '>';
+        }
+
+        push @role_keys, $key;
+    }
+
     # Makes something like Role|Role::1
-    return join '=' => (
-        join( '|', sort @{ $options{roles} || [] } ),
-    );
+    return join('|', @role_keys);
 }
 
 #####################################################################