deps test fails

4 files changed, 22 insertions, 10 deletions

diff --git a/lib/WebCoso.pm b/lib/WebCoso.pm
index 66fbf5f..37111b5 100644
--- a/lib/WebCoso.pm
+++ b/lib/WebCoso.pm
@@ -37,10 +37,10 @@ class WebCoso {
         return $f;
     }
 
-    method new-doc(:$dir) {
+    method new-page($dir) {
         @!docs.push(WebCoso::Doc::Page.new(:$dir,wc=>self));
     }
-    method new-feed(:$dir) {
+    method new-feed($dir) {
         @!docs.push(WebCoso::Doc::Feed.new(:$dir,wc=>self));
     }
     method run() {
diff --git a/lib/WebCoso/Doc/Base.pm b/lib/WebCoso/Doc/Base.pm
index 9ceefa1..46afce8 100644
--- a/lib/WebCoso/Doc/Base.pm
+++ b/lib/WebCoso/Doc/Base.pm
@@ -4,16 +4,26 @@ use WebCoso::Maker::RST;
 use WebCoso::Maker::XHTML;
 use WebCoso::Maker::HTML;
 
-role WebCoso::Doc::Base[$basename] {
+class WebCoso::Doc::Base {
     has $!wc;
     has $.dir;
 
-    has $.tt = WebCoso::Maker::TT.new(:$basename,:$!dir,:$!wc);
-    has $.rst = WebCoso::Maker::RST.new(:$basename,:$!dir,:$!wc);
-    has $.xhtml = WebCoso::Maker::XHTML.new(:$basename,:$!dir,:$!wc);
-    has $.html = WebCoso::Maker::HTML.new(:$basename,:$!dir,:$!wc);
+    has $.tt;
+    has $.rst;
+    has $.xhtml;
+    has $.html;
 
+    method basename() { ... }
+
+    submethod BUILD(:$wc,:$dir) {
+        my $basename = self.basename;
+        $!tt = WebCoso::Maker::TT.new(:$basename,:$dir,:$wc);
+        $!rst = WebCoso::Maker::RST.new(:$basename,:$dir,:$wc);
+        $!xhtml = WebCoso::Maker::XHTML.new(:$basename,:$dir,:$wc);
+        $!html = WebCoso::Maker::HTML.new(:$basename,:$dir,:$wc);
+    }
+    
     method make() {
-        .html.get-files();
+        $.html.get-files();
     }
 }
diff --git a/lib/WebCoso/Doc/Feed.pm b/lib/WebCoso/Doc/Feed.pm
index 2b36c1e..1fda60a 100644
--- a/lib/WebCoso/Doc/Feed.pm
+++ b/lib/WebCoso/Doc/Feed.pm
@@ -1,4 +1,5 @@
 # -*- mode: perl6 -*-
 use WebCoso::Doc::Base;
-class WebCoso::Doc::Feed does WebCoso::Doc::Base['feed'] {
+class WebCoso::Doc::Feed is WebCoso::Doc::Base {
+    method basename { 'feed' }
 }
diff --git a/lib/WebCoso/Doc/Page.pm b/lib/WebCoso/Doc/Page.pm
index be92d8c..438ef4a 100644
--- a/lib/WebCoso/Doc/Page.pm
+++ b/lib/WebCoso/Doc/Page.pm
@@ -1,4 +1,5 @@
 # -*- mode: perl6 -*-
 use WebCoso::Doc::Base;
-class WebCoso::Doc::Page does WebCoso::Doc::Base['document'] {
+class WebCoso::Doc::Page is WebCoso::Doc::Base {
+    method basename() { 'document' }
 }