X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMooseX%2FAlwaysCoerce.pm;h=51e2f2e2ae10227b8940babed3f2c098c5b07733;hb=0a64dac6a3376cc92b81b708dbd56f5cc675d050;hp=240dff50d1f4dcee8249e6a42e2cf4363fec5225;hpb=e307e391921ca301d84e6c57f569beb44d7dbb98;p=gitmo%2FMooseX-AlwaysCoerce.git

diff --git a/lib/MooseX/AlwaysCoerce.pm b/lib/MooseX/AlwaysCoerce.pm
index 240dff5..51e2f2e 100644
--- a/lib/MooseX/AlwaysCoerce.pm
+++ b/lib/MooseX/AlwaysCoerce.pm
@@ -18,11 +18,11 @@ MooseX::AlwaysCoerce - Automatically enable coercions for Moose attributes
 
 =head1 VERSION
 
-Version 0.05
+Version 0.08
 
 =cut
 
-our $VERSION = '0.05';
+our $VERSION = '0.08';
 
 =head1 SYNOPSIS
 
@@ -54,39 +54,52 @@ Use C<< coerce => 0 >> to disable a coercion explicitly.
     use namespace::autoclean;
     use Moose::Role;
 
-    has coerce => (
-        lazy    => 1,
-        reader  => "should_coerce",
-        default => sub {
-            return 1 if shift->type_constraint->has_coercion;
-            return 0;
-        }
-    );
+    around should_coerce => sub {
+        my $orig = shift;
+        my $self = shift;
+
+        my $current_val = $self->$orig(@_);
 
+        return $current_val if defined $current_val;
+
+        return 1 if $self->type_constraint->has_coercion;
+        return 0;
+    };
 
     package MooseX::AlwaysCoerce::Role::Meta::Class;
     use namespace::autoclean;
     use Moose::Role;
     use Moose::Util::TypeConstraints;
+    use MooseX::ClassAttribute;
 
     around add_class_attribute => sub {
         my $next = shift;
         my $self = shift;
         my ($what, %opts) = @_;
 
+        return unless exists $opts{isa};
+
         my $type = Moose::Util::TypeConstraints::find_or_parse_type_constraint($opts{isa});
-        $opts{coerce} = 1 if !exists $opts{coerce} and $type->has_coercion;
+        $opts{coerce} = 1 if not exists $opts{coerce} and $type->has_coercion;
 
         $self->$next($what, %opts);
     };
 }
 
 my (undef, undef, $init_meta) = Moose::Exporter->build_import_methods(
+
     install => [ qw(import unimport) ],
+
     class_metaroles => {
         attribute   => ['MooseX::AlwaysCoerce::Role::Meta::Attribute'],
         class       => ['MooseX::AlwaysCoerce::Role::Meta::Class'],
     },
+
+    role_metaroles => {
+        # applied_attribute should be available soon, for now roles are borked
+        # applied_attribute   => ['MooseX::AlwaysCoerce::Role::Meta::Attribute'],
+        role                => ['MooseX::AlwaysCoerce::Role::Meta::Class'],
+    }
 );
 
 sub init_meta {
@@ -146,7 +159,7 @@ Dave Rolsky, for telling me how to do it the L<Moose> way.
 
 =head1 COPYRIGHT & LICENSE
 
-Copyright (c) 2009 Rafael Kitover
+Copyright (c) 2009-2010 Rafael Kitover
 
 This program is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.