Changeset 191

Timestamp:

06/14/06 20:47:10 (3 years ago)

Author:

scorfield

Message:

Fixes #72 by removing development-parse-only, renaming development-no-load (to development-circuit-load), adding development-full-load and deprecating development mode.

Location:

fusebox5

Files:

• fusebox5.cfm (modified) (2 diffs)
• fuseboxApplication.cfc (modified) (2 diffs)
• myFusebox.cfc (modified) (3 diffs)
• skeleton/fusebox.xml.cfm (modified) (1 diff)

fusebox5/fusebox5.cfm

@@ -182 +182 @@
 </cftry>
 <!---
-        must special case development-no-load mode since it causes circuits to reload during
+        must special case development-circuit-load mode since it causes circuits to reload during
         the compile (post-load) phase and therefore must be exclusive
 --->
@@ -188 +188 @@
         <cfset request._fuseboxLog.trace("Fusebox","Compiling requested fuseaction '#attributes.fuseaction#'") />
 </cfif>
-<cfif _fba.mode is "development-no-load">
+<cfif _fba.mode is "development-circuit-load">
         <cflock name="#application.ApplicationName#_fusebox_#FUSEBOX_APPLICATION_KEY#" type="exclusive" timeout="300">
                 <cfset _parsedFileData = _fba.compileRequest(attributes.fuseaction,myFusebox) />

fusebox5/fuseboxApplication.cfc

@@ -494 +494 @@
                                         detail="You specified a Circuit of #arguments.circuit# which is not defined." />
                 </cfif>
-                <!--- FB5: development-no-load only reloads the requested circuit --->
-                <cfif this.mode is "development-no-load">
+                <!--- FB5: development-circuit-load only reloads the requested circuit --->
+                <cfif this.mode is "development-circuit-load">
                         <!--- FB5: ensure we only reload each circuit once per request --->
                         <cfif not structKeyExists(request._fuseboxCircuitsLoaded,arguments.circuit)>
@@ -657 +657 @@
                         </cfif>
                         <cfset alias = children[i].xmlAttributes.alias />
-                        <!--- record each circuit load per request - optimization for development-no-load mode --->
+                        <!--- record each circuit load per request - optimization for development-circuit-load mode --->
                         <cfset request._fuseboxCircuitsLoaded[alias] = true />
                         <cfif structKeyExists(previousCircuits,alias) and

fusebox5/myFusebox.cfc

@@ -65 +65 @@
         this.parameters = structNew();
         
-        // the basic default is development mode  
+        // the basic default is development-full-load mode:
         this.parameters.load = true;
+        this.parameters.parse = true;
+        this.parameters.execute = true;
+        // FB5: new execution parameters:
         this.parameters.clean = false;          // don't delete parsed files by default
-        this.parameters.parse = true;
         this.parameters.parseall = false;       // don't compile all fuseactions by default
-        this.parameters.execute = true;
           
         this.parameters.userProvidedLoadParameter = false;
@@ -102 +103 @@
                 <cfif structKeyExists(theFusebox,"mode")>
                         <cfswitch expression="#theFusebox.mode#">
+                        <!--- FB41 backward compatibility - now deprecated --->
                         <cfcase value="development">
+                                <cfif structKeyExists(theFusebox,"strictMode") and theFusebox.strictMode>
+                                        <!--- since we don't load fusebox.xml if we throw an exception, we must fixup the value for the next run --->
+                                        <cfset theFusebox.mode = "development-full-load" />
+                                        <cfthrow type="fusebox.badGrammar.deprecated" 
+                                                        message="Deprecated feature"
+                                                        detail="'development' is a deprecated execution mode - use 'development-full-load' instead." />
+                                </cfif>
                                 <cfset this.parameters.load = true />
                                 <cfset this.parameters.parse = true />
                                 <cfset this.parameters.execute = true />
                         </cfcase>
-                        <!--- FB5: new option - loading is slower so it's worth not loading everything --->
-                        <cfcase value="development-no-load">
-                                <cfset this.parameters.load = false />
+                        <!--- FB5: replacement for old development mode --->
+                        <cfcase value="development-full-load">
+                                <cfset this.parameters.load = true />
                                 <cfset this.parameters.parse = true />
                                 <cfset this.parameters.execute = true />
                         </cfcase>
-                        <!--- FB5: new option - loading is slower so it's worth having a parse-only mode --->
-                        <cfcase value="development-parse-only">
+                        <!--- FB5: new option - does not load fusebox.xml and therefore does not (re-)load fuseboxApplication object --->
+                        <cfcase value="development-circuit-load">
                                 <cfset this.parameters.load = false />
                                 <cfset this.parameters.parse = true />
@@ -124 +133 @@
                                 <cfset this.parameters.execute = true />
                         </cfcase>
+                        <cfdefaultcase>
+                                <!--- since we don't load fusebox.xml if we throw an exception, we must fixup the value for the next run --->
+                                <cfset theFusebox.mode = "development-full-load" />
+                                <cfthrow type="fusebox.badGrammar.invalidParameterValue" 
+                                                message="Parameter has invalid value" 
+                                                detail="The parameter 'mode' must be one of 'development-full-load', 'development-circuit-load' or 'production' in the fusebox.xml file." />
+                        </cfdefaultcase>
                         </cfswitch>
                 </cfif>

fusebox5/skeleton/fusebox.xml.cfm

@@ -17 +17 @@
         <parameters>
                 <parameter name="defaultFuseaction" value="app.welcome" />
-                <!-- you probably want to change this to development mode: -->
-                <parameter name="mode" value="development-no-load" />
+                <!-- you may want to change this to development-full-load mode: -->
+                <parameter name="mode" value="development-circuit-load" />
                 <!-- change this to something more secure: -->
                 <parameter name="password" value="skeleton" />