X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FClass.pm;h=82f293d58d3236dfc467aac5d3770565dc5e6f58;hb=dd3c04d749655e0e6b7449551d8561fbac75b78a;hp=90331ad542dbc5b71577f61be56701c67582b2ca;hpb=ad958001acda8f0903f6f6f6deac9d5c0b2fb90f;p=gitmo%2FMouse.git diff --git a/lib/Mouse/Meta/Class.pm b/lib/Mouse/Meta/Class.pm index 90331ad..82f293d 100644 --- a/lib/Mouse/Meta/Class.pm +++ b/lib/Mouse/Meta/Class.pm @@ -208,12 +208,7 @@ sub does_role { } sub create { - my ( $class, @args ) = @_; - - unshift @args, 'package' if @args % 2 == 1; - - my (%options) = @args; - my $package_name = $options{package}; + my ($self, $package_name, %options) = @_; (ref $options{superclasses} eq 'ARRAY') || confess "You must pass an ARRAY ref of superclasses" @@ -228,9 +223,6 @@ sub create { if exists $options{methods}; do { - # XXX should I implement Mouse::Meta::Module? - my $package_name = $options{package}; - ( defined $package_name && $package_name ) || confess "You must pass a package name"; @@ -244,7 +236,7 @@ sub create { confess "creation of $package_name failed : $@" if $@; }; - my (%initialize_options) = @args; + my %initialize_options = %options; delete @initialize_options{qw( package superclasses @@ -253,11 +245,11 @@ sub create { version authority )}; - my $meta = $class->initialize( $package_name => %initialize_options ); + my $meta = $self->initialize( $package_name => %initialize_options ); # FIXME totally lame $meta->add_method('meta' => sub { - $class->initialize(ref($_[0]) || $_[0]); + $self->initialize(ref($_[0]) || $_[0]); }); $meta->superclasses(@{$options{superclasses}})