Fix #2459 - puppetdoc added namespace classes as RDoc modules instead of classes

Puppetdoc while parsing a class name creates intermediate RDoc classes
to form a hierarchy. Due to a coding error, those intermediate classes
were created as RDoc modules.
Later, when puppetdoc was parsing the definition of one of this class,
it wasn't finding it in RDoc list of classes (since it was recorded
as a module).
Puppetdoc was then creating documentation for two objects of the same
name.

Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>

1 files changed, 5 insertions, 1 deletions

diff --git a/lib/puppet/util/rdoc/parser.rb b/lib/puppet/util/rdoc/parser.rb
index 80b3932ff..554f8cb00 100644
--- a/lib/puppet/util/rdoc/parser.rb
+++ b/lib/puppet/util/rdoc/parser.rb
@@ -68,7 +68,7 @@ class Parser
             prev_container = container
             container = find_object_named(container, name)
             unless container
-                container = prev_container.add_module(PuppetClass, name)
+                container = prev_container.add_class(PuppetClass, name, nil)
             end
         end
         return [container, final_name]
@@ -210,6 +210,10 @@ class Parser
         comment = klass.doc
         look_for_directives_in(container, comment) unless comment.empty?
         cls = container.add_class(PuppetClass, name, superclass)
+        # it is possible we already encountered this class, while parsing some namespaces
+        # from other classes of other files. But at that time we couldn't know this class superclass
+        # so, now we know it and force it.
+        cls.superclass = superclass
         cls.record_location(@top_level)
 
         # scan class code for include