Changeset 11561 for dan

Timestamp:

05/14/08 12:28:25 (6 months ago)

Author:

aerith

Message:

dan/perl/closxop: 配列のときもループ

Location:

dan/perl/closxop/lib

Files:

• Closxop.pm (modified) (1 diff)
• Closxop/DataStruct.pm (modified) (1 diff)
• Closxop/Plugin.pm (modified) (1 diff)

dan/perl/closxop/lib/Closxop.pm

@@ -66 +66 @@
         my $path = sprintf "%s/%s/Plugin", $self->config->global->plugin_dir, ref $self;
 
-        $self->plugins([]);
+        $self->{plugins} = [];
+
         if ( -d $path && -r _ ) {
                 unshift @INC, $self->config->global->plugin_dir;

dan/perl/closxop/lib/Closxop/DataStruct.pm

@@ -10 +10 @@
         my $data  = shift || {};
 
-        unless ( ref $data eq 'HASH' ) {
-                Carp::croak qq(This data may be invalid.);
-        }
-
-        for my $key ( %{ $data } ) {
-                if ( ref $data->{$key} eq 'HASH' ) {
-                        $data->{$key} = $class->new($data->{$key});
+        if ( ref $data eq 'HASH' ) {
+                foreach my $key ( %{ $data } ) {
+                        if ( ref $data->{$key} eq 'HASH' ) {
+                                $data->{$key} = $class->new($data->{$key});
+                        } elsif ( ref $data->{$key} eq 'ARRAY' ) {
+                                foreach my $index ( $#{ $data->{$key} } ) {
+                                if ( ref $data->{$key}->[$index] eq 'HASH' ) {
+                                        $data->{$key}->[$index] = $class->new($data->{$key}->[$index]);
+                                }
+                        }
                 }
         }
+}
 
         bless { _data => $data }, $class;

dan/perl/closxop/lib/Closxop/Plugin.pm

@@ -14 +14 @@
         my $config = $context->config;
 
-        return $self unless
-                exists $config->{plugins} &&
-                ref $config->{plugins} eq 'ARRAY';
+        return $self unless $config->plugins && ref $config->plugins eq 'ARRAY';
 
-        foreach my $object ( @{ $config->{plugins} } ) {
-                next unless
-                        exists $object->{module} &&
-                        exists $object->{config};
+        foreach my $object ( @{ $config->plugins } ) {
+                next unless $object->module && $object->config;
 
-                if ( $self->plugin_name eq $object->{module} ) {
-                        $self->plugin_config($object->{config});
+                warn ref $object;
 
-                        my $priority = $self->plugin_config->{priority};
+                if ( $self->plugin_name eq $object->module ) {
+                        $self->plugin_config($object->config);
+
+                        my $priority = $self->plugin_config->priority;
                         $self->priority( $priority ? int $priority : 100 );