Doh, reversed the conditional and broke old Moose

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

diff --git a/lib/MooseX/StrictConstructor.pm b/lib/MooseX/StrictConstructor.pm
index 133bf96..f14e4c4 100644 (file)
--- a/lib/MooseX/StrictConstructor.pm
+++ b/lib/MooseX/StrictConstructor.pm
@@ -3,72 +3,37 @@ package MooseX::StrictConstructor;
 use strict;
 use warnings;
 
-our $VERSION = '0.06_01';
-eval $VERSION = $VERSION;
-
-use Class::MOP ();
-use Moose ();
+use Moose 0.94 ();
 use Moose::Exporter;
-use MooseX::StrictConstructor::Role::Object;
-use MooseX::StrictConstructor::Role::Metaclass;
-
-Moose::Exporter->setup_import_methods( also => 'Moose' );
-
-sub init_meta
-{
-    shift;
-    my %p = @_;
-
-    Moose->init_meta(%p);
-
-    my $caller = $p{for_class};
+use Moose::Util::MetaRole;
 
-    my $metameta = $caller->meta()->meta();
-    unless ( $metameta->can('does_role')
-             && $metameta->does_role( 'MooseX::StrictConstructor::Role::Metaclass' ) )
-    {
-        my $new_meta =
-            Moose::Meta::Class->create_anon_class
-                ( superclasses => [ ref $caller->meta() ],
-                  roles        => [ 'MooseX::StrictConstructor::Role::Metaclass' ],
-                  cache        => 1,
-                );
+use MooseX::StrictConstructor::Trait::Class;
+use MooseX::StrictConstructor::Trait::Method::Constructor;;
 
-        Class::MOP::remove_metaclass_by_name($caller);
+my %metaroles = (
+    class => ['MooseX::StrictConstructor::Trait::Class'],
+);
 
-        $new_meta->name()->initialize($caller);
-    }
+$metaroles{constructor}
+    = ['MooseX::StrictConstructor::Trait::Method::Constructor']
+    if $Moose::VERSION <= 1.9900;
 
-    unless ( $caller->meta()->does_role('MooseX::StrictConstructor::Role::Object') )
-    {
-        my $new_base =
-            Moose::Meta::Class->create_anon_class
-                ( superclasses => [ $caller->meta()->superclasses() ],
-                  roles        => [ 'MooseX::StrictConstructor::Role::Object' ],
-                  cache        => 1,
-                );
-
-        $caller->meta()->superclasses( $new_base->name() );
-    }
-
-    return $caller->meta();
-}
+Moose::Exporter->setup_import_methods( class_metaroles => \%metaroles );
 
 1;
 
+# ABSTRACT: Make your object constructors blow up on unknown attributes
+
 __END__
 
 =pod
 
-=head1 NAME
-
-MooseX::StrictConstructor - Make your object constructors blow up on unknown attributes
-
 =head1 SYNOPSIS
 
     package My::Class;
 
-    use MooseX::StrictConstructor; # instead of use Moose
+    use Moose;
+    use MooseX::StrictConstructor;
 
     has 'size' => ...;
 
@@ -79,22 +44,21 @@ MooseX::StrictConstructor - Make your object constructors blow up on unknown att
 
 =head1 DESCRIPTION
 
-Using this class to load Moose instead of just loading using Moose
-itself makes your constructors "strict". If your constructor is called
-with an attribute init argument that your class does not declare, then
-it calls "Carp::confess()". This is a great way to catch small typos.
+Simply loading this module makes your constructors "strict". If your
+constructor is called with an attribute init argument that your class does not
+declare, then it calls C<< Moose->throw_error() >>. This is a great way to
+catch small typos.
 
 =head2 Subverting Strictness
 
-You may find yourself wanting to accept a parameter to the constructor
-that is not the name of an attribute.
-
-In that case, you'll probably be writing a C<BUILD()> method to deal
-with it. Your C<BUILD()> method will receive two parameters, the new
-object, and a hash reference of parameters passed to the constructor.
+You may find yourself wanting to have your constructor accept a
+parameter which does not correspond to an attribute.
 
-If you delete keys from this hash reference, then they will not be
-seen when this class does its checking.
+In that case, you'll probably also be writing a C<BUILD()> or
+C<BUILDARGS()> method to deal with that parameter. In a C<BUILDARGS()>
+method, you can simply make sure that this parameter is not included
+in the hash reference you return. Otherwise, in a C<BUILD()> method,
+you can delete it from the hash reference of parameters.
 
   sub BUILD {
       my $self   = shift;
@@ -105,17 +69,6 @@ seen when this class does its checking.
       }
   }
 
-=head2 Caveats
-
-Using this class replaces the default Moose meta class,
-C<Moose::Meta::Class>, with its own,
-C<MooseX::StrictConstructor::Meta::Class>. If you have your own meta
-class, this distro will probably not work for you.
-
-=head1 AUTHOR
-
-Dave Rolsky, C<< <autarch@urth.org> >>
-
 =head1 BUGS
 
 Please report any bugs or feature requests to
@@ -124,11 +77,4 @@ interface at L<http://rt.cpan.org>.  I will be notified, and then
 you'll automatically be notified of progress on your bug as I make
 changes.
 
-=head1 COPYRIGHT & LICENSE
-
-Copyright 2007 Dave Rolsky, All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself.
-
 =cut