summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2009-09-27 12:28:20 -0500
committerJesse Luehrs <doy@tozt.net>2009-09-27 12:50:30 -0500
commitc93417796759aaeaaa362eadf7bea68b6dfdd4db (patch)
tree993857ef0ea20be3543f3d3f1a293f7dede5800b /lib
parentf6aa3947ab97bcd3fa6e4ecf14242ef7b7d78785 (diff)
downloadmoosex-nonmoose-c93417796759aaeaaa362eadf7bea68b6dfdd4db.tar.gz
moosex-nonmoose-c93417796759aaeaaa362eadf7bea68b6dfdd4db.zip
use new moose-exporter init_meta stuff
Diffstat (limited to 'lib')
-rw-r--r--lib/MooseX/NonMoose.pm17
-rw-r--r--lib/MooseX/NonMoose/InsideOut.pm23
2 files changed, 17 insertions, 23 deletions
diff --git a/lib/MooseX/NonMoose.pm b/lib/MooseX/NonMoose.pm
index c979bd3..a05ca30 100644
--- a/lib/MooseX/NonMoose.pm
+++ b/lib/MooseX/NonMoose.pm
@@ -1,5 +1,4 @@
package MooseX::NonMoose;
-use Moose ();
use Moose::Exporter;
=head1 NAME
@@ -68,20 +67,18 @@ confused by the extra arguments that Moose requires (for attributes, etc.)
=cut
-Moose::Exporter->setup_import_methods;
+my ($import, $unimport, $init_meta) = Moose::Exporter->build_import_methods(
+ metaclass_roles => ['MooseX::NonMoose::Meta::Role::Class'],
+ constructor_class_roles => ['MooseX::NonMoose::Meta::Role::Constructor'],
+ install => [qw(import unimport)],
+);
sub init_meta {
- shift;
+ my $package = shift;
my %options = @_;
Carp::cluck('Roles have no use for MooseX::NonMoose')
if Class::MOP::class_of($options{for_class})->isa('Moose::Meta::Role');
- Moose::Util::MetaRole::apply_metaclass_roles(
- for_class => $options{for_class},
- metaclass_roles => ['MooseX::NonMoose::Meta::Role::Class'],
- constructor_class_roles =>
- ['MooseX::NonMoose::Meta::Role::Constructor'],
- );
- return Class::MOP::class_of($options{for_class});
+ $package->$init_meta(@_);
}
=head1 TODO
diff --git a/lib/MooseX/NonMoose/InsideOut.pm b/lib/MooseX/NonMoose/InsideOut.pm
index 4e226e0..58bdcbd 100644
--- a/lib/MooseX/NonMoose/InsideOut.pm
+++ b/lib/MooseX/NonMoose/InsideOut.pm
@@ -1,5 +1,4 @@
package MooseX::NonMoose::InsideOut;
-use Moose ();
use Moose::Exporter;
=head1 NAME
@@ -37,21 +36,19 @@ MooseX::NonMoose::InsideOut - easy subclassing of non-Moose non-hashref classes
=cut
-Moose::Exporter->setup_import_methods;
+my ($import, $unimport, $init_meta) = Moose::Exporter->build_import_methods(
+ metaclass_roles => ['MooseX::NonMoose::Meta::Role::Class'],
+ constructor_class_roles => ['MooseX::NonMoose::Meta::Role::Constructor'],
+ instance_metaclass_roles => ['MooseX::InsideOut::Role::Meta::Instance'],
+ install => [qw(import unimport)],
+);
sub init_meta {
- shift;
+ my $package = shift;
my %options = @_;
- Moose->init_meta(%options);
- Moose::Util::MetaRole::apply_metaclass_roles(
- for_class => $options{for_class},
- metaclass_roles => ['MooseX::NonMoose::Meta::Role::Class'],
- constructor_class_roles =>
- ['MooseX::NonMoose::Meta::Role::Constructor'],
- instance_metaclass_roles =>
- ['MooseX::InsideOut::Role::Meta::Instance'],
- );
- return Class::MOP::class_of($options{for_class});
+ Carp::cluck('Roles have no use for MooseX::NonMoose')
+ if Class::MOP::class_of($options{for_class})->isa('Moose::Meta::Role');
+ $package->$init_meta(@_);
}
=head1 AUTHOR