Change BUGS so it always tells people to look at Moose/BUGS rather than telling them...

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

diff --git a/lib/Moose/Meta/Role/Application/ToInstance.pm b/lib/Moose/Meta/Role/Application/ToInstance.pm
index 258062b..f44c024 100644 (file)
--- a/lib/Moose/Meta/Role/Application/ToInstance.pm
+++ b/lib/Moose/Meta/Role/Application/ToInstance.pm
@@ -4,36 +4,48 @@ 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   = '0.93';
+$VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
 use base 'Moose::Meta::Role::Application::ToClass';
 
-my $anon_counter = 0;
+__PACKAGE__->meta->add_attribute('rebless_params' => (
+    reader  => 'rebless_params',
+    default => sub { {} }
+));
+
+my %ANON_CLASSES;
 
 sub apply {
     my ($self, $role, $object) = @_;
 
-    # FIXME:
-    # We really should do this better, and
-    # cache the results of our efforts so
-    # that we don't need to repeat them.
-
-    my $pkg_name = __PACKAGE__ . "::__RUNTIME_ROLE_ANON_CLASS__::" . $anon_counter++;
-    eval "package " . $pkg_name . "; our \$VERSION = '0.00';";
-    die $@ if $@;
-
-    my $class = Moose::Meta::Class->initialize($pkg_name);
-    $class->superclasses(blessed($object));
-
-    bless $object => $class->name;   
-    
-    $self->SUPER::apply($role, $class); 
+    my $anon_role_key = (blessed($object) . $role->name);
+
+    my $class;
+    if (exists $ANON_CLASSES{$anon_role_key} && defined $ANON_CLASSES{$anon_role_key}) {
+        $class = $ANON_CLASSES{$anon_role_key};
+    }
+    else {
+        my $obj_meta = Class::MOP::class_of($object) || 'Moose::Meta::Class';
+
+        # 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');
+
+        $class = $obj_meta->create_anon_class(
+            superclasses => [ blessed($object) ]
+        );
+        $ANON_CLASSES{$anon_role_key} = $class;
+        $self->SUPER::apply($role, $class);
+    }
+
+    $class->rebless_instance($object, %{$self->rebless_params});
 }
 
 1;
@@ -44,7 +56,7 @@ __END__
 
 =head1 NAME
 
-Moose::Meta::Role::Application::ToInstance
+Moose::Meta::Role::Application::ToInstance - Compose a role into an instance
 
 =head1 DESCRIPTION
 
@@ -58,13 +70,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 +84,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>