X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FClassData.pm;h=e4a8e542dd23e98f4373bec1e7c4567cad603aca;hb=c98492ae581627840eb5573f6b979550044b2d9a;hp=3882ccd4da4eca0bd47fa290468b1445399a1423;hpb=74c89dead3cfd8e95cbe853adbc6fe9eed539f4e;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/ClassData.pm b/lib/Catalyst/ClassData.pm
index 3882ccd..e4a8e54 100644
--- a/lib/Catalyst/ClassData.pm
+++ b/lib/Catalyst/ClassData.pm
@@ -1,9 +1,9 @@
 package Catalyst::ClassData;
 
 use Moose::Role;
+use Moose::Meta::Class ();
 use Class::MOP;
-use Class::MOP::Object;
-use Scalar::Util 'blessed';
+use Moose::Util ();
 
 sub mk_classdata {
   my ($class, $attribute) = @_;
@@ -13,8 +13,9 @@ sub mk_classdata {
   my $slot = '$'.$attribute;
   my $accessor =  sub {
     my $pkg = ref $_[0] || $_[0];
-    my $meta = $pkg->Class::MOP::Object::meta();
-    if (@_ > 1){
+    my $meta = Moose::Util::find_meta($pkg) 
+        || Moose::Meta::Class->initialize( $pkg );
+    if (@_ > 1) {
       $meta->namespace->{$attribute} = \$_[1];
       return $_[1];
     }
@@ -44,17 +45,18 @@ sub mk_classdata {
     unless ref $accessor eq 'CODE';
 
   my $meta = $class->Class::MOP::Object::meta();
-  my $immutable_options;
-  if( $meta->is_immutable ){
-    $immutable_options = $meta->get_immutable_options;
-    $meta->make_mutable;
-  }
+  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;
 }
@@ -66,7 +68,7 @@ __END__
 
 =head1 NAME
 
-Catalyst::ClassData - Class data acessors
+Catalyst::ClassData - Class data accessors
 
 =head1 METHODS