Changeset 266 for framework/trunk/fuseboxCircuit.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/fuseboxCircuit.cfc (modified) (4 diffs)

framework/trunk/fuseboxCircuit.cfc

@@ -63 +63 @@
                 <cfargument name="myFusebox" type="myFusebox" required="true" 
                                         hint="I am the myFusebox data structure." />
+                <cfargument name="relative" type="boolean" required="true" 
+                                        hint="I indicate whether the path is relative or absolute (mapped)." />
                 
                 <cfset variables.fuseboxApplication = arguments.fbApp />
                 <cfset variables.alias = arguments.alias />
+                <cfset variables.relative = arguments.relative />
 
                 <cfset variables.fuseboxLexicon = variables.fuseboxApplication.getFuseactionFactory().getBuiltinLexicon() />
@@ -81 +84 @@
                 </cfif>
                 <cfset this.path = variables.relativePath />
-                <cfset variables.fullPath = variables.appPath & variables.relativePath />
+                <!--- ticket 139: allow absolute path names and mappings: --->
+                <cfif left(variables.relativePath,1) is "/">
+                        <cfif variables.relative>
+                                <!--- unintentional absolute path? --->
+                                <cfif variables.fuseboxApplication.strictMode>
+                                        <cfthrow type="fusebox.badGrammar.illegalPath"
+                                                        message="Circuit path is not relative"
+                                                        detail="The 'path' value '#variables.originalPath#' for circuit #getAlias()# specifies an absolute path. Did you forget to specify 'relative=""false""'?" />
+                                </cfif>
+                                <cfset variables.fullPath = variables.appPath & variables.relativePath />
+                        <cfelse>
+                                <!--- explicit absolute / mapped path: --->
+                                <cfset variables.fullPath = expandPath(variables.relativePath) />
+                        </cfif>
+                <cfelse>
+                        <cfif variables.relative>
+                                <cfset variables.fullPath = variables.appPath & variables.relativePath />
+                        <cfelse>
+                                <cfthrow type="fusebox.badGrammar.illegalPath"
+                                                message="Circuit path is relative"
+                                                detail="The 'path' value '#variables.originalPath#' for circuit #getAlias()# should specify an absolute path when 'relative=""false""'." />
+                        </cfif>
+                </cfif>
                 <!--- remove pairs of directory/../ to form canonical path: --->
                 <cfloop condition="find('/../',variables.fullPath) gt 0">
                         <cfset variables.fullPath = REreplace(variables.fullPath,"[^\.:/]*/\.\./","") />
                 </cfloop>
+                <!---
+                        this was not correctly normalized prior to ticket 139 but it didn't really matter
+                        until absolute paths were allowed in that ticket:
+                --->
+                <cfset variables.relativePath = variables.fuseboxApplication.relativePath(variables.appPath,variables.fullPath) />
                 <cfset this.rootPath = variables.fuseboxApplication.relativePath(variables.fullPath,variables.appPath) />
 
@@ -140 +170 @@
                                                 <cfthrow type="fusebox.missingCircuitXML" 
                                                                 message="missing circuit.xml" 
-                                                                detail="The circuit xml file, #circuitFile#, for circuit #getAlias()# could not be found."
+                                                                detail="The circuit xml file, #circuitFile#, for circuit #getAlias()# could not be found in #variables.fullPath#."
                                                                 extendedinfo="#cfcatch.detail#" />
                                         </cfif>
@@ -284 +314 @@
         
                 <cfreturn variables.circuitFile />
+        
+        </cffunction>
+
+        <cffunction name="getOriginalPathIsRelative" returntype="string" access="public" output="false" 
+                                hint="I return true if this circuit's declaration used a relative path.">
+        
+                <cfreturn variables.relative />
         
         </cffunction>