Changeset 282

Timestamp:

12/21/06 12:20:33 (2 years ago)

Author:

scorfield

Message:

Addresses #95 by allowing fusebox.xml parameter overrides for lexiconPath and errortemplatesPath
and both of those can be relative (to the application root) or absolute / mapped. In addition
lexicons can now be relative (to the lexicon path) or absolute / mapped.

Location:

framework/trunk

Files:

• .settings/org.eclipse.core.resources.prefs (modified) (1 diff)
• fuseboxApplication.cfc (modified) (9 diffs)
• fuseboxCircuit.cfc (modified) (3 diffs)
• myFusebox.cfc (modified) (1 diff)

framework/trunk/.settings/org.eclipse.core.resources.prefs

@@ -1 @@
-#Wed Dec 20 12:07:13 PST 2006
+#Thu Dec 21 11:09:00 PST 2006
 eclipse.preferences.version=1
+encoding//skeleton/controller/circuit.xml.cfm=UTF-8
 encoding//skeleton/fusebox.xml.cfm=UTF-8
 encoding//skeleton/model/circuit.xml.cfm=UTF-8

framework/trunk/fuseboxApplication.cfc

@@ -93 +93 @@
                                         hint="I am the myFusebox data structure." />
                 
-                <!--- updated fix for ticket 135 --->
+                <!--- fixes ticket 95 for errortemplates and lexicons --->
                 <cfset var myVersion = "5.0.1.#REReplace('$LastChangedRevision$','[^0-9]','','all')#" />
 
