Fix the CDI issue, Plugin::Auth's tests now blow up a different way..

[catagits/Catalyst-Runtime.git] / lib / Catalyst / ClassData.pm

diff --git a/lib/Catalyst/ClassData.pm b/lib/Catalyst/ClassData.pm
index 04e074c..424cb77 100644 (file)
--- a/lib/Catalyst/ClassData.pm
+++ b/lib/Catalyst/ClassData.pm
@@ -2,6 +2,7 @@ package Catalyst::ClassData;
 
 use Moose::Role;
 use Class::MOP;
+use Class::MOP::Object;
 use Scalar::Util 'blessed';
 
 sub mk_classdata {
@@ -11,19 +12,35 @@ sub mk_classdata {
 
   my $slot = '$'.$attribute;
   my $accessor =  sub {
-    my $meta = $_[0]->meta;
-    if(@_ > 1){
+    my $pkg = ref $_[0] || $_[0];
+    my $meta = $pkg->Class::MOP::Object::meta();
+    if (@_ > 1){
       $meta->namespace->{$attribute} = \$_[1];
       return $_[1];
     }
 
-    if( $meta->has_package_symbol($slot) ){
-      return ${ $meta->get_package_symbol($slot) };
+    # tighter version of
+    # if ( $meta->has_package_symbol($slot) ) {
+    #   return ${ $meta->get_package_symbol($slot) };
+    # }
+    no strict 'refs';
+    my $v = *{"${pkg}::${attribute}"}{SCALAR};
+    if (defined ${$v}) {
+     return ${$v};
     } else {
       foreach my $super ( $meta->linearized_isa ) {
-        my $super_meta = Moose::Meta::Class->initialize($super);
-        if( $super_meta->has_package_symbol($slot) ){
-          return ${ $super_meta->get_package_symbol($slot) };
+        # If there is a code symbol for this attr in a parent class, 
+        # then copy it into our package. Is this the correct
+        # fix for C::D::I back-compat? (t0m)
+        my $parent_symbol = *{"${super}::${attribute}"}{CODE} ? \&{"${super}::${attribute}"} : undef;
+        if (defined $parent_symbol) {
+          *{"${pkg}::${attribute}"} = $parent_symbol;
+        }
+        # tighter version of same after
+        # my $super_meta = Moose::Meta::Class->initialize($super);
+        my $v = ${"${super}::"}{$attribute} ? *{"${super}::${attribute}"}{SCALAR} : undef;
+        if (defined ${$v}) {
+          return ${$v};
         }
       }
     }
@@ -33,10 +50,18 @@ sub mk_classdata {
   confess("Failed to create accessor: $@ ")
     unless ref $accessor eq 'CODE';
 
-  my $meta = $class->meta;
+  my $meta = $class->Class::MOP::Object::meta();
+  my $immutable_options;
+  if( $meta->is_immutable ){
+    $immutable_options = $meta->get_immutable_options;
+    $meta->make_mutable;
+  }
   my $alias = "_${attribute}_accessor";
   $meta->add_method($alias, $accessor);
   $meta->add_method($attribute, $accessor);
+  if(defined $immutable_options){
+    $meta->make_immutable($immutable_options);
+  }
   $class->$attribute($_[2]) if(@_ > 2);
   return $accessor;
 }