Changeset 278

Timestamp:

12/19/06 17:09:53 (2 years ago)

Author:

scorfield

Message:

Addresses #95 by allowing new-style lexicons to specify a leading / and therefore
treat the lexicon path as a root-relative or mapped path (instead of being below
the lexicons/ directory inside the application root).

Location:

framework/trunk

Files:

• fuseboxApplication.cfc (modified) (2 diffs)
• fuseboxCircuit.cfc (modified) (1 diff)
• myFusebox.cfc (modified) (1 diff)

framework/trunk/fuseboxApplication.cfc

@@ -93 +93 @@
                                         hint="I am the myFusebox data structure." />
                 
-                <!--- fixed ticket 73 --->
+                <!--- partial fix for ticket 95 --->
                 <cfset var myVersion = "5.0.1.#REReplace('$LastChangedRevision$','[^0-9]','','all')#" />
 
@@ -746 +746 @@
                                                         detail="You have attempted to declare a namespace '#aLex.namespace#' (in fusebox.xml) which is reserved by the Fusebox framework." />
                                 </cfif>
-                                <cfset aLex.path = getApplication().getCoreToAppRootPath() & getApplication().lexiconPath & attributes[attr] />
+                                <cfset attributes[attr] = replace(attributes[attr],"\","/","all") />
+                                <cfif left(attributes[attr],1) is "/">
+                                        <!--- assume mapped / root-relative path --->
+                                        <cfset aLex.path = 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 & "/" />
+                                </cfif>
                                 <cfset variables.lexicons[aLex.namespace] = aLex />
                                 <cfset variables.customAttributes[aLex.namespace] = structNew() />

framework/trunk/fuseboxCircuit.cfc

@@ -446 +446 @@
                                                         detail="You have attempted to declare a namespace '#aLex.namespace#' (in Circuit #getAlias()#) which is reserved by the Fusebox framework." />
                                 </cfif>
-                                <cfset aLex.path = variables.fuseboxApplication.getCoreToAppRootPath() & variables.fuseboxApplication.lexiconPath & attributes[attr] />
+                                <cfset attributes[attr] = replace(attributes[attr],"\","/","all") />
+                                <cfif left(attributes[attr],1) is "/">
+                                        <!--- assume mapped / root-relative path --->
+                                        <cfset aLex.path = 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 & "/" />
+                                </cfif>
                                 <cfset variables.lexicons[aLex.namespace] = aLex />
                                 <cfset variables.customAttributes[aLex.namespace] = structNew() />

framework/trunk/myFusebox.cfc

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