extends 'Moose::Object';
-no strict 'refs';
-
-override new => sub {
- my $class = shift;
+sub instance { shift->new }
- # create exactly one instance
- if (!defined ${"$class\::singleton"}) {
- ${"$class\::singleton"} = super;
- }
+sub new {
+ my ($class, @args) = @_;
- return ${"$class\::singleton"};
-};
+ my $existing = $class->meta->existing_singleton;
+ confess "Singleton is already initialized" if $existing and @args;
-sub instance { shift->new }
+ return $class->SUPER::new(@args);
+}
1;
+__END__
+
+=pod
+
+=head1 NAME
+
+MooseX::Singleton::Object - base class for MooseX::Singleton
+
+=head1 DESCRIPTION
+
+This just adds C<instance> as a shortcut for C<new>.
+
+=cut
+