Changeset 266 for framework/trunk/fuseboxApplication.cfc

Timestamp:

11/06/06 15:14:58 (2 years ago)

Author:

scorfield

Message:

Addresses #139 by adding a new attribute, relative=, to the <circuit> declaration in fusebox.xml and,
in strict mode, validating path= and throwing an exception if it is "/absolute/" rather than "relative/".
The default behavior is compatibile with Fusebox 5.0.0 and earlier releases.

Files:

• framework/trunk/fuseboxApplication.cfc (modified) (5 diffs)

framework/trunk/fuseboxApplication.cfc

@@ -93 +93 @@
                                         hint="I am the myFusebox data structure." />
                 
-                <!--- fixed ticket 99 again --->
+                <!--- fixed ticket 139 --->
                 <cfset var myVersion = "5.0.1.#REReplace('$LastChangedRevision$','[^0-9]','','all')#" />
 
@@ -635 +635 @@
                 <cfset var alias = "" />
                 <cfset var parent = "" />
+                <cfset var relative = true />
                 <cfset var nAttrs = 0 />
                 
@@ -658 +659 @@
                                 <cfset nAttrs = 2 />
                         </cfif>
+                        <cfif structKeyExists(children[i].xmlAttributes,"relative")>
+                                <!--- TODO: check it is boolean --->
+                                <cfset relative = children[i].xmlAttributes.relative />
+                                <cfset nAttrs = nAttrs + 1 />
+                        <cfelse>
+                                <cfset parent = "" />
+                        </cfif>
                         <cfif this.strictMode and nAttrs neq structCount(children[i].xmlAttributes)>
                                 <cfthrow type="fusebox.badGrammar.unexpectedAttributes"
@@ -668 +676 @@
                         <cfif structKeyExists(previousCircuits,alias) and
                                         children[i].xmlAttributes.path is previousCircuits[alias].getOriginalPath() and
-                                        parent is previousCircuits[alias].parent>
+                                        parent is previousCircuits[alias].parent and
+                                        relative eq previousCircuits[alias].getOriginalPathIsRelative()>
                                 <!--- old circuit, we can just reload it --->
                                 <cfset this.circuits[alias] = previousCircuits[alias].reload(arguments.myFusebox) />
@@ -675 +684 @@
                                 <cfset this.circuits[alias] =
                                                 createObject("component","fuseboxCircuit")
-                                                        .init(this,alias,children[i].xmlAttributes.path,parent,arguments.myFusebox) />
+                                                        .init(this,alias,children[i].xmlAttributes.path,parent,arguments.myFusebox,relative) />
                         </cfif>
                 </cfloop>