nitdoc: migrate client to new doc API

Signed-off-by: Alexandre Terrasa <alexandre@moz-code.org>

diff --git a/src/nitdoc.nit b/src/nitdoc.nit
index 2591863..801e715 100644 (file)
--- a/src/nitdoc.nit
+++ b/src/nitdoc.nit
@@ -24,7 +24,16 @@ redef class ToolContext
        # Nitdoc generation phase.
        var docphase: Phase = new Nitdoc(self, null)
 
-       init do super # to fix ambiguous linearization
+       # Do not generate documentation for attributes.
+       var opt_no_attributes = new OptionBool("Ignore the attributes", "--no-attributes")
+
+       # Do not generate documentation for private properties.
+       var opt_private = new OptionBool("Also generate private API", "--private")
+
+       redef init do
+               super
+               option_context.add_option(opt_no_attributes, opt_private)
+       end
 end
 
 # Nitdoc phase explores the model and generate pages for each mentities found
@@ -33,9 +42,10 @@ private class Nitdoc
        redef fun process_mainmodule(mainmodule, mmodules)
        do
                var doc = new DocModel(mainmodule.model, mainmodule)
+               if not toolcontext.opt_private.value then doc.min_visibility = protected_visibility
+               if not toolcontext.opt_no_attributes.value then doc.include_attribute = false
 
                var phases = [
-                       new ExtractionPhase(toolcontext, doc),
                        new IndexingPhase(toolcontext, doc),
                        new MakePagePhase(toolcontext, doc),
                        new POSetPhase(toolcontext, doc),

diff --git a/tests/sav/nitdoc_args3.res b/tests/sav/nitdoc_args3.res
index 4d76b95..fd347db 100644 (file)
--- a/tests/sav/nitdoc_args3.res
+++ b/tests/sav/nitdoc_args3.res
@@ -21,11 +21,8 @@ index.html
 js/
 less/
 module_base_attr_nullable-.html
-property_base_attr_nullable-__Bar___a3.html
 property_base_attr_nullable-__Bar__a3.html
 property_base_attr_nullable-__Bar__a3_61d.html
-property_base_attr_nullable-__Foo___a1.html
-property_base_attr_nullable-__Foo___a2.html
 property_base_attr_nullable-__Foo__a1.html
 property_base_attr_nullable-__Foo__a1_61d.html
 property_base_attr_nullable-__Foo__a2.html
@@ -35,7 +32,6 @@ property_base_attr_nullable-__Foo__run.html
 property_base_attr_nullable-__Foo__run_other.html
 property_base_attr_nullable-__Int___43d.html
 property_base_attr_nullable-__Int__output.html
-property_base_attr_nullable-__Integer___val.html
 property_base_attr_nullable-__Integer__init.html
 property_base_attr_nullable-__Integer__output.html
 property_base_attr_nullable-__Integer__val.html