Changeset 177

Timestamp:

02/25/07 11:03:39 (2 years ago)

Author:

ingy

Message:

 r3466@skinny-2:  ingy | 2007-02-25 11:02:43 -0800
 Found a good refactoring for Config creation. Removed a bunch of unneeded
 code.

Files:

• trunk/src/core/Kwiki/lib/Kwiki/Boot/V1.pm (modified) (1 diff)
• trunk/src/core/Spoon/lib/Spoon/Config.pm (modified) (3 diffs)

trunk/src/core/Kwiki/lib/Kwiki/Boot/V1.pm

@@ -16 +16 @@
-    $self->config->add_file('config.yaml');
-    for my $filepath (glob 'config*.*') {
-override_filepath($filepath
+config($filepath, 1
-    }
-}

trunk/src/core/Spoon/lib/Spoon/Config.pm

@@ -4 +4 @@
-const class_id => 'config';
-field plugin_classes => [];
-field overrides => {};
-
-sub all {
-    return %$self;
-}
-
-sub add_override_filepath {
-    my $filepath = shift;
-    my $hash = $self->hash_from_file($filepath);
-    my $overrides = $self->overrides;
-    $overrides->{$_} = $hash->{$_} for keys %$hash;
-    $self->add_config($hash);
-}
-
@@ -22 +13 @@
-    for my $dir ($self->hub->paths->all_filepaths('config')) {
-        my $filepath = "$dir/$file";
-filepath($filepath
+config($filepath, @_
-          if -f $filepath;
-    }
-}
-
-sub add_filepath {
-    my $filepath = shift;
-    my $hash = $self->hash_from_file($filepath);
-    $self->add_config($hash);
-    $self->add_config($self->overrides);
-}
-
-# sub add_field {
-#     my ($field, $value) = @_;
-#     field $field;
-#     $self->{$field} = $value;
-# }
-
-sub add_config {
-    my $config = shift;
+    my $override = shift || 0;
-    my $hash = ref $config
-    ? $config
@@ -47 +26 @@
-    for my $key (keys %$hash) {
-        field $key;
-
+
+
+
-    }
-    return $hash;