X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FRole%2FApplication%2FToInstance.pm;h=e9c15d1753fb0795426a5b0de162320c477e1673;hb=a1224bfcd884034efdee87d80f8779b62f6b2f9b;hp=258062b64df2cce4fd0235b58689c291605e7b83;hpb=778db3ac5dc266115efefdeb6dcbcf9b2444d9c9;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Meta/Role/Application/ToInstance.pm b/lib/Moose/Meta/Role/Application/ToInstance.pm
index 258062b..e9c15d1 100644
--- a/lib/Moose/Meta/Role/Application/ToInstance.pm
+++ b/lib/Moose/Meta/Role/Application/ToInstance.pm
@@ -4,36 +4,37 @@ use strict;
 use warnings;
 use metaclass;
 
-use Carp            'confess';
-use Scalar::Util    'blessed';
+use Scalar::Util 'blessed';
 
-use Data::Dumper;
-
-our $VERSION   = '0.01';
+our $VERSION   = '1.11';
+$VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
-use base 'Moose::Meta::Role::Application::ToClass';
+use base 'Moose::Meta::Role::Application';
 
-my $anon_counter = 0;
+__PACKAGE__->meta->add_attribute('rebless_params' => (
+    reader  => 'rebless_params',
+    default => sub { {} }
+));
 
 sub apply {
-    my ($self, $role, $object) = @_;
+    my ( $self, $role, $object, $args ) = @_;
 
-    # FIXME:
-    # We really should do this better, and
-    # cache the results of our efforts so
-    # that we don't need to repeat them.
+    my $obj_meta = Class::MOP::class_of($object) || 'Moose::Meta::Class';
 
-    my $pkg_name = __PACKAGE__ . "::__RUNTIME_ROLE_ANON_CLASS__::" . $anon_counter++;
-    eval "package " . $pkg_name . "; our \$VERSION = '0.00';";
-    die $@ if $@;
+    # This is a special case to handle the case where the object's metaclass
+    # is a Class::MOP::Class, but _not_ a Moose::Meta::Class (for example,
+    # when applying a role to a Moose::Meta::Attribute object).
+    $obj_meta = 'Moose::Meta::Class'
+        unless $obj_meta->isa('Moose::Meta::Class');
 
-    my $class = Moose::Meta::Class->initialize($pkg_name);
-    $class->superclasses(blessed($object));
+    my $class = $obj_meta->create_anon_class(
+        superclasses => [ blessed($object) ],
+        roles => [ $role, keys(%$args) ? ($args) : () ],
+        cache => 1,
+    );
 
-    bless $object => $class->name;   
-    
-    $self->SUPER::apply($role, $class); 
+    $class->rebless_instance( $object, %{ $self->rebless_params } );
 }
 
 1;
@@ -44,7 +45,7 @@ __END__
 
 =head1 NAME
 
-Moose::Meta::Role::Application::ToInstance
+Moose::Meta::Role::Application::ToInstance - Compose a role into an instance
 
 =head1 DESCRIPTION
 
@@ -58,13 +59,13 @@ Moose::Meta::Role::Application::ToInstance
 
 =item B<apply>
 
+=item B<rebless_params>
+
 =back
 
 =head1 BUGS
 
-All complex software has bugs lurking in it, and this module is no
-exception. If you find a bug please either email me, or add the bug
-to cpan-RT.
+See L<Moose/BUGS> for details on reporting bugs.
 
 =head1 AUTHOR
 
@@ -72,7 +73,7 @@ Stevan Little E<lt>stevan@iinteractive.comE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2006-2008 by Infinity Interactive, Inc.
+Copyright 2006-2010 by Infinity Interactive, Inc.
 
 L<http://www.iinteractive.com>