Changeset 276

Timestamp:

12/16/06 19:47:03 (2 years ago)

Author:

scorfield

Message:

Addresses #139 by adding validation of the relative attribute and fixing the repeated circuit bug.

Location:

framework/trunk

Files:

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

framework/trunk/fuseboxApplication.cfc

@@ -93 +93 @@
                                         hint="I am the myFusebox data structure." />
                 
-                <!--- fixed ticket 164 --->
+                <!--- update to ticket 139 --->
                 <cfset var myVersion = "5.0.1.#REReplace('$LastChangedRevision$','[^0-9]','','all')#" />
 
@@ -650 +650 @@
                                 <cfthrow type="fusebox.badGrammar.requiredAttributeMissing"
                                                 message="Required attribute is missing"
-                                                detail="The attribute 'path' is required, for a 'circuit' declaration in fusebox.xml." />
+                                                detail="The attribute 'path' is required, for the declaration of circuit '#children[i].xmlAttributes.alias#' in fusebox.xml." />
                         </cfif>
                         <cfif structKeyExists(children[i].xmlAttributes,"parent")>
@@ -660 +660 @@
                         </cfif>
                         <cfif structKeyExists(children[i].xmlAttributes,"relative")>
-                                <!--- TODO: check it is boolean --->
+                                <cfif listFind("true,false,yes,no",children[1].xmlAttributes.relative) eq 0>
+                                        <cfthrow type="fusebox.badGrammar.invalidAttributeValue"
+                                                        message="Attribute has invalid value" 
+                                                        detail="The attribute 'relative' must either be ""true"" or ""false"", for the declaration of circuit '#children[i].xmlAttributes.alias#' in fusebox.xml." />
+                                </cfif>
                                 <cfset relative = children[i].xmlAttributes.relative />
                                 <cfset nAttrs = nAttrs + 1 />
                         <cfelse>
+                                <cfset relative = true />
                                 <cfset parent = "" />
                         </cfif>
@@ -669 +674 @@
                                 <cfthrow type="fusebox.badGrammar.unexpectedAttributes"
                                                 message="Unexpected attributes"
-                                                detail="Attributes other than 'alias', 'path' and 'parent' were found in the declaration of the '#alias#' circuit in fusebox.xml." />
+                                                detail="Attributes other than 'alias', 'path' and 'parent' were found for the declaration of circuit '#children[i].xmlAttributes.alias#' in fusebox.xml." />
                         </cfif>
                         <cfset alias = children[i].xmlAttributes.alias />

framework/trunk/myFusebox.cfc

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