minimalism all the way

diff --git a/lib/MooseX/MetaDescription.pm b/lib/MooseX/MetaDescription.pm
index 5dcf4bd..5e35667 100644 (file)
--- a/lib/MooseX/MetaDescription.pm
+++ b/lib/MooseX/MetaDescription.pm
@@ -3,6 +3,7 @@ use Moose;
 
 use MooseX::MetaDescription::Meta::Class;
 use MooseX::MetaDescription::Meta::Attribute;
+use MooseX::MetaDescription::Description;
 
 our $VERSION   = '0.01';
 our $AUTHORITY = 'cpan:STEVAN';

diff --git a/t/000_load.t b/t/000_load.t
index 04cf405..d4bcf05 100644 (file)
--- a/t/000_load.t
+++ b/t/000_load.t
@@ -11,11 +11,7 @@ BEGIN {
 
     use_ok('MooseX::MetaDescription::Meta::Class');
     use_ok('MooseX::MetaDescription::Meta::Attribute');
-    use_ok('MooseX::MetaDescription::Meta::Attribute::Trait');
-
-    use_ok('MooseX::MetaDescription::Meta::Role::HasMetaDescription');
+    use_ok('MooseX::MetaDescription::Meta::Trait');
 
     use_ok('MooseX::MetaDescription::Description');
-    use_ok('MooseX::MetaDescription::Description::Class');
-    use_ok('MooseX::MetaDescription::Description::Attribute');
 }

diff --git a/t/001_basic.t b/t/001_basic.t
index 9628291..8d99d73 100644 (file)
--- a/t/001_basic.t
+++ b/t/001_basic.t
@@ -29,7 +29,7 @@ BEGIN {
     );
     
     has 'baz' => (
-        traits      => [ 'MooseX::MetaDescription::Meta::Attribute::Trait' ],
+        traits      => [ 'MooseX::MetaDescription::Meta::Trait' ],
         is          => 'ro',
         isa         => 'Str',   
         default     => sub { 'Foo::baz' },
@@ -43,15 +43,15 @@ BEGIN {
 # check the meta-desc
 
 my $foo_class = Foo->meta;
-isa_ok($foo_class->metadescription, 'MooseX::MetaDescription::Description::Class');
+isa_ok($foo_class->metadescription, 'MooseX::MetaDescription::Description');
 is($foo_class->metadescription->descriptor, $foo_class, '... got the circular ref');
 
 my $bar_attr = Foo->meta->get_attribute('bar');
-isa_ok($bar_attr->metadescription, 'MooseX::MetaDescription::Description::Attribute');
+isa_ok($bar_attr->metadescription, 'MooseX::MetaDescription::Description');
 is($bar_attr->metadescription->descriptor, $bar_attr, '... got the circular ref');
 
 my $baz_attr = Foo->meta->get_attribute('baz');
-isa_ok($baz_attr->metadescription, 'MooseX::MetaDescription::Description::Attribute');
+isa_ok($baz_attr->metadescription, 'MooseX::MetaDescription::Description');
 is($baz_attr->metadescription->descriptor, $baz_attr, '... got the circular ref');
 
 # check the actual descs