Revert "better check for if add_class_attribute is present."

[gitmo/MooseX-AlwaysCoerce.git] / lib / MooseX / AlwaysCoerce.pm

diff --git a/lib/MooseX/AlwaysCoerce.pm b/lib/MooseX/AlwaysCoerce.pm
index 3b1893c..8cb3831 100644 (file)
--- 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.07
+Version 0.16
 
 =cut
 
-our $VERSION = '0.07';
+our $VERSION = '0.16';
 
 =head1 SYNOPSIS
 
@@ -62,7 +62,7 @@ Use C<< coerce => 0 >> to disable a coercion explicitly.
 
         return $current_val if defined $current_val;
 
-        return 1 if $self->type_constraint->has_coercion;
+        return 1 if $self->type_constraint && $self->type_constraint->has_coercion;
         return 0;
     };
 
@@ -70,17 +70,19 @@ Use C<< coerce => 0 >> to disable a coercion explicitly.
     use namespace::autoclean;
     use Moose::Role;
     use Moose::Util::TypeConstraints;
-    use MooseX::ClassAttribute;
+
+    # MooseX::ClassAttribute is not always present in the consuming class
+    sub add_class_attribute { }
 
     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 not 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);
     };
@@ -96,8 +98,9 @@ my (undef, undef, $init_meta) = Moose::Exporter->build_import_methods(
     },
 
     role_metaroles => {
-        # applied_attribute should be available soon, for now roles are borked
-        # applied_attribute   => ['MooseX::AlwaysCoerce::Role::Meta::Attribute'],
+        (Moose->VERSION >= 1.9900
+            ? (applied_attribute => ['MooseX::AlwaysCoerce::Role::Meta::Attribute'])
+            : ()),
         role                => ['MooseX::AlwaysCoerce::Role::Meta::Class'],
     }
 );
@@ -167,3 +170,4 @@ under the same terms as Perl itself.
 =cut
 
 1; # End of MooseX::AlwaysCoerce
+# vim:et sts=4 sw=4 tw=0: