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 b2e04dc..7306caf 100644 (file)
--- a/lib/MooseX/ClassAttribute.pm
+++ b/lib/MooseX/ClassAttribute.pm
@@ -3,7 +3,7 @@ package MooseX::ClassAttribute;
 use strict;
 use warnings;
 
-our $VERSION = '0.03';
+our $VERSION = '0.04';
 our $AUTHORITY = 'cpan:DROLSKY';
 
 our @EXPORT = 'class_has'; ## no critic ProhibitAutomaticExportation
@@ -69,10 +69,11 @@ sub process_class_attribute ## no critic RequireArgUnpacking
             unless grep { $_->isa('Moose::Object') } @parents;
 
         my $container_pkg = 'MooseX::ClassAttribute::Container::' . $caller;
+        my $instance_holder = $container_pkg . '::Self';
 
         my $instance_meth = sub {
             no strict 'refs'; ## no critic ProhibitNoStrict
-            return ${ $container_pkg . '::Self' } ||= shift->new(@_);
+            return $$instance_holder ||= shift->new(@_);
         };
 
         my $class =
@@ -141,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;
@@ -193,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!>