X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FClass.pm;h=46b4a15dc7555cccef16af6c9cd00f1570f07baa;hp=2689f85a6f00eef44d854cdf2934a0fd618feda4;hb=6d28c5cf89bfd4c00e675e95aff6c31b61aeb805;hpb=8f98ed261eac95dc093a9b6d22c462c790e63736

diff --git a/lib/Mouse/Meta/Class.pm b/lib/Mouse/Meta/Class.pm
index 2689f85..46b4a15 100644
--- a/lib/Mouse/Meta/Class.pm
+++ b/lib/Mouse/Meta/Class.pm
@@ -2,11 +2,14 @@ package Mouse::Meta::Class;
 use strict;
 use warnings;
 
-use Mouse::Meta::Method::Constructor;
-use Mouse::Meta::Method::Destructor;
 use Scalar::Util qw/blessed weaken/;
+
 use Mouse::Util qw/get_linear_isa not_supported/;
 
+use Mouse::Meta::Method::Constructor;
+use Mouse::Meta::Method::Destructor;
+use Mouse::Meta::Module;
+
 use base qw(Mouse::Meta::Module);
 
 sub method_metaclass(){ 'Mouse::Meta::Method' } # required for get_method()
@@ -23,7 +26,19 @@ sub _new {
         \@{ $args{package} . '::ISA' };
     };
 
-    bless \%args, $class;
+    #return Mouse::Meta::Class->initialize($class)->new_object(%args)
+    #    if $class ne __PACKAGE__;
+
+    return bless \%args, $class;
+}
+
+sub create_anon_class{
+    my $self = shift;
+    return $self->create(undef, @_);
+}
+
+sub is_anon_class{
+    return exists $_[0]->{anon_serial_id};
 }
 
 sub roles { $_[0]->{roles} }
