fix problems with Kind not being set

antoniogamiz · Aug 5, 2019 · 41d9acc · 41d9acc
1 parent ec99e90
commit 41d9acc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/lib/Perl6/Documentable.pm6 b/lib/Perl6/Documentable.pm6
@@ -11,7 +11,7 @@ class Perl6::Documentable {
 
     has Str  $.name;
     has      $.pod;
-    has      $.kind;
+    has Kind $.kind;
     has      @.subkinds   = [];
     has      @.categories = [];
 

diff --git a/lib/Perl6/Documentable/File.pm6 b/lib/Perl6/Documentable/File.pm6
@@ -49,8 +49,8 @@ class Perl6::Documentable::File is Perl6::Documentable {
             :$pod!
     ) {
         # kind and url setting
-        my $kind = $pod.config<kind>;
-        die X::Documentable::MissingMetadata.new(:$filename, metadata => "kind") unless $kind;
+        my $kind = Kind(Kind.enums{ $pod.config<kind> });
+        die X::Documentable::MissingMetadata.new(:$filename, metadata => "kind") unless defined $kind;
         my $url = "/{$kind.lc}/$filename";
 
         # proper name from =TITLE
@@ -66,7 +66,7 @@ class Perl6::Documentable::File is Perl6::Documentable {
         unless ($subtitle ~~ Pod::Block::Named and $subtitle.name eq "SUBTITLE");
         my $summary = recurse-until-str($subtitle);
 
-        # type-graph sets the correct subkind and categories
+        # use metadata in pod config
         my @subkinds   = $pod.config<subkind>.List;
         my @categories = $pod.config<category>.List;
 

diff --git a/t/201-documentable-file.t b/t/201-documentable-file.t
@@ -83,17 +83,19 @@ subtest "Index X<> heading" => {
 
 # check exceptions
 
-=begin pod
+=begin pod :kind("Type") :subkind(" ") :category(" ")
+
+Test
 
 =end pod
 
-=begin pod
+=begin pod :kind("Type") :subkind(" ") :category(" ")
 
 =TITLE test
 
 =end pod
 
-=begin pod
+=begin pod :kind("Type") :subkind(" ") :category(" ")
 
 =SUBTITLE test