even more refactoring

diff --git a/lib/MooseX/MetaDescription/Description.pm b/lib/MooseX/MetaDescription/Description.pm
index aeefdd7..5c081d7 100644 (file)
--- a/lib/MooseX/MetaDescription/Description.pm
+++ b/lib/MooseX/MetaDescription/Description.pm
@@ -1,11 +1,16 @@
 package MooseX::MetaDescription::Description;
 use Moose;
 
+# need the type loaded ...
+use MooseX::MetaDescription::Meta::Role::HasMetaDescription;
+
 our $VERSION   = '0.01';
 our $AUTHORITY = 'cpan:STEVAN';
 
 has 'descriptor' => (
     is       => 'ro',  
+    does     => 'MooseX::MetaDescription::Meta::Role::HasMetaDescription',   
+    weak_ref => 1, 
     required => 1,
 );
 

diff --git a/lib/MooseX/MetaDescription/Description/Attribute.pm b/lib/MooseX/MetaDescription/Description/Attribute.pm
index ebad881..829a7a4 100644 (file)
--- a/lib/MooseX/MetaDescription/Description/Attribute.pm
+++ b/lib/MooseX/MetaDescription/Description/Attribute.pm
@@ -6,10 +6,6 @@ our $AUTHORITY = 'cpan:STEVAN';
 
 extends 'MooseX::MetaDescription::Description';
 
-has '+descriptor' => (
-    does => 'MooseX::MetaDescription::Meta::Attribute::Trait',     
-);
-
 no Moose; 1;
 
 __END__
@@ -24,7 +20,7 @@ MooseX::MetaDescription::Description::Attribute - A Moosey solution to this prob
 
   use MooseX::MetaDescription::Description::Attribute;
 
-=head1 DESCRIPTIONsv
+=head1 DESCRIPTION
 
 =head1 METHODS 
 

diff --git a/lib/MooseX/MetaDescription/Description/Class.pm b/lib/MooseX/MetaDescription/Description/Class.pm
index cc5f63d..1237ae1 100644 (file)
--- a/lib/MooseX/MetaDescription/Description/Class.pm
+++ b/lib/MooseX/MetaDescription/Description/Class.pm
@@ -6,10 +6,6 @@ our $AUTHORITY = 'cpan:STEVAN';
 
 extends 'MooseX::MetaDescription::Description';
 
-has '+descriptor' => (
-    isa => 'MooseX::MetaDescription::Meta::Class',
-);
-
 no Moose; 1;
 
 __END__

diff --git a/lib/MooseX/MetaDescription/Meta/Role/HasDescription.pm b/lib/MooseX/MetaDescription/Meta/Role/HasDescription.pm
deleted file mode 100644 (file)
index 2b4b584..0000000
--- a/lib/MooseX/MetaDescription/Meta/Role/HasDescription.pm
+++ /dev/null
@@ -1,52 +0,0 @@
-package MooseX::MetaDescription::Meta::Role::HasDescription;
-use Moose::Role;
-
-our $VERSION   = '0.01';
-our $AUTHORITY = 'cpan:STEVAN';
-
-
-
-no Moose::Role; 1;
-
-__END__
-
-=pod
-
-=head1 NAME
-
-MooseX::MetaDescription::Meta::Role::HasDescription - A Moosey solution to this problem
-
-=head1 SYNOPSIS
-
-  use MooseX::MetaDescription::Meta::Role::HasDescription;
-
-=head1 DESCRIPTION
-
-=head1 METHODS 
-
-=over 4
-
-=item B<>
-
-=back
-
-=head1 BUGS
-
-All complex software has bugs lurking in it, and this module is no 
-exception. If you find a bug please either email me, or add the bug
-to cpan-RT.
-
-=head1 AUTHOR
-
-Stevan Little E<lt>stevan.little@iinteractive.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright 2008 Infinity Interactive, Inc.
-
-L<http://www.iinteractive.com>
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself.
-
-=cut