update changes and bump version to 0.21

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

diff --git a/lib/MooseX/Singleton.pm b/lib/MooseX/Singleton.pm
index b6e358a..6b8a84b 100644 (file)
--- a/lib/MooseX/Singleton.pm
+++ b/lib/MooseX/Singleton.pm
@@ -1,21 +1,42 @@
 package MooseX::Singleton;
-use Moose;
-use MooseX::Singleton::Object;
-use MooseX::Singleton::Meta::Class;
 
-our $VERSION = 0.07;
+use Moose 0.82 ();
+use Moose::Exporter;
+use MooseX::Singleton::Role::Object;
+use MooseX::Singleton::Role::Meta::Class;
+use MooseX::Singleton::Role::Meta::Instance;
 
-sub import {
-    my $caller = caller;
+our $VERSION = '0.21';
+$VERSION = eval $VERSION;
 
-    Moose::init_meta($caller, 'MooseX::Singleton::Object', 'MooseX::Singleton::Meta::Class');
+Moose::Exporter->setup_import_methods( also => 'Moose' );
 
-    Moose->import({into => $caller});
-    strict->import;
-    warnings->import;
+sub init_meta {
+    shift;
+    my %p = @_;
+
+    Moose->init_meta(%p);
+
+    my $caller = $p{for_class};
+
+    Moose::Util::MetaRole::apply_metaclass_roles(
+        for_class       => $caller,
+        metaclass_roles => ['MooseX::Singleton::Role::Meta::Class'],
+        instance_metaclass_roles =>
+            ['MooseX::Singleton::Role::Meta::Instance'],
+        constructor_class_roles =>
+            ['MooseX::Singleton::Role::Meta::Method::Constructor'],
+    );
+
+    Moose::Util::MetaRole::apply_base_class_roles(
+        for_class => $caller,
+        roles =>
+            ['MooseX::Singleton::Role::Object'],
+    );
+
+    return $caller->meta();
 }
 
-no Moose;
 
 1;
 
@@ -27,10 +48,6 @@ __END__
 
 MooseX::Singleton - turn your Moose class into a singleton
 
-=head1 VERSION
-
-Version 0.07, released 07 Mar 08
-
 =head1 SYNOPSIS
 
     package MyApp;
@@ -58,11 +75,15 @@ All you should need to do to transform your class is to change C<use Moose> to
 C<use MooseX::Singleton>. This module uses a new class metaclass and instance
 metaclass, so if you're doing metamagic you may not be able to use this.
 
-C<MooseX::Singleton> gives your class an C<instance> method that can be used to get a handle on the singleton. It's actually just an alias for C<new>.
+C<MooseX::Singleton> gives your class an C<instance> method that can be used to
+get a handle on the singleton. It's actually just an alias for C<new>.
 
 Alternatively, C<< YourPackage->method >> should just work. This includes
 accessors.
 
+If you need to reset your class's singleton object for some reason (e.g.
+tests), you can call C<< YourPackage->_clear_instance >>.
+
 =head1 TODO
 
 =over
@@ -84,10 +105,12 @@ All complex software has bugs lurking in it, and this module is no
 exception. If you find a bug please either email me, or add the bug
 to cpan-RT.
 
-=head1 AUTHOR
+=head1 AUTHORS
 
 Shawn M Moore E<lt>sartak@gmail.comE<gt>
 
+Dave Rolsky E<lt>autarch@urth.orgE<gt>
+
 =head1 SOME CODE STOLEN FROM
 
 Anders Nor Berle E<lt>debolaz@gmail.comE<gt>
@@ -96,11 +119,9 @@ Anders Nor Berle E<lt>debolaz@gmail.comE<gt>
 
 Ricardo SIGNES E<lt>rjbs@cpan.orgE<gt>
 
-Dave Rolsky E<lt>autarch@urth.orgE<gt>
-
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2007, 2008 Shawn M Moore.
+Copyright 2007, 2008 Infinity Interactive
 
 This program is free software; you can redistribute it and/or modify it under
 the same terms as Perl itself.