Merge branch 'register_actions'

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

diff --git a/lib/Catalyst/ClassData.pm b/lib/Catalyst/ClassData.pm
index 2b00412..cc90c06 100644 (file)
--- a/lib/Catalyst/ClassData.pm
+++ b/lib/Catalyst/ClassData.pm
@@ -2,7 +2,7 @@ package Catalyst::ClassData;
 
 use Moose::Role;
 use Class::MOP;
-use Scalar::Util 'blessed';
+use Moose::Util ();
 
 sub mk_classdata {
   my ($class, $attribute) = @_;
@@ -11,9 +11,10 @@ sub mk_classdata {
 
   my $slot = '$'.$attribute;
   my $accessor =  sub {
-    my $meta = $_[0]->meta;
     my $pkg = ref $_[0] || $_[0];
-    if(@_ > 1){
+    my $meta = Moose::Util::find_meta($pkg) 
+        || Moose->init_meta( for_class => $pkg );
+    if (@_ > 1) {
       $meta->namespace->{$attribute} = \$_[1];
       return $_[1];
     }
@@ -42,18 +43,19 @@ sub mk_classdata {
   confess("Failed to create accessor: $@ ")
     unless ref $accessor eq 'CODE';
 
-  my $meta = $class->meta;
-  my $immutable_options;
-  if( $meta->is_immutable ){
-    $immutable_options = $meta->get_immutable_options;
-    $meta->make_mutable;
-  }
+  my $meta = $class->Class::MOP::Object::meta();
+  confess "${class}'s metaclass is not a Class::MOP::Class"
+    unless $meta->isa('Class::MOP::Class');
+
+  my $was_immutable = $meta->is_immutable;
+  $meta->make_mutable if $was_immutable;
+
   my $alias = "_${attribute}_accessor";
   $meta->add_method($alias, $accessor);
   $meta->add_method($attribute, $accessor);
-  if(defined $immutable_options){
-    $meta->make_immutable($immutable_options);
-  }
+
+  $meta->make_immutable if $was_immutable;
+
   $class->$attribute($_[2]) if(@_ > 2);
   return $accessor;
 }
@@ -65,7 +67,7 @@ __END__
 
 =head1 NAME
 
-Catalyst::ClassData - Class data acessors
+Catalyst::ClassData - Class data accessors
 
 =head1 METHODS