X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMooseX-Singleton.git;a=blobdiff_plain;f=lib%2FMooseX%2FSingleton.pm;h=6b8a84bd4d0ce1e7904ac87610cdfc48a9cafe22;hp=bde50659ef803c3841af03a4e19a32959de4194c;hb=c77ec30d3f650b696438bc3dff1544f193efb54c;hpb=b1882d9b6ec47b18a97dadb6e1326305d890c806

diff --git a/lib/MooseX/Singleton.pm b/lib/MooseX/Singleton.pm
index bde5065..6b8a84b 100644
--- a/lib/MooseX/Singleton.pm
+++ b/lib/MooseX/Singleton.pm
@@ -2,23 +2,42 @@ package MooseX::Singleton;
 
 use Moose 0.82 ();
 use Moose::Exporter;
-use MooseX::Singleton::Object;
-use MooseX::Singleton::Meta::Class;
+use MooseX::Singleton::Role::Object;
+use MooseX::Singleton::Role::Meta::Class;
+use MooseX::Singleton::Role::Meta::Instance;
 
-our $VERSION = '0.19';
+our $VERSION = '0.21';
 $VERSION = eval $VERSION;
 
 Moose::Exporter->setup_import_methods( also => 'Moose' );
 
 sub init_meta {
     shift;
-    Moose->init_meta(
-        @_,
-        base_class => 'MooseX::Singleton::Object',
-        metaclass  => 'MooseX::Singleton::Meta::Class',
+    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();
 }
 
+
 1;
 
 __END__
@@ -29,10 +48,6 @@ __END__
 
 MooseX::Singleton - turn your Moose class into a singleton
 
-=head1 VERSION
-
-Version 0.18, released 24 May 08
-
 =head1 SYNOPSIS
 
     package MyApp;