X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMooseX%2FSingleton.pm;h=fe67b9fe76f3090c59c85b62057d3992a747f881;hb=03e1b8df86e9ad4dd27d689d506324942bd20652;hp=281487a0d49f9dbf00622c90d897b12dba290dfc;hpb=b1411a85d10099907c0ab3417a702a83ef4eb449;p=gitmo%2FMooseX-Singleton.git

diff --git a/lib/MooseX/Singleton.pm b/lib/MooseX/Singleton.pm
index 281487a..fe67b9f 100644
--- a/lib/MooseX/Singleton.pm
+++ b/lib/MooseX/Singleton.pm
@@ -1,22 +1,24 @@
 package MooseX::Singleton;
-use Moose;
+
+use Moose 0.74 ();
+use Moose::Exporter;
 use MooseX::Singleton::Object;
 use MooseX::Singleton::Meta::Class;
 
-our $VERSION = 0.06;
-
-sub import {
-    my $caller = caller;
+our $VERSION = '0.16';
+$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;
+    Moose->init_meta(
+        @_,
+        base_class => 'MooseX::Singleton::Object',
+        metaclass  => 'MooseX::Singleton::Meta::Class',
+    );
 }
 
-no Moose;
-
 1;
 
 __END__
@@ -29,7 +31,7 @@ MooseX::Singleton - turn your Moose class into a singleton
 
 =head1 VERSION
 
-Version 0.06, released 05 Mar 08
+Version 0.16, released 24 May 08
 
 =head1 SYNOPSIS
 
@@ -58,11 +60,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 +90,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 +104,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.