Changeset 258

Timestamp:

07/04/08 18:14:01 (5 months ago)

Author:

akaihola

Message:

[yui] Added support for optional modules. Improved error handling.

Location:

trunk/yui

Files:

• components.py (modified) (1 diff)
• middleware.py (modified) (2 diffs)

trunk/yui/components.py

@@ -5 +5 @@
         self.name = name
         self.data = data
+
+    @property
+    def optional(self):
+        return self.data.get('optional', [])
 
     @property

trunk/yui/middleware.py

@@ -218 +218 @@
                 self._rolled_up_components[r] for r in direct_deps
                 if r in self._rolled_up_components]
-            all_deps = set(direct_deps).union(set(indirect_deps))
+            all_deps = set(direct_deps) \
+                       .union(set(indirect_deps)) \
+                       .union(set(component.optional))
             deps_left = comps.intersection(all_deps)
             for r in self._sort_components(deps_left):
@@ -257 +259 @@
             loader.add_component(component)
 
-        content = YUI_INIT_RE.sub(loader.render(), content, 1)
-        response.content = YUI_INIT_RE.sub(
-            '<!-- WARNING: MULTIPLE YUI_init STATEMENTS -->', content)
+        tags = loader.render()
+        if tags:
+            content, count = YUI_INIT_RE.subn(tags, content, 1)
+            if count != 1:
+                content += ('<p>%d YUI init tags found,'
+                            'at least one expected</p>' % count)
+            response.content = YUI_INIT_RE.sub(
+                '<!-- WARNING: MULTIPLE YUI init STATEMENTS -->', content)
 
         return response