X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMooseX%2FClassAttribute.pm;h=5de825715da7fc261a898334881761e054dba602;hb=0388e669286b6625e3bb5c1afdeaec3b01335a91;hp=52eea7fae6464d46529ddd518782424d47d55228;hpb=8207dfe76f6ddd0f0a074746c873ac6b05aed834;p=gitmo%2FMooseX-ClassAttribute.git

diff --git a/lib/MooseX/ClassAttribute.pm b/lib/MooseX/ClassAttribute.pm
index 52eea7f..5de8257 100644
--- a/lib/MooseX/ClassAttribute.pm
+++ b/lib/MooseX/ClassAttribute.pm
@@ -3,42 +3,49 @@ 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 0.96 ();
 use Moose::Exporter;
-use MooseX::ClassAttribute::Role::Meta::Class;
+use MooseX::ClassAttribute::Trait::Class;
+use MooseX::ClassAttribute::Trait::Role;
+use MooseX::ClassAttribute::Trait::Application::ToClass;
+use MooseX::ClassAttribute::Trait::Application::ToRole;
+use MooseX::ClassAttribute::Trait::Application::ToInstance;
 
-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::Trait::Class'],
+        },
+        role_metaroles => {
+            role => ['MooseX::ClassAttribute::Trait::Role'],
+            application_to_class =>
+                ['MooseX::ClassAttribute::Trait::Application::ToClass'],
+            application_to_role =>
+                ['MooseX::ClassAttribute::Trait::Application::ToRole'],
+            application_to_instance => [
+                'MooseX::ClassAttribute::Trait::Application::ToInstance'
+            ],
+        },
+    );
 }
 
-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,20 +80,19 @@ 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
 way as object attributes, using C<class_has()> instead of C<has()>.
 
 You can use any feature of Moose's attribute declarations, including
-overriding a parent's attributes, delegation (C<handles>), and
-attribute metaclasses, and it should just work. The one exception is
-the "required" flag, which is not allowed for class attributes.
+overriding a parent's attributes, delegation (C<handles>), attribute traits,
+etc. All features should just work. The one exception is the "required" flag,
+which is not allowed for class attributes.
 
 The accessor methods for class attribute may be called on the class
 directly, or on objects of that class. Passing a class attribute to
-the constructor will not set it.
+the constructor will not set that attribute.
 
 =head1 FUNCTIONS
 
@@ -100,11 +106,11 @@ C<no MooseX::ClassAttribute> as well.
 =head2 Implementation and Immutability
 
 This module will add a role to your class's metaclass, See
-L<MooseX::ClassAttribute::Role::Meta::Class> for details. This role
+L<MooseX::ClassAttribute::Trait::Class> for details. This role
 provides introspection methods for class attributes.
 
 Class attributes themselves do the
-L<MooseX::ClassAttribute::Role::Meta::Attribute> role.
+L<MooseX::ClassAttribute::Trait::Attribute> role.
 
 There is also a L<MooseX::ClassAttribute::Meta::Method::Accessor>
 which provides part of the inlining implementation for class
@@ -114,7 +120,14 @@ attributes.
 
 This module should work with most attribute metaclasses and traits,
 but it's possible that conflicts could occur. This module has been
-tested to work with C<MooseX::AttributeHelpers>.
+tested to work with Moose's native traits.
+
+=head2 Class Attributes in Roles
+
+You can add a class attribute to a role. When that role is applied to a class,
+the class will have the relevant class attributes added. Note that attribute
+defaults will be calculated when the class attribute is composed into the
+class.
 
 =head1 DONATIONS