Factor out a concatenation in grabbing the instance.

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

diff --git a/lib/MooseX/ClassAttribute.pm b/lib/MooseX/ClassAttribute.pm
index cdf664d..7306caf 100644 (file)
--- a/lib/MooseX/ClassAttribute.pm
+++ b/lib/MooseX/ClassAttribute.pm
@@ -3,13 +3,14 @@ package MooseX::ClassAttribute;
 use strict;
 use warnings;
 
-our $VERSION = '0.01';
+our $VERSION = '0.04';
 our $AUTHORITY = 'cpan:DROLSKY';
 
 our @EXPORT = 'class_has'; ## no critic ProhibitAutomaticExportation
-use Exporter qw( import );
+use base 'Exporter';
 
 use B qw( svref_2object );
+use Moose::Meta::Class;
 use Sub::Name;
 
 
@@ -17,16 +18,24 @@ sub class_has ## no critic RequireArgUnpacking
 {
     my $caller = caller();
 
+    process_class_attribute( $caller, @_ );
+
+    return;
+}
+
+sub process_class_attribute ## no critic RequireArgUnpacking
+{
+    my $caller = shift;
+
     my $caller_meta = $caller->meta();
 
     my @parents = $caller_meta->superclasses();
 
     my $container_pkg = _make_container_class( $caller, @parents );
+    my $container_meta = $container_pkg->meta();
 
-    my $has = $container_pkg->can('has');
-    $has->(@_);
+    $container_meta->add_attribute(@_);
 
-    my $container_meta = $container_pkg->meta();
     for my $meth ( grep { $_ ne 'instance' } $container_meta->get_method_list() )
     {
         next if $caller_meta->has_method($meth);
@@ -56,28 +65,23 @@ sub class_has ## no critic RequireArgUnpacking
 
         my @parents = map { container_class($_) || () } @_;
 
-        my $container_pkg = 'MooseX::ClassAttribute::Container::' . $caller;
-
-        my $code = "package $container_pkg;\n";
-        $code .= "use Moose;\n\n";
-
-        if (@parents)
-        {
-            $code .= "extends qw( @parents );\n";
-        }
-
-        $code .= <<'EOF';
+        push @parents, 'Moose::Object'
+            unless grep { $_->isa('Moose::Object') } @parents;
 
-my $Self;
-sub instance
-{
-    return $Self ||= shift->new(@_);
-}
-EOF
+        my $container_pkg = 'MooseX::ClassAttribute::Container::' . $caller;
+        my $instance_holder = $container_pkg . '::Self';
 
+        my $instance_meth = sub {
+            no strict 'refs'; ## no critic ProhibitNoStrict
+            return $$instance_holder ||= shift->new(@_);
+        };
 
-        eval $code; ## no critic ProhibitStringyEval
-        die $@ if $@;
+        my $class =
+            Moose::Meta::Class->create
+                ( $container_pkg =>
+                  superclasses => \@parents,
+                  methods      => { instance => $instance_meth },
+                );
 
         return $Name{$caller} = $container_pkg;
     }
@@ -91,9 +95,9 @@ EOF
 }
 
 # This is basically copied from Moose.pm
-sub unimport ## no critic RequireFinalReturn
+sub unimport ## no critic RequireFinalReturn, RequireArgUnpacking
 {
-    my $caller = caller();
+    my $caller = Moose::_get_caller(@_);
 
     no strict 'refs'; ## no critic ProhibitNoStrict
     foreach my $name (@EXPORT)
@@ -138,7 +142,7 @@ MooseX::ClassAttribute - Declare class attributes Moose-style
         );
 
     __PACKAGE__->meta()->make_immutable();
-    MooseX::ClassAttribute::containing_class()->meta()->make_immutable();
+    MooseX::ClassAttribute::container_class()->meta()->make_immutable();
 
     no Moose;
     no MooseX::ClassAttribute;
@@ -159,15 +163,29 @@ 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 accessors 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.
+
 =head1 FUNCTIONS
 
 This class exports one function when you use it, C<class_has()>. This
 works exactly like Moose's C<has()>, but it declares class attributes.
 
-Own little nit is that if you include C<no Moose> in your class, you
+One little nit is that if you include C<no Moose> in your class, you
 won't remove the C<class_has()> function. To do that you must include
 C<no MooseX::ClassAttribute> as well.
 
+If you want to use this module to create class attributes in I<other>
+classes, you can call the C<process_class_attribute()> function like
+this:
+
+  MooseX::ClassAttribute::process_class_attribute( $package, ... );
+
+The first argument is the package which will have the class attribute,
+and the remaining arguments are the same as those passed to
+C<class_has()>.
+
 =head2 Implementation and Immutability
 
 Underneath the hood, this class creates one new class for each class
@@ -176,10 +194,10 @@ for which you're creating class attributes. You don't need to worry
 about this too much, except when it comes to making a class immutable.
 
 Since the class attributes are not really stored in your class, you
-need to make the containing class immutable as well as your own ...
+need to make the container class immutable as well as your own ...
 
   __PACKAGE__->meta()->make_immutable();
-  MooseX::ClassAttribute::containing_class()->meta()->make_immutable();
+  MooseX::ClassAttribute::container_class()->meta()->make_immutable();
 
 I<This may change in the future!>