X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FClassData.pm;h=0f0b27de3274c890b8b256217674c18f7b475463;hb=4ac0b9cb8e9043db8a95f44af685c782bf9426e7;hp=2b004122bb2186f1672bd23c198cb7bc1ac79b7c;hpb=875d811063ef237d5cc41e9258fdbf1b567e403d;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/ClassData.pm b/lib/Catalyst/ClassData.pm
index 2b00412..0f0b27d 100644
--- 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 Class::MOP::Object;
 
 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){
+    # Hack - delberately create a metaclass instance
+    my $meta = $pkg->Class::MOP::Object::meta();
+    if (@_ > 1) {
       $meta->namespace->{$attribute} = \$_[1];
       return $_[1];
     }
@@ -42,7 +43,9 @@ sub mk_classdata {
   confess("Failed to create accessor: $@ ")
     unless ref $accessor eq 'CODE';
 
-  my $meta = $class->meta;
+  my $meta = $class->Class::MOP::Object::meta();
+  confess "${class}'s metaclass is not a Class::MOP::Class"
+    unless $meta->isa('Class::MOP::Class');
   my $immutable_options;
   if( $meta->is_immutable ){
     $immutable_options = $meta->get_immutable_options;
@@ -52,7 +55,7 @@ sub mk_classdata {
   $meta->add_method($alias, $accessor);
   $meta->add_method($attribute, $accessor);
   if(defined $immutable_options){
-    $meta->make_immutable($immutable_options);
+    $meta->make_immutable(%{ $immutable_options });
   }
   $class->$attribute($_[2]) if(@_ > 2);
   return $accessor;
@@ -65,7 +68,7 @@ __END__
 
 =head1 NAME
 
-Catalyst::ClassData - Class data acessors
+Catalyst::ClassData - Class data accessors
 
 =head1 METHODS