Changeset 24866

Timestamp:

11/25/08 23:46:08 (4 years ago)

Author:

tokuhirom

Message:

refactoring

Location:

lang/perl/MENTA/trunk/lib

Files:

• MENTA.pm (modified) (3 diffs)
• MENTA/Dispatch.pm (modified) (1 diff)
• MENTA/TemplateLoader.pm (modified) (1 diff)

lang/perl/MENTA/trunk/lib/MENTA.pm

@@ -91 +91 @@
 sub __render_partial {
     my ($tmpl, $tmpldir, @params) = @_;
-    MENTA::Util::require_once('MENTA/TemplateLoader.pm');
     MENTA::TemplateLoader::__load("$tmpldir/$tmpl", @params);
 }
@@ -98 +97 @@
 sub render {
     my ($tmpl, @params) = @_;
-    bless \__render_partial($tmpl, controller_dir(), @params), 'MENTA::Template::RawString';
+    my $out = MENTA::TemplateLoader::__load("@{[ controller_dir() ]}/$tmpl", @params);
+    bless \$out, 'MENTA::Template::RawString';
 }
 
@@ -109 +109 @@
 sub render_and_print {
     my ($tmpl, @params) = @_;
-    my $out = __render_partial($tmpl, controller_dir(), @params);
+    MENTA::Util::require_once('MENTA/TemplateLoader.pm');
+    my $out = MENTA::TemplateLoader::__load("@{[ controller_dir() ]}/$tmpl", @params);
     $out = MENTA::Util::encode_output($out);
 

lang/perl/MENTA/trunk/lib/MENTA/Dispatch.pm

@@ -31 +31 @@
             }
         } elsif (-f $controller_mt) {
-            my $out = main::__render_partial("${path}.mt", main::controller_dir());
+            MENTA::Util::require_once('MENTA/TemplateLoader.pm');
+            my $tmpldir = main::controller_dir();
+            my $out = MENTA::TemplateLoader::__load("${tmpldir}/${path}.mt", main::controller_dir());
             $out = MENTA::Util::encode_output($out);
             main::finalize($out);

lang/perl/MENTA/trunk/lib/MENTA/TemplateLoader.pm

@@ -21 +21 @@
         my $tmplcode = eval $code;
         die $@ if $@;
-        $out = $tmplcode->();
+        $out = $tmplcode->(@params);
         __update_cache($path, $code);
     }