Changeset 2345

Timestamp:

06/24/09 20:13:47 (15 months ago)

Author:

lmajano

Message:

Layouts External Locations is now finalized.

Location:

coldbox/trunk

Files:

• system/config/config.xsd (modified) (1 diff)
• system/plugins/Renderer.cfc (modified) (3 diffs)
• system/plugins/XMLParser.cfc (modified) (2 diffs)
• testharness/config/coldbox.xml.cfm (modified) (1 diff)
• testharness/extlayouts (added)
• testharness/extlayouts/ext.cfm (added)
• testharness/handlers/ehGeneral.cfc (modified) (1 diff)

coldbox/trunk/system/config/config.xsd

@@ -62 +62 @@
                                                                         <xs:enumeration value="IOCDefinitionFile" />
                                                                         <xs:enumeration value="IOCObjectCaching" />
+                                                                        <xs:enumeration value="LayoutsExternalLocation" />      
                                                                         <xs:enumeration value="MessageboxStyleOverride" />
                                                                         <xs:enumeration value="ModelsExternalLocation" />

coldbox/trunk/system/plugins/Renderer.cfc

@@ -37 +37 @@
                         instance.appMapping = controller.getSetting("AppMapping");
                         instance.viewsExternalLocation = controller.getSetting('ViewsExternalLocation');
+                        instance.layoutsExternalLocation = controller.getSetting('LayoutsExternalLocation');
                         
                         /* Inject UDF For Views/Layouts */
@@ -197 +198 @@
         <!--- Render the layout --->
         <cffunction name="renderLayout" access="Public" hint="Renders the current layout + view Combinations if declared." output="false" returntype="any">
-                <cfset var cbox_RederedLayout = "">
                 <cfset var Event = controller.getRequestService().getContext()>
                 <cfset var rc = event.getCollection()>
                 <cfset var cbox_CurrentLayout = Event.getcurrentLayout()>
+                <cfset var cbox_layoutPath = "">
+                <cfset var cbox_RederedLayout = "">
                 
                 <!--- Check if no view has been set. --->
@@ -219 +221 @@
                         <cfif cbox_CurrentLayout eq "">
                                 <cfset cbox_RederedLayout = renderView()>
-                        <cfelse>
-                                <cfsavecontent variable="cbox_RederedLayout"><cfoutput><cfinclude template="/#instance.appMapping#/#instance.layoutsConvention#/#cbox_CurrentLayout#"></cfoutput></cfsavecontent>
+                        <cfelse>                        
+                                <!--- The Layout Path is by convention or external?? --->
+                                <cfset cbox_layoutPath = "/#instance.appMapping#/#instance.layoutsConvention#/#cbox_CurrentLayout#">
+                                <!--- Check if View does not exists in Conventions --->
+                                <cfif not fileExists(expandPath(cbox_layoutPath))>
+                                        <!--- Set the Path to be the External Location --->
+                                        <cfset cbox_layoutPath = "#instance.layoutsExternalLocation#/#cbox_CurrentLayout#">
+                                        <!--- Verify the External Location now --->
+                                        <cfif not fileExists(expandPath(cbox_layoutPath))>
+                                                <cfthrow message="Layout not located" 
+                                                                 detail="The layout: #cbox_layoutPath# could not be located in the conventions folder or in the external location. Please verify the layout name" 
+                                                                 type="Renderer.LayoutNotFoundException">
+                                        </cfif>
+                                </cfif>
+                                <!--- RenderLayout --->
+                                <cfsavecontent variable="cbox_RederedLayout"><cfoutput><cfinclude template="#cbox_layoutPath#"></cfoutput></cfsavecontent>
                         </cfif>
                 <cfset controller.getDebuggerService().timerEnd(timerHash)>

coldbox/trunk/system/plugins/XMLParser.cfc

@@ -205 +205 @@
                         //return settings
                         return settingsStruct;
-                }//end of try
+                }
                 catch( Any Exception ){
                         throw("Error Loading Framework Configuration.","#Exception.Message# #Exception.Detail#","ColdBox.plugins.XMLParser.ColdboxSettingsParsingException");
@@ -633 +633 @@
                         }
                         
+                        /* ::::::::::::::::::::::::::::::::::::::::: EXTERNAL LAYOUTS LOCATION :::::::::::::::::::::::::::::::::::::::::::: */
+                        
+                        /* check for LayoutsExternalLocation */
+                        if( structKeyExists(configStruct,"LayoutsExternalLocation") and configStruct["LayoutsExternalLocation"] neq "" ){
+                                /* Verify the locations, do relative to the app mapping first */
+                                if( directoryExists(controller.getAppRootPath() & configStruct["LayoutsExternalLocation"]) ){
+                                        configStruct["LayoutsExternalLocation"] = "/" & ConfigStruct["AppMapping"] & "/" & configStruct["LayoutsExternalLocation"];
+                                }
+                                else if( not directoryExists(expandPath(configStruct["LayoutsExternalLocation"])) ){
+                                        throw("LayoutsExternalLocation could not be found.","The directories tested was relative and expanded using #configStruct['LayoutsExternalLocation']#. Please verify your setting.","XMLParser.ConfigXMLParsingException");
+                                }
+                                /* Cleanup */
+                                if ( right(configStruct["LayoutsExternalLocation"],1) eq "/" ){
+                                         configStruct["LayoutsExternalLocation"] = left(configStruct["LayoutsExternalLocation"],len(configStruct["LayoutsExternalLocation"])-1);
+                                }
+                        }else{
+                                configStruct["LayoutsExternalLocation"] = "";
+                        }
+                        
                         /* ::::::::::::::::::::::::::::::::::::::::: MAIL SETTINGS :::::::::::::::::::::::::::::::::::::::::::: */
                         

coldbox/trunk/testharness/config/coldbox.xml.cfm

@@ -43 +43 @@
                 <Setting name="RequestContextDecorator"         value="coldbox.testharness.model.myRequestContextDecorator" />
                 <Setting name="ProxyReturnCollection"           value="false"/>
+                
+                <Setting name="LayoutsExternalLocation"     value="extlayouts" />
         </Settings>
 

coldbox/trunk/testharness/handlers/ehGeneral.cfc

@@ -203 +203 @@
                 <cfscript>
                 var rc = Event.getCollection();
+                //external location;
+                event.setLayout("ext");
                 Event.setView("tags/test1");
                 </cfscript>