@@ -2,27 +2,26 @@ role Cache; use Config; -has $.cache_dir = Config.server_root ~ 'data/cache'; +method cache-dir { + return $.config.server_root ~ 'data/cache'; +} method set-cache-entry( $key, $value ) { - my $file = $.cache_dir ~ '/' ~ $key; + my $file = self.cache-dir ~ '/' ~ $key; my $fh = open( $file, :w ); - say 'DOUBLE SETTING'; - $fh.say( $value.perl ); - say 'TRIPPLE SETTING'; + $fh.say( $value ); $fh.close; } method get-cache-entry( $key ) { - my $file = $.cache_dir ~ '/' ~ $key; + my $file = self.cache-dir ~ '/' ~ $key; return undef unless $file ~~ :e; my $string = slurp( $file ); - my $stuff = eval( $string ); - return $stuff; + return $string; } method remove-cache-entry( $key ) { - my $file = $.cache_dir ~ '/' ~ $key; + my $file = self.cache-dir ~ '/' ~ $key; return unless $file ~~ :e; unlink( $file ); } lib/Cache.pm @@ -53,9 +53,6 @@ class November does Session does Cache { return; } - use $.config.markup; - my $markup = $.config.markup.new; # Text::Markup::Wiki::MediaWiki.new; - # TODO: we need plugin system (see topics in mail-list) my $t = Tags.new; @@ -67,6 +64,9 @@ class November does Session does Cache { $content = $cached_page; } else { + use $.config.markup; + my $markup = $.config.markup.new; # Text::Markup::Wiki::MediaWiki.new; + $content = $markup.format($.storage.read_page( $page ), link_maker => { self.make_link($^p, $^t) }, extlink_maker => { self.make_extlink($^p, $^t) lib/November.pm e7d1a3076158721c4419768e8e9f1cf3843984be Johan Viklund johan.viklund@gmail.com http://github.com/viklund/november/commit/542438b05dda2cd2b3862248d5a21befdeb6eb34 542438b05dda2cd2b3862248d5a21befdeb6eb34 2009-04-01T00:47:13-07:00 2009-04-01T00:47:13-07:00 Caching of view_page implemented, ~30% speedup 9480b5991855a6565a4b1ae44f0db589e5441230 Johan Viklund johan.viklund@gmail.com