Changeset 60

Timestamp:

12/18/05 13:16:54 (3 years ago)

Author:

tim

Message:

updated code to ensure it produces exactly the same output as before refactoring, it is also generating the correct cache files for each directory

Files:

• branches/timcommithook/pyramid/dictutils.py (modified) (1 diff)
• branches/timcommithook/pyramid/flatteners.py (modified) (5 diffs)
• branches/timcommithook/pyramid/pyramid (modified) (1 diff)
• branches/timcommithook/pyramid/yamlRegistry.py (modified) (1 diff)

branches/timcommithook/pyramid/dictutils.py

@@ -5 +5 @@
-def merge(a,b,dir=None):
-    
-
+ and dir is not None
-        # special case. If b is the same as a, it has been inhereited - sectionnav's
-        # should not inherit in this fashion however

branches/timcommithook/pyramid/flatteners.py

@@ -85 +85 @@
-class AcquireFlattener(components.Adapter):
-    def flatten(self, ctx, dir):
+        # An acquite flattener gets the data from another file (i.e. if you want the nav data from the main index file.
+        # original.file is the filename of the data file and orginal.name is the dictionary key
-        key = self.original.name
-
-
+
+
+
+
+
+
+
-        data = inheritAndMergeLocals(self,ctx,dir,name,parentdata).get(key,{})
-        return flatten(data, ctx, dir)
-
-def acquireTemplate(ctx,template):
+    """ recursively ascends the data directory looking for an appropriate template
+    """ 
-    searchpath = ctx.path
-    while searchpath != ctx.root:
@@ -107 +116 @@
-    def flatten(self, ctx, dir):
-
+        # Get the canonical directory and filename for this file
-        dir,name = os.path.split(os.path.join(dir,self.original.file))
-
@@ -112 +122 @@
-            print '=== Current Fragment ( %s )' % name
-        
-
-
+
+
+
+
+
+
+
+
-        mergedData = inheritAndMergeLocals(self,ctx,dir,name,parentdata)
-
+        # Flatten the resultant data ready for use in the template
-        flattenedMergedData = flatten( mergedData, ctx, dir )
-
@@ -129 +146 @@
-    '''
-    def flatten(self, ctx, dir):
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    ''' 
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    parentpath = str(ctx.path.parent)
-    parentdata = copy.deepcopy(ctx.data.get(parentpath,{}).get(name,Y.fragment({})))
-    try:
-        # read then parse the file
-        yaml = file(os.path.join(dir,name)).read()
-        self.original = syck.load(yaml,Loader=Y.Loader, implicit_typing=False)
-    except:
-        # if the file can't be read. fall back to the parent data. This is to allow a missing file to be inherited from further up
-        # also only looks up a single directory
-        self.original = copy.deepcopy(parentdata)
-    return parentdata
-
+
-def inheritAndMergeLocals(self,ctx,dir,name,parentdata):
-    ''' store a copy of the data (merged with it's parentdata) on the context and then merge it with the current local data
@@ -165 +207 @@
-    # store it on the context
-    # take a copy of the data from this .yml file's globals and merge it with the parent data
+    # Also assigning the locals with the current local data
-    node = Y.fragment( {
-        'template':self.original.template,
-        'global':dictutils.merge(parentdata.globals.copy(),globals,dir=path(dir).normpath()),
-
+
+
-        } )
-    # set this fragment on the context with a key of the yaml file name

branches/timcommithook/pyramid/pyramid

@@ -1 @@
-
+
-import sys, os
-#sys.path.insert(0, os.path.join(sys.prefix, 'lib/pyramid/dependencies'))

branches/timcommithook/pyramid/yamlRegistry.py

@@ -13 +13 @@
-        self.locals = node.get('local',{})
-        self.globals = node.get('global',{})
+        self.file = node.get('file',None)
-
-    def __repr__(self):