@@ -108 +108 @@
                 <cfset variables.coreRoot = replace(getDirectoryFromPath(getCurrentTemplatePath()),"\","/","all") />
 
-                <cfset this.approotdirectory = this.webrootdirectory & replace(arguments.appPath,"\","/","all") />
-                <cfif right(this.approotdirectory,1) is not "/">
-                        <cfset this.approotdirectory = this.approotdirectory & "/" />
-                </cfif>
+                <cfset this.approotdirectory = normalizePartialPath(this.webrootdirectory & arguments.appPath) />
                 <!--- remove pairs of directory/../ to form canonical path: --->
                 <cfloop condition="find('/../',this.approotdirectory) gt 0">
@@ -302 +299 @@
         </cffunction>
         
+        <cffunction name="expandFuseboxPath" returntype="any" access="public" output="false" 
+                                hint="I expand a path in the context of a Fusebox application.">
+                <cfargument name="partialPath" type="any" required="true" 
+                                        hint="I am the partial path to expand. If I do not begin with a /, prepend the Fusebox application root." />
+
+                <cfif left(arguments.partialPath,1) is "/">
+                        <!--- absolute path, i.e., root-relative or mapped --->
+                        <cfreturn replace(expandPath(arguments.partialPath),"\","/","all") />
+                <cfelse>
+                        <!--- relative, i.e., relative to the Fusebox application root --->
+                        <cfreturn getApplicationRoot() & arguments.partialPath />
+                </cfif>
+                
+        </cffunction>
+        
         <cffunction name="getFuseboxXMLFilename" returntype="string" access="public" output="false" 
                                 hint="I return the actual name of the fusebox.xml(.cfm) file.">
@@ -538 +550 @@
                 <cfset var __ext = "." & this.scriptFileDelimiter />
                 <cfset var __errorFile = this.errortemplatesPath & __type & __ext />
-                <cfset var __handlerExists = fileExists(getApplicationRoot() & __errorFile) />
+                <cfset var __handlerExists = fileExists(expandFuseboxPath(__errorFile)) />
                 <cfset var FUSEBOX_APPLICATION_KEY = arguments.appKey />
                 
@@ -544 +556 @@
                         <cfset __type = listDeleteAt(__type,listLen(__type,"."),".") />
                         <cfset __errorFile = this.errortemplatesPath & __type & __ext />
-                        <cfset __handlerExists = fileExists(getApplicationRoot() & __errorFile) />
+                        <cfset __handlerExists = fileExists(expandFuseboxPath(__errorFile)) />
                 </cfloop>
                 <cfif __handlerExists>
-                        <cfinclude template="#getCoreToAppRootPath()##__errorFile#" />
+                        <cfif left(__errorFile,1) is "/">
+                                <cfinclude template="#__errorFile#" />
+                        <cfelse>
+                                <cfinclude template="#getCoreToAppRootPath()##__errorFile#" />
+                        </cfif>
                         <cfset __handled = true />
                 </cfif>
@@ -746 +762 @@
                         <cfset aLex = structNew() />
                         <cfset aLex.namespace = children[i].xmlAttributes.namespace />
-                        <cfset aLex.path = replace(children[i].xmlAttributes.path,"\","/","all") />
-                        <cfif right(aLex.path,1) is not "/">
-                                <cfset aLex.path = aLex.path & "/" />
-                        </cfif>
-                        <cfset aLex.path = getCoreToAppRootPath() & "lexicon/" & aLex.path />
+                        <cfset aLex.path = normalizePartialPath(children[i].xmlAttributes.path) />
+                        <!--- FB41 lexicons are deprecated so we don't support absolute / mapped paths: --->
+                        <cfset aLex.path = getCoreToAppRootPath() & this.lexiconPath & aLex.path />
                         <cfset variables.fb41Lexicons[children[i].xmlAttributes.namespace] = aLex />
                 </cfloop>
@@ -767 +781 @@
                                                         detail="You have attempted to declare a namespace '#aLex.namespace#' (in fusebox.xml) which is reserved by the Fusebox framework." />
                                 </cfif>
-                                <cfset attributes[attr] = replace(attributes[attr],"\","/","all") />
+                                <cfset attributes[attr] = normalizePartialPath(attributes[attr]) />
                                 <cfif left(attributes[attr],1) is "/">
                                         <!--- assume mapped / root-relative path --->
                                         <cfset aLex.path = attributes[attr] />
+                                <cfelseif left(this.lexiconPath,1) is "/">
+                                        <!--- assume mapped / root-relative path --->
+                                        <cfset aLex.path = this.lexiconPath & attributes[attr] />
                                 <cfelse>
-                                        <cfset aLex.path = getApplication().getCoreToAppRootPath() & getApplication().lexiconPath & attributes[attr] />
-                                </cfif>
-                                <cfif right(aLex.path,1) is not "/">
-                                        <cfset aLex.path = aLex.path & "/" />
+                                        <!--- relative paths --->
+                                        <cfset aLex.path = getCoreToAppRootPath() & 
+                                                        this.lexiconPath & attributes[attr] />
                                 </cfif>
                                 <cfset variables.lexicons[aLex.namespace] = aLex />
@@ -959 +975 @@
                 </cfloop>
                 
+                <!---
+                        if the user overrides certain path variables, we need to normalize them:
+                        - this.parsePath (reset parseRootPath)
+                        - this.pluginsPath
+                        - this.lexiconPath
+                        - this.errortemplatesPath
+                        normalizing means changing all \ to / and appending / if not present
+                --->
+                <cfset this.parsePath = normalizePartialPath(this.parsePath) />
+                <cfset this.parseRootPath = relativePath(expandFuseboxPath(this.parsePath),getApplicationRoot()) />
+                <cfset this.pluginsPath = normalizePartialPath(this.pluginsPath) />
+                <cfset this.lexiconPath = normalizePartialPath(this.lexiconPath) />
+                <cfset this.errortemplatesPath = normalizePartialPath(this.errortemplatesPath) />
+                
         </cffunction>
         
@@ -1059 +1089 @@
         </cffunction>
         
+        <cffunction name="normalizePartialPath" returntype="string" access="public" output="false" 
+                                hint="">
+                <cfargument name="partialPath" type="string" required="true" 
+                                        hint="" />
+                
+                <cfset var unixPath = replace(arguments.partialPath,"\","/","all") />
+                
+                <cfif right(unixPath,1) is not "/">
+                        <cfset unixPath = unixPath & "/" />
+                </cfif>
+                
+                <cfreturn unixPath />
+                
+        </cffunction>
+        
 </cfcomponent>

framework/trunk/fuseboxCircuit.cfc

@@ -189 +189 @@
                                 
                         </cftry>
+<!---           
+                        this was initially implemented as part of ticket 135 but feedback on
+                        the mailing list seems to indicate people think it is too draconian
+                        a restriction, even in strict mode - and I agree! -- Sean Corfield
                         
                         <cfif variables.fuseboxApplication.strictMode and not circuitImplicit and
@@ -196 +200 @@
                                                 detail="The circuit xml file, #circuitFile#, in #variables.fullPath#, uses a different file extension to the application's fusebox xml file. Strict requires consistency." />
                         </cfif>
-                        
+ --->                   
                         <cftry>
                                 
@@ -466 +470 @@
                                                         detail="You have attempted to declare a namespace '#aLex.namespace#' (in Circuit #getAlias()#) which is reserved by the Fusebox framework." />
                                 </cfif>
-                                <cfset attributes[attr] = replace(attributes[attr],"\","/","all") />
+                                <cfset attributes[attr] = variables.fuseboxApplication.normalizePartialPath(attributes[attr]) />
                                 <cfif left(attributes[attr],1) is "/">
                                         <!--- assume mapped / root-relative path --->
                                         <cfset aLex.path = attributes[attr] />
+                                <cfelseif left(variables.fuseboxApplication.lexiconPath,1) is "/">
+                                        <!--- assume mapped / root-relative path --->
+                                        <cfset aLex.path = variables.fuseboxApplication.lexiconPath & attributes[attr] />
                                 <cfelse>
-                                        <cfset aLex.path = variables.fuseboxApplication.getCoreToAppRootPath() & variables.fuseboxApplication.lexiconPath & attributes[attr] />
-                                </cfif>
-                                <cfif right(aLex.path,1) is not "/">
-                                        <cfset aLex.path = aLex.path & "/" />
+                                        <!--- relative paths --->
+                                        <cfset aLex.path = variables.fuseboxApplication.getCoreToAppRootPath() & 
+                                                        variables.fuseboxApplication.lexiconPath & attributes[attr] />
                                 </cfif>
                                 <cfset variables.lexicons[aLex.namespace] = aLex />

framework/trunk/myFusebox.cfc

@@ -51 +51 @@
 <cfcomponent hint="I provide the per-request myFusebox data structure and some convenience methods.">
         <cfscript>
-        // updated fix for ticket 135
+        // fixes ticket 95 for errortemplates and lexicons
         this.version.runtime     = "5.0.1.#REReplace('$LastChangedRevision$','[^0-9]','','all')#";