Move actual singleton logic out of MooseX::Singleton::Object and into MooseX::Singlet...

diff --git a/lib/MooseX/Singleton/Meta/Class.pm b/lib/MooseX/Singleton/Meta/Class.pm
index 447859d..51ca11c 100644 (file)
--- a/lib/MooseX/Singleton/Meta/Class.pm
+++ b/lib/MooseX/Singleton/Meta/Class.pm
@@ -16,5 +16,19 @@ sub initialize {
     );
 };
 
+override construct_instance => sub {
+    my ($class) = @_;
+    my $pkg = $class->name;
+
+    no strict 'refs';
+
+    # create exactly one instance
+    if (!defined ${"$pkg\::singleton"}) {
+        ${"$pkg\::singleton"} = super;
+    }
+
+    return ${"$pkg\::singleton"};
+};
+
 1;
 

diff --git a/lib/MooseX/Singleton/Object.pm b/lib/MooseX/Singleton/Object.pm
index dc04e2f..08a4926 100644 (file)
--- a/lib/MooseX/Singleton/Object.pm
+++ b/lib/MooseX/Singleton/Object.pm
@@ -7,17 +7,6 @@ extends 'Moose::Object';
 
 no strict 'refs';
 
-override new => sub {
-    my $class = shift;
-
-    # create exactly one instance
-    if (!defined ${"$class\::singleton"}) {
-        ${"$class\::singleton"} = super;
-    }
-
-    return ${"$class\::singleton"};
-};
-
 sub instance { shift->new }
 
 1;