X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMooseX%2FAlwaysCoerce.pm;h=14d576747231e02b2cd1498b6df436f06a3c9161;hb=f99502c4fc9ce6b6f4474797c805bd09c0696f48;hp=b01ca0fb3046c5a6d6020cf6421a06d0a5e13a0e;hpb=26d62781c3fbca00ea7118528eb8c8e945b54f11;p=gitmo%2FMooseX-AlwaysCoerce.git

diff --git a/lib/MooseX/AlwaysCoerce.pm b/lib/MooseX/AlwaysCoerce.pm
index b01ca0f..14d5767 100644
--- a/lib/MooseX/AlwaysCoerce.pm
+++ b/lib/MooseX/AlwaysCoerce.pm
@@ -3,9 +3,9 @@ package MooseX::AlwaysCoerce;
 use strict;
 use warnings;
 
-use namespace::autoclean;
+use namespace::autoclean 0.12;
 use Moose ();
-use MooseX::ClassAttribute ();
+use MooseX::ClassAttribute 0.24 ();
 use Moose::Exporter;
 use Moose::Util::MetaRole;
 use Carp;
@@ -18,11 +18,11 @@ MooseX::AlwaysCoerce - Automatically enable coercions for Moose attributes
 
 =head1 VERSION
 
-Version 0.06
+Version 0.16
 
 =cut
 
-our $VERSION = '0.06';
+our $VERSION = '0.16';
 
 =head1 SYNOPSIS
 
@@ -54,15 +54,17 @@ 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 && $self->type_constraint->has_coercion;
+        return 0;
+    };
 
     package MooseX::AlwaysCoerce::Role::Meta::Class;
     use namespace::autoclean;
@@ -74,19 +76,30 @@ Use C<< coerce => 0 >> to disable a coercion explicitly.
         my $self = shift;
         my ($what, %opts) = @_;
 
-        my $type = Moose::Util::TypeConstraints::find_or_parse_type_constraint($opts{isa});
-        $opts{coerce} = 1 if !exists $opts{coerce} and $type->has_coercion;
+        if (exists $opts{isa}) {
+            my $type = Moose::Util::TypeConstraints::find_or_parse_type_constraint($opts{isa});
+            $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 => {
+        (Moose->VERSION >= 1.9900
+            ? (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.
@@ -154,3 +167,4 @@ under the same terms as Perl itself.
 =cut
 
 1; # End of MooseX::AlwaysCoerce
+# vim:et sts=4 sw=4 tw=0: