Changeset 283

Timestamp:

12/23/06 02:17:38 (2 years ago)

Author:

scorfield

Message:

Addresses #95 by allowing fusebox.xml override for pluginsPath which can be relative
(to the application root) or absolute / mapped. A <plugin> can also specify a path=
attribute that is either relative (to the plugins directory) or absolute / mapped.

Location:

framework/trunk

Files:

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

framework/trunk/fuseboxApplication.cfc

@@ -93 +93 @@
                                         hint="I am the myFusebox data structure." />
                 
-                <!--- fixes ticket 95 for errortemplates and lexicons --->
+                <!--- fixes ticket 95 for plugins --->
                 <cfset var myVersion = "5.0.1.#REReplace('$LastChangedRevision$','[^0-9]','','all')#" />
 

framework/trunk/fuseboxCircuit.cfc

@@ -79 +79 @@
                 <cfset variables.lexicons = structNew() />
                 
-                <cfset variables.relativePath = replace(arguments.path,"\","/","all") />
-                <cfif len(variables.relativePath) and right(variables.relativePath,1) is not "/">
-                        <cfset variables.relativePath = variables.relativePath & "/" />
-                </cfif>
+                <cfset variables.relativePath = variables.fuseboxApplication.normalizePartialPath(arguments.path) />
                 <cfset this.path = variables.relativePath />
                 <!--- ticket 139: allow absolute path names and mappings: --->

framework/trunk/fuseboxPlugin.cfc

@@ -93 +93 @@
 
                         <cfif structKeyExists(arguments.pluginXML.xmlAttributes,"path")>
-                                <cfset this.path = this.path & replace(arguments.pluginXML.xmlAttributes.path,"\","/","all") />
-                        </cfif>
-                        <cfif right(this.path,1) is not "/">
-                                <cfset this.path = this.path & "/" />
+                                <cfif left(arguments.pluginXML.xmlAttributes.path,1) is "/">
+                                        <!--- path is absolute, ignore normal plugins path --->
+                                        <cfset this.path = arguments.fbApp.normalizePartialPath(arguments.pluginXML.xmlAttributes.path) />
+                                <cfelse>
+                                        <cfset this.path = this.path & arguments.fbApp.normalizePartialPath(arguments.pluginXML.xmlAttributes.path) />
+                                </cfif>
                         </cfif>
                         
@@ -135 +137 @@
                                 <cfset variables.template = variables.template & ext />
                         </cfif>
-                        <cfset this.rootpath =
-                                        arguments.fbApp.relativePath(arguments.fbApp.getApplicationRoot() &
-                                                                                                        this.path,arguments.fbApp.getApplicationRoot()) />
+                        <cfif left(this.path,1) is "/">
+                                <cfset this.rootpath =
+                                                arguments.fbApp.relativePath(arguments.fbApp.expandFuseboxPath(this.path),arguments.fbApp.getApplicationRoot()) />
+                        <cfelse>
+                                <cfset this.rootpath =
+                                                arguments.fbApp.relativePath(arguments.fbApp.getApplicationRoot() &
+                                                                                                                this.path,arguments.fbApp.getApplicationRoot()) />
+                        </cfif>
                         <!--- remove pairs of directory/../ to form canonical path: --->
                         <cfloop condition="find('/../',this.rootpath) gt 0">
@@ -196 +203 @@
                 <cfswitch expression="#variables.phase#">
                 <cfcase value="processError,fuseactionException">
-                        <cffile action="read" file="#variables.fuseboxApplication.getApplicationRoot()##this.path##variables.template#"
-                                        variable="file"
-                                        charset="#variables.fuseboxApplication.characterEncoding#" />
+                        <cfif left(this.path,1) is "/">
+                                <cffile action="read" file="#variables.fuseboxApplication.expandFuseboxPath(this.path)##variables.template#"
+                                                variable="file"
+                                                charset="#variables.fuseboxApplication.characterEncoding#" />
+                        <cfelse>
+                                <cffile action="read" file="#variables.fuseboxApplication.getApplicationRoot()##this.path##variables.template#"
+                                                variable="file"
+                                                charset="#variables.fuseboxApplication.characterEncoding#" />
+                        </cfif>
                         <cfset arguments.writer.rawPrintln(file) />
                 </cfcase>
@@ -208 +221 @@
                         <cfset arguments.writer.println('<cfset myFusebox.thisPlugin = "#getName()#"/>') />
                         <cfset arguments.writer.print('<' & 'cfoutput><' & 'cfinclude template=') />
-                        <cfset arguments.writer.print('"#variables.fuseboxApplication.parseRootPath##this.path##variables.template#"') />
+                        <cfif left(this.path,1) is "/">
+                                <cfset arguments.writer.print('"#this.path##variables.template#"') />
+                        <cfelse>
+                                <cfset arguments.writer.print('"#variables.fuseboxApplication.parseRootPath##this.path##variables.template#"') />
+                        </cfif>
                         <cfset arguments.writer.println('/><' & '/cfoutput>') />
                         <cfset arguments.writer.setPhase(p) />

framework/trunk/myFusebox.cfc

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