X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMooseX%2FAlwaysCoerce.pm;h=96b6213ea5edb7ec9153a364803bee6795c5f253;hb=a193e05da9516baf524330e059841ba63a6a997c;hp=b8ad4f39063213fef4b7561b57f3b774410ccacd;hpb=ad1917d79f5490b78c921ce0e7ae708c300d97e4;p=gitmo%2FMooseX-AlwaysCoerce.git

diff --git a/lib/MooseX/AlwaysCoerce.pm b/lib/MooseX/AlwaysCoerce.pm
index b8ad4f3..96b6213 100644
--- a/lib/MooseX/AlwaysCoerce.pm
+++ b/lib/MooseX/AlwaysCoerce.pm
@@ -5,12 +5,12 @@ use warnings;
 
 use namespace::autoclean;
 use Moose ();
+use MooseX::ClassAttribute ();
 use Moose::Exporter;
+use Moose::Util::MetaRole;
 use Carp;
 
-Moose::Exporter->setup_import_methods (
-    with_caller => [ 'has', 'class_has' ]
-);
+Moose::Exporter->setup_import_methods;
 
 =head1 NAME
 
@@ -18,25 +18,23 @@ MooseX::AlwaysCoerce - Automatically enable coercions for Moose attributes
 
 =head1 VERSION
 
-Version 0.01
+Version 0.06
 
 =cut
 
-our $VERSION = '0.01';
+our $VERSION = '0.06';
 
 =head1 SYNOPSIS
 
     package MyClass;
 
     use Moose;
-    use MooseX::ClassAttribute;
     use MooseX::AlwaysCoerce;
     use MyTypeLib 'SomeType';
 
     has foo => (is => 'rw', isa => SomeType); # coerce => 1 automatically added
 
-    # same, but you must load MooseX::ClassAttribute *BEFORE*
-    # MooseX::AlwaysCoerce
+    # same, MooseX::ClassAttribute is automatically applied
     class_has bar => (is => 'rw', isa => SomeType);
 
 =head1 DESCRIPTION
@@ -45,24 +43,81 @@ Have you ever spent an hour or more trying to figure out "WTF, why did my
 coercion not run?" only to find out that you forgot C<< coerce => 1 >> ?
 
 Just load this module in your L<Moose> class and C<< coerce => 1 >> will be
-enabled for every attribute automatically.
+enabled for every attribute and class attribute automatically.
+
+Use C<< coerce => 0 >> to disable a coercion explicitly.
 
 =cut
 
-sub has {
-    push @_, (coerce => 1);
-    goto &Moose::has;
+{
+    package MooseX::AlwaysCoerce::Role::Meta::Attribute;
+    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;
+        }
+    );
+
+
+    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) = @_;
+
+        my $type = Moose::Util::TypeConstraints::find_or_parse_type_constraint($opts{isa});
+        $opts{coerce} = 1 if !exists $opts{coerce} and $type->has_coercion;
+
+        $self->$next($what, %opts);
+    };
 }
 
-sub class_has {
-    push @_, (coerce => 1);
-    goto &MooseX::ClassAttribute::class_has;
+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'],
+    },
+
+    also            => ['MooseX::ClassAttribute'],
+);
+
+sub init_meta {
+    my ($class, %options) = @_;
+    my $for_class = $options{for_class};
+
+    # Bring this in only if we are being applied to a
+    # metaclass, but not a metarole.
+    if (Class::MOP::class_of($for_class)->isa('Class::MOP::Class'))
+    {
+        MooseX::ClassAttribute->import({ into => $for_class });
+    }
+
+    # call generated method to do the rest of the work.
+    goto $init_meta;
 }
 
 =head1 AUTHOR
 
 Rafael Kitover, C<< <rkitover at cpan.org> >>
 
+=head1 CONTRIBUTORS
+
+Schwern: Michael G. Schwern <mschwern@cpan.org>
+Ether: Karen Etheridge <ether@cpan.org>
+
 =head1 BUGS
 
 Please report any bugs or feature requests to C<bug-moosex-alwayscoerce at rt.cpan.org>, or through
@@ -97,9 +152,11 @@ L<http://search.cpan.org/dist/MooseX-AlwaysCoerce/>
 
 My own stupidity, for inspiring me to write this module.
 
+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.