@@ -9,8 +9,11 @@ class CGI {
has $!crlf = "\x[0D]\x[0A]";
- # RAKUDO: BUILD method not supported
- method init() {
+ submethod BUILD() {
+ # RAKUDO #66792, Attribute defaults don't get instantiated when BUILD
+ # method exists.
+ $!crlf = "\x[0D]\x[0A]";
+
self.parse_params(%*ENV<QUERY_STRING>);
# It's prudent to handle CONTENT_LENGTH too, but right now that's not
# a priority. It would make our tests scripts more complicated, with
@@ -31,11 +34,11 @@ class CGI {
self.eat_cookie( %*ENV<HTTP_COOKIE> ) if %*ENV<HTTP_COOKIE>;
- $!uri = URI.new;
my $uri_str = 'http://' ~ %*ENV<SERVER_NAME>;
$uri_str ~= ':' ~ %*ENV<SERVER_PORT> if %*ENV<SERVER_PORT>;
$uri_str ~= %*ENV<MODPERL6> ?? %*ENV<PATH_INFO> !! %*ENV<REQUEST_URI>;
- $.uri.init($uri_str);
+
+ $!uri = URI.new( uri => $uri_str );
}
# For debugging
lib/CGI.pm
@@ -18,12 +18,11 @@ class November does Session does Cache {
has CGI $.cgi;
has Config $.config;
- # RAKUDO: BUILD not implemented yet
- method init {
+ submethod BUILD( :$config = Config.new ) {
+ $!config = $config;
$!storage = November::Storage::File.new(
- storage_root => $.config.server_root ~ 'data/'
+ storage_root => $!config.server_root ~ 'data/'
);
- $!storage.init(); # Want ze BUILD submethod
}
method handle_request(CGI $cgi) {
@@ -319,10 +318,10 @@ class November does Session does Cache {
$template.with_params(
{
- WEBROOT => $.config.web_root,
+ WEBROOT => $!config.web_root,
LOGGED_IN => self.logged_in,
- SKIN => $.config.skin,
- TMPL_PATH => $.config.template_path,
+ SKIN => $!config.skin,
+ TMPL_PATH => $!config.template_path,
%params
}
);
lib/November.pm
@@ -16,11 +16,13 @@ class November::Storage::File is November::Storage {
has $.recent_changes_path is rw; # = $r ~ 'data/recent-changes';
has $.index_path is rw; # = $r ~ 'data/index';
- method init {
- $.content_path = $.storage_root ~ 'articles/';
- $.modifications_path = $.storage_root ~ 'modifications/';
- $.recent_changes_path = $.storage_root ~ 'recent-changes';
- $.index_path = $.storage_root ~ 'index';
+ submethod BUILD(:$storage_root) {
+ $!storage_root = $storage_root;
+
+ $!content_path = $!storage_root ~ 'articles/';
+ $!modifications_path = $!storage_root ~ 'modifications/';
+ $!recent_changes_path = $!storage_root ~ 'recent-changes';
+ $!index_path = $!storage_root ~ 'index';
}
method wiki_page_exists($page) {
lib/November/Storage/File.pm
@@ -1,9 +1,8 @@
role Session;
-use Config;
-
-# TODO can we use November $!config here? or parametrise this role?
-has $.sessionfile_path = Config.new.server_root ~ 'data/sessions';
+method sessionfile-path {
+ return $.config.server_root ~ 'data/sessions';
+}
method add_session($id, %stuff) {
my $sessions = self.read_sessions();
@@ -18,14 +17,14 @@ method remove_session($id) {
}
method read_sessions {
- return {} unless $.sessionfile_path ~~ :e;
- my $string = slurp( $.sessionfile_path );
+ return {} unless self.sessionfile-path ~~ :e;
+ my $string = slurp( self.sessionfile-path );
my $stuff = eval( $string );
return $stuff;
}
method write_sessions( $sessions ) {
- my $fh = open( $.sessionfile_path, :w );
+ my $fh = open( self.sessionfile-path, :w );
$fh.say( $sessions.perl );
$fh.close;
}
lib/Session.pm
@@ -1,21 +1,21 @@
class URI;
+use URI::Grammar;
# RAKUDO: Match object does not do assignment properly :(
#my Match $.parts; dies in init with 'Type mismatch in assignment';
# workaround:
has $.uri;
has @.chunks;
-method init ($str) {
- use URI::Grammar;
+submethod BUILD(:$uri) {
# clear string before parsing
- my $c_str = $str;
+ my $c_str = $uri;
$c_str .= subst(/^ \s* ['<' | '"'] /, '');
$c_str .= subst(/ ['>' | '"'] \s* $/, '');
URI::Grammar.parse($c_str);
- unless $/ { die "Could not parse URI: $str" }
+ unless $/ { die "Could not parse URI: $uri" }
$!uri = $/;
@!chunks = $/<path><chunk> // ('');
lib/URI.pm
@@ -13,7 +13,5 @@ my $c = Config.new(
my November $wiki = November.new(
config => $c,
);
-$wiki.init();
my $cgi = CGI.new;
-$cgi.init();
$wiki.handle_request($cgi);
wiki
2d67b9e68d8932494090d5e926bab1f2d3e9a641
Johan Viklund
johan.viklund@gmail.com
http://github.com/viklund/november/commit/5e2b49ab91e35dc48da17b22464ad496bc063e07
5e2b49ab91e35dc48da17b22464ad496bc063e07
2009-06-21T10:36:37-07:00
2009-06-21T10:36:37-07:00
BUILD-methods everywhere instead of init(). Closes #12
432d5a652c03a3ad79bc1f0751cf9e5f978be95d
Johan Viklund
johan.viklund@gmail.com