@@ -53,11 +68,12 @@ sub add_attribute {
     if (@_ == 1 && blessed($_[0])) {
         my $attr = shift @_;
         $self->{'attributes'}{$attr->name} = $attr;
-    } else {
+    }
+    else {
         my $names = shift @_;
         $names = [$names] if !ref($names);
         my $metaclass = 'Mouse::Meta::Attribute';
-        my %options = @_;
+        my %options   = (@_ == 1 ? %{$_[0]} : @_);
 
         if ( my $metaclass_name = delete $options{metaclass} ) {
             my $new_class = Mouse::Util::resolve_metaclass_alias(
@@ -71,10 +87,10 @@ sub add_attribute {
 
         for my $name (@$names) {
             if ($name =~ s/^\+//) {
-                $metaclass->clone_parent($self, $name, @_);
+                $metaclass->clone_parent($self, $name, %options);
             }
             else {
-                $metaclass->create($self, $name, @_);
+                $metaclass->create($self, $name, %options);
             }
         }
     }
@@ -102,26 +118,28 @@ sub linearized_isa { @{ get_linear_isa($_[0]->name) } }
 
 sub new_object {
     my $self = shift;
-    my $args = (@_ == 1) ? $_[0] : { @_ };
+    my %args = (@_ == 1 ? %{$_[0]} : @_);
 
     my $instance = bless {}, $self->name;
 
+    my @triggers_queue;
+
     foreach my $attribute ($self->get_all_attributes) {
         my $from = $attribute->init_arg;
         my $key  = $attribute->name;
 
-        if (defined($from) && exists($args->{$from})) {
-            $args->{$from} = $attribute->coerce_constraint($args->{$from})
+        if (defined($from) && exists($args{$from})) {
+            $args{$from} = $attribute->coerce_constraint($args{$from})
                 if $attribute->should_coerce;
-            $attribute->verify_against_type_constraint($args->{$from});
+            $attribute->verify_against_type_constraint($args{$from});
 
-            $instance->{$key} = $args->{$from};
+            $instance->{$key} = $args{$from};
 
             weaken($instance->{$key})
                 if ref($instance->{$key}) && $attribute->is_weak_ref;
 
             if ($attribute->has_trigger) {
-                $attribute->trigger->($instance, $args->{$from});
+                push @triggers_queue, [ $attribute->trigger, $args{$from} ];
             }
         }
         else {
@@ -152,6 +170,12 @@ sub new_object {
             }
         }
     }
+
+    foreach my $trigger_and_value(@triggers_queue){
+        my($trigger, $value) = @{$trigger_and_value};
+        $trigger->($instance, $value);
+    }
+
     return $instance;
 }
 
@@ -293,133 +317,6 @@ sub does_role {
     return 0;
 }
 
-sub create {
-    my ($class, $package_name, %options) = @_;
-
-    (ref $options{superclasses} eq 'ARRAY')
-        || $class->throw_error("You must pass an ARRAY ref of superclasses")
-            if exists $options{superclasses};
-
-    (ref $options{attributes} eq 'ARRAY')
-        || $class->throw_error("You must pass an ARRAY ref of attributes")
-            if exists $options{attributes};
-
-    (ref $options{methods} eq 'HASH')
-        || $class->throw_error("You must pass a HASH ref of methods")
-            if exists $options{methods};
-
-    (ref $options{roles} eq 'ARRAY')
-        || $class->throw_error("You must pass an ARRAY ref of roles")
-            if exists $options{roles};
-
-    # instantiate a module
-    {
-        ( defined $package_name && $package_name )
-          || $class->throw_error("You must pass a package name");
-
-        no strict 'refs';
-        ${ $package_name . '::VERSION'   } = $options{version}   if exists $options{version};
-        ${ $package_name . '::AUTHORITY' } = $options{authority} if exists $options{authority};
-    }
-
-    my %initialize_options = %options;
-    delete @initialize_options{qw(
-        package
-        superclasses
-        attributes
-        methods
-        roles
-        version
-        authority
-    )};
-    my $meta = $class->initialize( $package_name => %initialize_options );
-
-    # FIXME totally lame
-    $meta->add_method('meta' => sub {
-        Mouse::Meta::Class->initialize(ref($_[0]) || $_[0]);
-    });
-
-    $meta->superclasses(@{$options{superclasses}})
-        if exists $options{superclasses};
-
-    # NOTE:
-    # process attributes first, so that they can
-    # install accessors, but locally defined methods
-    # can then overwrite them. It is maybe a little odd, but
-    # I think this should be the order of things.
-    if (exists $options{attributes}) {
-        foreach my $attr (@{$options{attributes}}) {
-            Mouse::Meta::Attribute->create($meta, $attr->{name}, %$attr);
-        }
-    }
-    if (exists $options{methods}) {
-        foreach my $method_name (keys %{$options{methods}}) {
-            $meta->add_method($method_name, $options{methods}->{$method_name});
-        }
-    }
-    if (exists $options{roles}){
-        Mouse::Util::apply_all_roles($package_name, @{$options{roles}});
-    }
-    return $meta;
-}
-
-{
-    my $ANON_CLASS_SERIAL = 0;
-    my $ANON_CLASS_PREFIX = 'Mouse::Meta::Class::__ANON__::SERIAL::';
-
-    my %IMMORTAL_ANON_CLASSES;
-    sub create_anon_class {
-        my ( $class, %options ) = @_;
-
-        my $cache = $options{cache};
-        my $cache_key;
-
-        if($cache){ # anonymous but not mortal
-                # something like Super::Class|Super::Class::2=Role|Role::1
-                $cache_key = join '=' => (
-                    join('|', @{$options{superclasses} || []}),
-                    join('|', sort @{$options{roles}   || []}),
-                );
-                return $IMMORTAL_ANON_CLASSES{$cache_key} if exists $IMMORTAL_ANON_CLASSES{$cache_key};
-        }
-        my $package_name = $ANON_CLASS_PREFIX . ++$ANON_CLASS_SERIAL;
-        my $meta = $class->create( $package_name, anon_class_id => $ANON_CLASS_SERIAL, %options );
-
-        if($cache){
-            $IMMORTAL_ANON_CLASSES{$cache_key} = $meta;
-        }
-        else{
-            Mouse::Meta::Module::weaken_metaclass($package_name);
-        }
-        return $meta;
-    }
-
-    sub is_anon_class{
-        return exists $_[0]->{anon_class_id};
-    }
-
-
-    sub DESTROY{
-        my($self) = @_;
-
-        my $serial_id = $self->{anon_class_id};
-
-        return if !$serial_id;
-
-        my $stash = $self->namespace;
-
-        @{$self->{sperclasses}} = ();
-        %{$stash} = ();
-        Mouse::Meta::Module::remove_metaclass_by_name($self->name);
-
-        no strict 'refs';
-        delete ${$ANON_CLASS_PREFIX}{ $serial_id . '::' };
-
-        return;
-    }
-
-}
-
 1;
 
 __END__