[Happydoc-checkins] CVS: HappyDoc3/happydoclib/docset docset_MultiHTMLFile.py,1.7,1.8 test_docset_MultiHTMLFile.py,1.5,1.6

[Doug H. <dou...@us...>]

Update of /cvsroot/happydoc/HappyDoc3/happydoclib/docset
In directory sc8-pr-cvs1:/tmp/cvs-serv15399/happydoclib/docset

Modified Files:
	docset_MultiHTMLFile.py test_docset_MultiHTMLFile.py 
Log Message:
Use an anchor tag instead of just the name of the node in the
TOC list.


Index: docset_MultiHTMLFile.py
===================================================================
RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/docset/docset_MultiHTMLFile.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** docset_MultiHTMLFile.py	8 Dec 2002 17:02:58 -0000	1.7
--- docset_MultiHTMLFile.py	8 Dec 2002 17:19:05 -0000	1.8
***************
*** 191,196 ****
          return
  
      def _writeTOCReferencesSection(self, output, packageTreeNode, title, moduleList):
!         descriptive_list = [ (name,) + node.getSummaryAndFormat()
                               for name, node in moduleList ]
          if descriptive_list:
--- 191,219 ----
          return
  
+     def _computeRelativeHREF(self, source, destination):
+         relative_path = source.getPathToNode(destination)
+         if not relative_path:
+             return '.'
+ 
+         destination_name = destination.getName()
+         if relative_path[-1] == destination_name:
+             #
+             # Need to replace with output name.
+             #
+             output_name = self.getOutputFilenameForPackageTreeNode(
+                 destination,
+                 includePath=0,
+                 )
+             relative_path = relative_path[:-1] + (output_name,)
+ 
+         href = '/'.join(relative_path)
+         return href
+ 
+     def _getAnchorTagForPackageTreeNode(self, source, destination):
+         href = self._computeRelativeHREF(source, destination)
+         return '<a href="%s">%s</a>' % (href, destination.getName())
+ 
      def _writeTOCReferencesSection(self, output, packageTreeNode, title, moduleList):
!         descriptive_list = [ (self._getAnchorTagForPackageTreeNode(packageTreeNode, node), ) + node.getSummaryAndFormat()
                               for name, node in moduleList ]
          if descriptive_list:

Index: test_docset_MultiHTMLFile.py
===================================================================
RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/docset/test_docset_MultiHTMLFile.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** test_docset_MultiHTMLFile.py	8 Dec 2002 17:03:28 -0000	1.5
--- test_docset_MultiHTMLFile.py	8 Dec 2002 17:19:05 -0000	1.6
***************
*** 225,228 ****
--- 225,295 ----
          return
  
+ class GetHREFTestCase(unittest.TestCase):
+ 
+     def setUp(self):
+         import os
+         cwd = os.getcwd()
+         input_dir = os.path.join(cwd, 'TestCases/testScanner')
+         scanner = Scanner([input_dir])
+ 
+         trees = scanner.getPackageTrees()
+         expected_tree = trees[0]
+         self.expected_tree = expected_tree
+         
+         self.docset = MultiHTMLFileDocSet(scanner,
+                                           'Testing',
+                                           '/tmp/foo',
+                                           )
+         return
+ 
+     def testSelfHREF(self):
+         target = self.expected_tree['levelOne']['levelTwo']['two.py']
+         start = self.expected_tree['levelOne']['levelTwo']['two.py']
+ 
+         href = self.docset._computeRelativeHREF(start, target)
+         self.failUnlessEqual(href,
+                              '.',
+                              )
+         return
+     
+     def testParentDirOfModuleDirHREF(self):
+         target = self.expected_tree['levelOne']
+         start = self.expected_tree['levelOne']['levelTwo']['two.py']
+ 
+         href = self.docset._computeRelativeHREF(start, target)
+         self.failUnlessEqual(href,
+                              '..',
+                              )
+         return
+     
+     def testModuleSameDirHREF(self):
+         target = self.expected_tree['levelOne']['one.py']
+         start = self.expected_tree['levelOne']['ignoreme.py']
+ 
+         href = self.docset._computeRelativeHREF(start, target)
+         self.failUnlessEqual(href,
+                              'one.html',
+                              )
+         return
+     
+     def testModuleParentDirHREF(self):
+         target = self.expected_tree['levelOne']['one.py']
+         start = self.expected_tree['levelOne']['levelTwo']['two.py']
+ 
+         href = self.docset._computeRelativeHREF(start, target)
+         self.failUnlessEqual(href,
+                              '../one.html',
+                              )
+         return
+     
+     def testParentDirOfDirHREF(self):
+         target = self.expected_tree['levelOne']
+         start = self.expected_tree['levelOne']['levelTwo']
+ 
+         href = self.docset._computeRelativeHREF(start, target)
+         self.failUnlessEqual(href,
+                              '..',
+                              )
+         return