Merge lp:~corydodt/txgenshi/505689 into lp:txgenshi

[Cory Dodt]

[Cory Dodt (corydodt)]

This makes it easier to run the tests after installation.

[lp:~corydodt/txgenshi/505689]

35. By Cory Dodt on 2010-01-11

#505689: missed one

[Duncan McGreggor (oubiwann)]

Looks good!

+1

review: Approve

=== modified file 'ChangeLog'
--- ChangeLog	2008-07-18 15:51:29 +0000
+++ ChangeLog	2010-01-11 01:44:13 +0000
@@ -1,3 +1,11 @@
+2010.01.10
+
+* Added unit tests
+* Replaced getObjectData with a lazy evaluation scheme that will not cause
+side effects to occur unless requested (by including the variable in a
+template)
+* Cleaned up organization of the demo
+
 2008.07.18
 
 * Renamed myloaders.

=== modified file 'README'
--- README	2010-01-07 19:15:43 +0000
+++ README	2010-01-11 01:44:13 +0000
@@ -23,7 +23,7 @@
 
 To see a demo of txGenshi's features, run::
 
-    twistd -yn demo/demo.tac
+    twistd -yn txgenshidemo/demo.tac
 
 Then visit http://localhost:8080/
 

=== modified file 'TODO'
--- TODO	2008-07-18 12:27:47 +0000
+++ TODO	2010-01-11 01:44:13 +0000
@@ -4,11 +4,12 @@
 Bugs
 ----
  * Fix XInclude support
+ * See https://bugs.launchpad.net/txgenshi/+bugs
 
 Placeholders
 ------------
- * Update the demo.resources Genshi code with comments about usage.
- * Remove print statements and pdb calls.
+ * Update the txgenshidemo.resources Genshi code with comments about usage.
+ * Remove pdb calls.
 
 Version 0.0.1
 -------------

=== removed file 'bin/demo.tac'
--- bin/demo.tac	2008-07-18 12:17:18 +0000
+++ bin/demo.tac	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-from twisted.application import service
-from twisted.application import strports
-
-from nevow import appserver
-
-from demo import resources
-
-# create the application
-application = service.Application('Site')
-
-# setup the site root
-root = resources.SiteRoot()
-site = appserver.NevowSite(root)
-
-# setup the web server
-server = strports.service('tcp:8080', site)
-server.setServiceParent(application)

=== modified file 'txgenshi/test/example.py'
--- txgenshi/test/example.py	2010-01-07 19:15:43 +0000
+++ txgenshi/test/example.py	2010-01-11 01:44:13 +0000
@@ -9,14 +9,16 @@
 
 from txgenshi.loader import genshifile
 
+
 class Apple:
     color = "red"
 
+
 class GenshiMixPage(rend.Page):
     """
     Example page with genshi templates demo
     """
-    docFactory = genshifile(sibpath(__file__, '../../demo/templates/genshimix.xhtml'))
+    docFactory = genshifile(sibpath(__file__, '../../txgenshidemo/templates/genshimix.xhtml'))
     addSlash = True
 
     def __init__(self, username=None, *args, **kwds):

=== modified file 'txgenshi/util.py'
--- txgenshi/util.py	2008-07-18 12:05:00 +0000
+++ txgenshi/util.py	2010-01-11 01:44:13 +0000
@@ -192,13 +192,20 @@
     'author_email': "[e-mail]",
     'url': txgenshi.projectURL,
     'packages': find_packages(),
-    #'scripts': ['bin/txgenshi.tac'],
     'long_description': catReST(
         'README',
         'DEPENDENCIES',
          out=False),
     'license': 'MIT',
     'classifiers': txgenshi.classifiers,
+    'package_data': {
+        'txgenshidemo': ['demo.tac',
+                 'templates/genshimix.xhtml',
+                 'templates/genshiinclude.xhtml',
+                 'templates/home.xhtml',
+                 'templates/mystuff.xhtml',
+                 'templates/yourstuff.xhtml',
+                 ]}
     }
 
 

=== renamed directory 'demo' => 'txgenshidemo'
=== modified file 'txgenshidemo/demo.tac'
--- demo/demo.tac	2010-01-07 19:27:46 +0000
+++ txgenshidemo/demo.tac	2010-01-11 01:44:13 +0000
@@ -3,7 +3,7 @@
 """
 from twisted.application import internet, service
 from nevow.appserver import NevowSite
-from demo.resources import SiteRoot
+from txgenshidemo.resources import SiteRoot
 
 port = 8080
 

=== modified file 'txgenshidemo/resources.py'
--- demo/resources.py	2010-01-07 19:15:43 +0000
+++ txgenshidemo/resources.py	2010-01-11 01:44:13 +0000
@@ -8,11 +8,11 @@
 
 class MyStuffResource(rend.Page):
     addSlash = True
-    docFactory = loaders.xmlfile('demo/templates/mystuff.xhtml')
+    docFactory = loaders.xmlfile('txgenshidemo/templates/mystuff.xhtml')
 
 class YourStuffResource(rend.Page):
     addSlash = True
-    docFactory = loaders.xmlfile('demo/templates/yourstuff.xhtml')
+    docFactory = loaders.xmlfile('txgenshidemo/templates/yourstuff.xhtml')
 
     def __init__(self, username='', *args, **kwds):
         super(YourStuffResource, self).__init__(*args, **kwds)
@@ -23,7 +23,7 @@
 
 class SiteRoot(rend.Page):
     addSlash = True
-    docFactory = loaders.xmlfile('demo/templates/home.xhtml')
+    docFactory = loaders.xmlfile('txgenshidemo/templates/home.xhtml')
     child_mystuff = MyStuffResource()
 
     def getUsernameFromCookie(self, context):