Changeset 98

Timestamp:

12/30/05 23:06:29 (3 years ago)

Author:

tim

Message:

added htmlfile htfile htfiledata and html types

Files:

• branches/timadditionaltypes/pyramid/build.py (modified) (3 diffs)
• branches/timadditionaltypes/pyramid/flatteners.py (modified) (4 diffs)
• branches/timadditionaltypes/pyramid/yamlRegistry.py (modified) (2 diffs)

branches/timadditionaltypes/pyramid/build.py

@@ -130 +130 @@
-
-def main(options,args):
+    
-    if options.resources:
-        resourcedirs = options.resources.split(',')
@@ -141 +142 @@
-    else:
-        rebuilddirs = None    
-,partialbuild=options.partialbuild
+
-
-if __name__ == "__main__":
@@ -149 +150 @@
-    parser.add_option("-r", "--resources", dest="resources", help="comma separated list of resource directories to copy", metavar="RESOURCES")
-    parser.add_option("-v", "--verbose", action="store_true", dest="verbose", default=False, help="print status messages to stdout")    
-    #parser.add_option("-p", "--partialbuild", action="store_true", dest="partialbuild", default=False, help="allow a partial build from cache files, does not remove existing directory")
-    parser.add_option("-R", "--rebuilddirs",dest="rebuilddirs",help="only rebuild below these comma separated directories",metavar="REBUILDDIRS")
-    (options, args) = parser.parse_args()

branches/timadditionaltypes/pyramid/flatteners.py

@@ -5 +5 @@
-from pyramid.path import path
-import copy
+import rfc822
-from pprint import pprint
-
@@ -59 +60 @@
-        return T.xml(restParser.html_fragment(file(os.path.join(dir,self.original)).read()))
-
+class HtmlFileFlattener(components.Adapter):
+    def flatten(self, ctx, dir):
+        return T.xml(file(os.path.join(dir,self.original)).read())
+
+class HtmlFlattener(components.Adapter):
+    def flatten(self, ctx, dir):
+        return T.xml(self.original)
+    
+class HtFileFlattener(components.Adapter):
+    def flatten(self, ctx, dir):
+        message = rfc822.Message(open(os.path.join(dir,self.original)))
+        data = dict(message)
+        body = message.fp.read()
+        if data.get('content-type',None) == 'text/x-rst':
+            return T.xml(restParser.html_fragment(body))
+        else:
+            return T.xml(body)
+
+class HtFileDataFlattener(components.Adapter):
+    def flatten(self, ctx, dir):
+        message = rfc822.Message(open(os.path.join(dir,self.original.file)))
+        data = dict(message)
+        if self.original.key is not None:
+            return data[self.original.key]
+        else:
+            return flatten(self.original)
+        
-class AHrefFlattener(components.Adapter):
-    def flatten(self, ctx, dir):
@@ -231 +259 @@
-    return data
-
-
-
-# registration for adapters
-components.registerAdapter(DictFlattener,         dict,           IFlattener)
@@ -239 +265 @@
-components.registerAdapter(RestFlattener,         Y.rest,         IFlattener)
-components.registerAdapter(RestFileFlattener,     Y.restfile,     IFlattener)
+components.registerAdapter(HtmlFlattener,         Y.html,         IFlattener)
+components.registerAdapter(HtmlFileFlattener,     Y.htmlfile,     IFlattener)
+components.registerAdapter(HtFileFlattener,       Y.htfile,       IFlattener)
+components.registerAdapter(HtFileDataFlattener,   Y.htfiledata,   IFlattener)
-components.registerAdapter(FragmentFlattener,     Y.fragment,     IFlattener)
-components.registerAdapter(FragmentFileFlattener, Y.fragmentFile, IFlattener)

branches/timadditionaltypes/pyramid/yamlRegistry.py

@@ -72 +72 @@
-    '''
-    pass
+
+class html(str):
+    ''' a rest file for converting to html
+    '''
+    pass
+
+class htmlfile(str):
+    ''' a rest file for converting to html
+    '''
+    pass
+
+class htfile(str):
+    ''' a rest file for converting to html
+    '''
+    pass
+
+class htfiledata:
+    ''' a rest file for converting to ht file datafile and key
+    '''
+    def __init__(self,node):
+        self.file = node['file']
+        self.key = node.get('key',None)
+        
+    def __repr__(self):
+        return '<htfiledata: file=%s, key=%s>'%(self.file,self.key)
+        
+    def __eq__(self,other):
+        return self.file == other.file and self.key == other.key
+
+    def __ne__(self,other):
+        return self.file != other.file or self.key != other.key
-
-class rhref(str):
@@ -178 +209 @@
-    ('yaml.org','2002','breadcrumb'): breadcrumb,
-    ('yaml.org','2002','acquire'): acquire,
+    ('yaml.org','2002','html'): html,
+    ('yaml.org','2002','htmlfile'): htmlfile,
+    ('yaml.org','2002','htfile'): htfile,
+    ('yaml.org','2002','htfiledata'): htfiledata,
-    ('python.yaml.org','2002','object:pyramid.path.path'): pathconstruct,
-    ('python.yaml.org','2002','object:pyramid.core.Context'): context,