From: Stevan Little <stevan.little@iinteractive.com>
Date: Mon, 28 Apr 2008 14:04:49 +0000 (+0000)
Subject: whops, I dont think I commited this
X-Git-Tag: 0.04~29
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=8a18d24942982805dcd8a302b6396c1b58399c97;p=gitmo%2FMooseX-MetaDescription.git

whops, I dont think I commited this
---

diff --git a/lib/MooseX/MetaDescription/Meta/Trait.pm b/lib/MooseX/MetaDescription/Meta/Trait.pm
index fd1decb..2f04306 100644
--- a/lib/MooseX/MetaDescription/Meta/Trait.pm
+++ b/lib/MooseX/MetaDescription/Meta/Trait.pm
@@ -26,10 +26,20 @@ has 'metadescription' => (
     lazy    => 1,   
     default => sub {
         my $self = shift;
-        $self->metadescription_classname->new(
-            %{ $self->description },
-            descriptor => $self,
-        );
+        
+        my $metadesc_class = $self->metadescription_classname;
+        my $desc           = $self->description;
+        
+        if (my $traits = delete $desc->{traits}) {
+            my $meta = Moose::Meta::Class->create_anon_class(
+                superclasses => [ $metadesc_class ],
+                roles        => $traits,
+            );
+            $meta->add_method('meta' => sub { $meta });
+            $metadesc_class = $meta->name;
+        }
+        
+        return $metadesc_class->new(%$desc, descriptor => $self);
     },
 );
 
diff --git a/t/010_meta_desc_traits.t b/t/010_meta_desc_traits.t
new file mode 100644
index 0000000..4f3f47a
--- /dev/null
+++ b/t/010_meta_desc_traits.t
@@ -0,0 +1,95 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+use Test::More no_plan => 1;
+use Test::Exception;
+use Test::Moose;
+
+BEGIN {
+    use_ok('MooseX::MetaDescription');
+}
+
+{
+    package Foo::Description::Trait;
+    use Moose::Role;
+    
+    has 'bar'   => (is => 'ro', isa => 'Str');
+    has 'baz'   => (is => 'ro', isa => 'Str');    
+    has 'gorch' => (is => 'ro', isa => 'Str');        
+
+}
+
+{
+    package Foo;
+    use Moose;
+    
+    has 'bar' => (
+        metaclass   => 'MooseX::MetaDescription::Meta::Attribute',
+        is          => 'ro',
+        isa         => 'Str',   
+        default     => sub { 'Foo::bar' },
+        description => {
+            traits => [qw[Foo::Description::Trait]],
+            baz    => 'Foo::bar::baz',
+            gorch  => 'Foo::bar::gorch',
+        }
+    );
+    
+    has 'baz' => (
+        traits      => [ 'MooseX::MetaDescription::Meta::Trait' ],
+        is          => 'ro',
+        isa         => 'Str',   
+        default     => sub { 'Foo::baz' },
+        description => {
+            traits => [qw[Foo::Description::Trait]],
+            bar    => 'Foo::baz::bar',
+            gorch  => 'Foo::baz::gorch',
+        }
+    );    
+}
+
+# check the meta-desc
+
+my $bar_attr = Foo->meta->get_attribute('bar');
+isa_ok($bar_attr->metadescription, 'MooseX::MetaDescription::Description');
+does_ok($bar_attr->metadescription, 'Foo::Description::Trait');
+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');
+does_ok($baz_attr->metadescription, 'Foo::Description::Trait');
+is($baz_attr->metadescription->descriptor, $baz_attr, '... got the circular ref');
+
+# check the actual descs
+
+foreach my $foo ('Foo', Foo->new) {
+
+    is_deeply(
+        $foo->meta->get_attribute('bar')->description,
+        {
+            baz   => 'Foo::bar::baz',
+            gorch => 'Foo::bar::gorch',
+        },
+        '... got the right class description'
+    );
+    
+    my $bar_meta_desc = $foo->meta->get_attribute('bar')->metadescription;
+    is($bar_meta_desc->baz,   'Foo::bar::baz',   '... we have methods');
+    is($bar_meta_desc->gorch, 'Foo::bar::gorch', '... we have methods');    
+
+    is_deeply(
+        $foo->meta->get_attribute('baz')->description,
+        {
+            bar   => 'Foo::baz::bar',
+            gorch => 'Foo::baz::gorch',
+        },
+        '... got the right class description'
+    );
+    
+    my $baz_meta_desc = $foo->meta->get_attribute('baz')->metadescription;
+    is($baz_meta_desc->bar,   'Foo::baz::bar',   '... we have methods');
+    is($baz_meta_desc->gorch, 'Foo::baz::gorch', '... we have methods');    
+}
+