refactor code to allow for class attributes in roles

[gitmo/MooseX-ClassAttribute.git] / lib / MooseX / ClassAttribute.pm

diff --git a/lib/MooseX/ClassAttribute.pm b/lib/MooseX/ClassAttribute.pm
index 52eea7f..9d58273 100644 (file)
--- a/lib/MooseX/ClassAttribute.pm
+++ b/lib/MooseX/ClassAttribute.pm
@@ -3,42 +3,38 @@ package MooseX::ClassAttribute;
 use strict;
 use warnings;
 
-our $VERSION = '0.10';
+our $VERSION   = '0.10';
 our $AUTHORITY = 'cpan:DROLSKY';
 
 use Moose 0.89 ();
 use Moose::Exporter;
 use MooseX::ClassAttribute::Role::Meta::Class;
 
-Moose::Exporter->setup_import_methods
-    ( with_caller => [ 'class_has' ] );
+Moose::Exporter->setup_import_methods( with_meta => ['class_has'] );
 
-
-sub init_meta
-{
+sub init_meta {
     shift;
     my %p = @_;
 
-    Moose->init_meta(%p);
-
-    return
-        Moose::Util::MetaRole::apply_metaclass_roles
-            ( for_class       => $p{for_class},
-              metaclass_roles => [ 'MooseX::ClassAttribute::Role::Meta::Class' ],
-            );
+    return Moose::Util::MetaRole::apply_metaclass_roles(
+        for             => $p{for_class},
+        class_metaroles => {
+            class => ['MooseX::ClassAttribute::Role::Meta::Class'],
+        },
+        role_metaroles => {
+            role => ['MooseX::ClassAttribute::Role::Meta::Role'],
+        },
+    );
 }
 
-sub class_has
-{
-    my $caller  = shift;
+sub class_has {
+    my $meta    = shift;
     my $name    = shift;
     my %options = @_;
 
     my $attrs = ref $name eq 'ARRAY' ? $name : [$name];
 
-    Class::MOP::class_of($caller)
-        ->add_class_attribute( $_, %options )
-            for @{ $attrs };
+    $meta->add_class_attribute( $_, %options ) for @{$attrs};
 }
 
 1;
@@ -73,7 +69,6 @@ MooseX::ClassAttribute - Declare class attributes Moose-style
 
     My::Class->Cache()->{thing} = ...;
 
-
 =head1 DESCRIPTION
 
 This module allows you to declare class attributes in exactly the same