Changeset 190

Timestamp:

03/26/07 19:24:24 (1 year ago)

Author:

ingy

Message:

 r3675@skinny:  ingy | 2007-03-23 19:49:22 -0700
 Make Spoon::Template rely on Paths module.
 
 Start really fleshing out the Paths module.

Files:

• trunk/lib/Kwiki/Paths.pm (added)
• trunk/src/core/Kwiki/lib/Kwiki/Boot/Base.pm (modified) (1 diff)
• trunk/src/core/Kwiki/lib/Kwiki/Command/V2.pm (modified) (1 diff)
• trunk/src/core/Kwiki/lib/Kwiki/Paths.pm (added)
• trunk/src/core/Kwiki/lib/Kwiki/Paths/V1.pm (modified) (2 diffs)
• trunk/src/core/Kwiki/lib/Kwiki/Paths/V2.pm (modified) (2 diffs)
• trunk/src/core/Spoon/lib/Spoon/Base.pm (modified) (1 diff)
• trunk/src/core/Spoon/lib/Spoon/Config.pm (modified) (1 diff)
• trunk/src/core/Spoon/lib/Spoon/Template.pm (modified) (3 diffs)
• trunk/src/core/modules.mk (modified) (1 diff)

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

@@ -49 +49 @@
-
-sub add_plugins_files {
-path
+
-        $self->config->add_plugins_file($file);
-    }

trunk/src/core/Kwiki/lib/Kwiki/Command/V2.pm

@@ -23 +23 @@
-
-sub create_database {
-path
+
-    my $target_path = $ENV{KWIKI_DATABASE_LOCATION} or return;
-    my $target = io($target_path);

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

@@ -1 +1 @@
-package Kwiki::Paths::V1;
-Base
+Paths
-use Cwd qw(cwd abs_path);
-
+sub path_values_init {
+    my $values = {};
+    $values->{template} = 
+        $self->hub->config->{template_path} ||
+        [ './template/tt2' ];
+    return $values;
+}
+
-# All directories in the config chain (starting at root).
-all_paths
+lookup_chain_init
-    my $dir = cwd();
-@paths = ($dir)
+$paths = [$dir]
-    while (1) {
-        my $updir = abs_path("$dir/..") or last;
@@ -12 +20 @@
-        $dir = $updir;
-        last unless -e "$dir/config.yaml";
-
+
+
+
-    }
-@
+$
-}
-
-# All filepaths in the chain ending with the given file
-path
+
-    my $file = shift;
-    return ('./config') if $file eq 'config';
-
-
+
-}
-
-# First filepath in the chain ending with the given file
-sub first_filepath {
-    return scalar $self->all_paths(shift);
-}

trunk/src/core/Kwiki/lib/Kwiki/Paths/V2.pm

@@ -1 +1 @@
-package Kwiki::Paths::V2;
-Base
+Paths
-use Cwd qw(cwd abs_path);
-
-field 'all_paths_cache';
-
+sub path_values_init {
+    my $values = {};
+
+    return $values;
+}
+
-# All directories in the config chain (starting at root).
-all_paths
+lookup_chain_init
-    my $paths;
-#     delete $self->{all_paths_cache} if @_;
-#     $paths = $self->all_paths_cache;
-#     return @$paths if ref $paths;
-    $paths = [];
-#     $self->all_paths_cache($paths);
-    my $seen = {};
-    
@@ -40 +42 @@
-    }
-
-@
+
-}
-
-# All filepaths in the chain ending with the given file
-sub all_filepaths {
-    my $file = shift;
-    return grep { -e $_ } map "$_/$file", $self->all_paths(@_);
-}
-
-# First filepath in the chain ending with the given file
-sub first_filepath {
-    my @all = $self->all_paths(@_);
-    return $all[-1];
-}

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

@@ -160 +160 @@
-}
-
+sub utf8_upgrade {
+    my @list = map pack('U*', unpack 'U0U*', $_), @_;
+    return wantarray ? @list : $list[0];
+}
+
-sub uri_escape {
-    require CGI::Util;

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

@@ -11 +11 @@
-sub add_file {
-    my $file = shift;
-path
+
-        my $filepath = "$dir/$file";
-        $self->add_config($filepath, @_)

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

@@ -1 +1 @@
-package Spoon::Template;
-use Spoon::Base -Base, 'conf';
-# use Spoon::Base 'conf';
-use Template;
-
-const class_id => 'template';
-const template_path => [ './template' ];
-field path => [];
-field config => -init => '$self->hub->config';
-field cgi => -init => '$self->hub->cgi';
-field template_object =>
-      -init => '$self->create_template_object';
-conf template_path => [ './template/tt2' ];
-
-
-
-
+
+
+
+
+
+
-
-sub all {
-    return ( 
-
-
+hub->
+hub->
-        hub => $self->hub,
-    );
-}
-
-sub add_path {
-    for (reverse @_) {
-        $self->remove_path($_);
-        unshift @{$self->path}, $_;
-    }
-}
-
-sub append_path {
-    for (@_) {
-        $self->remove_path($_);
-        push @{$self->path}, $_;
-    }
-}
-
-sub remove_path {
-    my $path = shift;
-    $self->path([grep {$_ ne $path} @{$self->path}]);
-}
-
@@ -52 +28 @@
-        $self->render($_, $self->all, @_)
-    } @templates;
-}
-
-sub compile_dir {
-    my $dir = $self->plugin_directory . '/ttc';
-    mkdir $dir unless -d $dir;
-    return $dir;
-}
-        
-sub create_template_object {
-    require Template;
-    # XXX Make template caching a configurable option
-    Template->new({
-        LOAD_TEMPLATES => [
-            Kwiki::Template::TT2::UTF8::Provider->new({
-                INCLUDE_PATH => $self->path,
-            })],
-        # INCLUDE_PATH => $self->path,
-        TOLERANT => 0,
-        COMPILE_DIR => $self->compile_dir,
-        COMPILE_EXT => '.ttc',
-    });
-}
-
@@ -87 +42 @@
-}
-
+sub create_template_object {
+    require Template;
+    # XXX Make template caching a configurable option
+    Template->new({
+        LOAD_TEMPLATES => [
+            Kwiki::Template::TT2::UTF8::Provider->new({
+                INCLUDE_PATH => $self->hub->paths->get_path('template'),
+            })],
+        # INCLUDE_PATH => $self->path,
+        TOLERANT => 0,
+        COMPILE_DIR => $self->compile_dir,
+        COMPILE_EXT => '.ttc',
+    });
+}
+
+sub compile_dir {
+    my $dir = $self->plugin_directory . '/ttc';
+    mkdir $dir unless -d $dir;
+    return $dir;
+}
+
-package Kwiki::Template::TT2::UTF8::Provider;
-use base 'Template::Provider';
-
-
-
-
-
+
-
-sub _load {

trunk/src/core/modules.mk

@@ -58 +58 @@
-        Kwiki/Pages.pm \
-        Kwiki/Pane.pm \
+        Kwiki/Paths.pm \
-        Kwiki/Plugin.pm \
-        Kwiki/Preferences.pm \