Fix RT bug #46086

[gitmo/MooseX-Singleton.git] / lib / MooseX / Singleton / Role / Meta / Class.pm

diff --git a/lib/MooseX/Singleton/Role/Meta/Class.pm b/lib/MooseX/Singleton/Role/Meta/Class.pm
index 6800fa7..beda2d1 100644 (file)
--- a/lib/MooseX/Singleton/Role/Meta/Class.pm
+++ b/lib/MooseX/Singleton/Role/Meta/Class.pm
@@ -3,6 +3,7 @@ use Moose::Role;
 use MooseX::Singleton::Role::Meta::Instance;
 use MooseX::Singleton::Role::Meta::Method::Constructor;
 
+
 sub existing_singleton {
     my ($class) = @_;
     my $pkg = $class->name;
@@ -10,7 +11,7 @@ sub existing_singleton {
     no strict 'refs';
 
     # create exactly one instance
-    if (defined ${"$pkg\::singleton"}) {
+    if ( defined ${"$pkg\::singleton"} ) {
         return ${"$pkg\::singleton"};
     }
 
@@ -33,21 +34,41 @@ override _construct_instance => sub {
 
     my $pkg = $class->name;
     no strict 'refs';
+    no warnings 'once';
     return ${"$pkg\::singleton"} = super;
 };
 
-no Moose;
+if ( $Moose::VERSION >= 1.9900 ) {
+    override _inline_params => sub {
+        my $self = shift;
+
+        return
+            'my $existing = do {',
+                'no strict "refs";',
+                'no warnings "once";',
+                '\${"$class\::singleton"};',
+            '};',
+            'return ${$existing} if ${$existing};',
+            super();
+    };
+
+    override _inline_extra_init => sub {
+        my $self = shift;
+
+        return '${$existing} = $instance;';
+    };
+}
+
+no Moose::Role;
 
 1;
 
+# ABSTRACT: Metaclass role for MooseX::Singleton
+
 __END__
 
 =pod
 
-=head1 NAME
-
-MooseX::Singleton::Role::Meta::Class - Metaclass role for MooseX::Singleton
-
 =head1 DESCRIPTION
 
 This metaclass role makes sure that there is only ever one instance of an