Add role_for_combination to fix prole-role combination

[gitmo/MooseX-Role-Parameterized.git] / lib / MooseX / Role / Parameterized / Meta / Role / Parameterizable.pm

diff --git a/lib/MooseX/Role/Parameterized/Meta/Role/Parameterizable.pm b/lib/MooseX/Role/Parameterized/Meta/Role/Parameterizable.pm
index c72c405..59529ee 100644 (file)
--- a/lib/MooseX/Role/Parameterized/Meta/Role/Parameterizable.pm
+++ b/lib/MooseX/Role/Parameterized/Meta/Role/Parameterizable.pm
@@ -59,10 +59,12 @@ sub construct_parameters {
 }
 
 sub generate_role {
-    my $self = shift;
+    my $self     = shift;
+    my %args     = @_;
 
-    my $parameters = @_ == 1 ? shift
-                             : $self->construct_parameters(@_);
+    my $parameters = blessed($args{parameters})
+                   ? $args{parameters}
+                   : $self->construct_parameters(%{ $args{parameters} });
 
     confess "A role generator is required to generate roles"
         unless $self->has_role_generator;
@@ -75,18 +77,32 @@ sub generate_role {
 
     $self->role_generator->($parameters,
         operating_on => $role,
+        consumer     => $args{consumer},
     );
 
     return $role;
 }
 
+sub role_for_combination {
+    my $self = shift;
+    my $parameters = shift;
+
+    return $self->generate_role(
+        parameters => $parameters,
+    );
+}
+
 sub apply {
-    my $self  = shift;
-    my $class = shift;
-    my %args  = @_;
+    my $self     = shift;
+    my $consumer = shift;
+    my %args     = @_;
+
+    my $role = $self->generate_role(
+        consumer   => $consumer,
+        parameters => \%args,
+    );
 
-    my $role = $self->generate_role(%args);
-    $role->apply($class, %args);
+    $role->apply($consumer, %args);
 }
 
 sub apply_parameterizable_role {