Merge branch 'master' of github.com:coldbox-modules/cbwire into devel…

…opment

models/Component.cfc

@@ -51,7 +51,7 @@ component output="true" {
      */
     function onDIComplete() {
         if ( isNull( variables._id ) ) {
-            variables._id = hash( createUUID() );
+            variables._id = lCase( hash( createUUID() ) );
         }
 
         variables._params = [:];
@@ -140,12 +140,25 @@ component output="true" {
         return variables._CBWIREController;
     }
 
+    /**
+     * renderIt left for backwards compatibility.
+     * 
+     * @return string
+     */
+    function renderIt() {
+        return "";
+    }
+
     /**
      * Renders the component's HTML output.
      * This method should be overridden by subclasses to implement specific rendering logic.
      * If not overridden, this method will simply render the view.
      */
-    function renderIt() {
+    function onRender() {
+        local.renderIt = renderIt();
+        if ( local.renderIt.len() ) {
+            return local.renderIt;
+        }
         return template( _getViewPath() );
     }
 
@@ -277,7 +290,7 @@ component output="true" {
 
     /**
      * Instantiates a CBWIRE component, mounts it,
-     * and then calls its internal renderIt() method.
+     * and then calls its internal onRender() method.
      *
      * This is nearly identical to the wire method defined 
      * in the CBWIREController component, but it is intended
@@ -350,12 +363,12 @@ component output="true" {
             // Based on the rendering, determine our outer component tag
             local.componentTag = _getComponentTag( local.rendering );
             // Track the rendered child
-            variables._children.append( [
+            variables._children.append( {
                 "#arguments.key#": [
                     local.componentTag,
                     local.instance._getId()
                 ]
-            ] );
+            } );
 
             return local.instance._render();
         }
@@ -1649,7 +1662,7 @@ component output="true" {
      * Response for actually starting rendering of a component.
      */
     function _render( rendering ) {
-        local.trimmedHTML = isNull( arguments.rendering ) ? trim( renderIt() ) : trim( arguments.rendering );
+        local.trimmedHTML = isNull( arguments.rendering ) ? trim( onRender() ) : trim( arguments.rendering );
         // Validate the HTML content to ensure it has a single outer element
         _validateSingleOuterElement( local.trimmedHTML);
         // If this is the initial load, encode the snapshot and insert Livewire attributes

models/EmptySingleFileComponent.cfc

@@ -2,7 +2,7 @@ component extends="cbwire.models.Component" {
 
     {{ CFC_CONTENTS }}
 
-    function renderIt() {
+    function onRender() {
         return template( "{{ TEMPLATE_PATH }}" );
     }
 

test-harness/tests/specs/CBWIRESpec.cfc

@@ -1,5 +1,15 @@
 component extends="coldbox.system.testing.BaseTestCase" {
 
+    function beforeAll() {
+        super.beforeAll();
+        // delete any files in models/tmp folder
+        local.tempFolder = expandPath( "../../../models/tmp" );
+        if ( directoryExists( local.tempFolder ) ) {
+            directoryDelete( local.tempFolder, true );
+        }
+        directoryCreate( local.tempFolder );
+    }
+
     // Lifecycle methods and BDD suites as before...
     function run(testResults, testBox) {
 
@@ -129,18 +139,23 @@ component extends="coldbox.system.testing.BaseTestCase" {
                 expect( parsing.snapshot.data.stringBooleanValue ).toBeTrue();
             });
 
-            it( "should render with a renderIt method", function() {
-                var result = CBWIREController.wire( "test.should_render_with_a_renderIt_method" );
-                expect( result ).toInclude( "<p>I rendered from renderIT</p>" );
+            it( "should render with a onRender method", function() {
+                var result = CBWIREController.wire( "test.should_render_with_a_onRender_method" );
+                expect( result ).toInclude( "<p>I rendered from onRender</p>" );
+            } );
+
+            it( "should render with renderIt for backwards compatibility", function() {
+                var result = CBWIREController.wire( "test.should_render_with_renderIt_for_backwards_compatibility" );
+                expect( result ).toInclude( "I rendered from renderIt" );
             } );
 
             it("should implicitly render a view template", function() {
                 var result = CBWIREController.wire( "test.should_implicitly_render_a_view_template" );
                 expect( result ).toInclude( "<p>Implicitly rendered</p>" );
             } );
 
-            it( "should support passing params into a renderIt method", function() {
-                var result = CBWIREController.wire( "test.should_support_passing_params_into_a_renderIt_method" );
+            it( "should support passing params into a onRender method", function() {
+                var result = CBWIREController.wire( "test.should_support_passing_params_into_a_onRender_method" );
                 expect( result ).toInclude( "<p>Passed in: 5</p>" );
             } );
 
@@ -178,9 +193,12 @@ component extends="coldbox.system.testing.BaseTestCase" {
                 expect( result ).toInclude( "<p>Result: Hello World!</p>" );
             } );
 
-            it( "should support deep nesting with correct count of children", function() {
+            xit( "should support deep nesting with correct count of children", function() {
                 var result = CBWIREController.wire( "test.should_support_deep_nesting" );
                 var parent = parseRendering( result, 1 );
+                writeDump( result );
+                writeDump( parent );
+                abort;
                 var child1 = parseRendering( result, 2 );
                 var child2 = parseRendering( result, 3 );
                 expect( parent.snapshot.memo.children.count() ).toBe( 2 );

test-harness/wires/Actions.cfc

@@ -17,7 +17,7 @@ component extends="cbwire.models.Component" {
         reset( "conference" );
     }
 
-    function renderIt(){
+    function onRender(){
         return template( "wires.actions" );
     }
 }

test-harness/wires/BindingNestedData.cfc

@@ -1,6 +1,6 @@
 component extends="cbwire.models.Component" {
 
-    function renderIt(){
+    function onRender(){
         return this.renderView( "wires/bindingNestedData" );
     }
 

test-harness/wires/ComputedProperty.cfc

@@ -13,7 +13,7 @@ component extends="cbwire.models.Component" {
         }
     }
 
-    function renderIt(){
+    function onRender(){
         return this.renderView( "wires/computedProperty" );
     }
 

test-harness/wires/CounterComplete.cfc

@@ -19,7 +19,7 @@ component extends="cbwire.models.Component" {
         data.counter += amount;
     }
 
-    function renderIt() {
+    function onRender() {
         return template( "wires.CounterComplete", { isEven: isEven() } );
     }
 }

test-harness/wires/CounterUsingCBWIRE3.cfc

@@ -36,7 +36,7 @@ component extends="cbwire.models.Component" accessors="true" {
      * Renders the component's HTML output with Livewire-compatible attributes.
      * @return The HTML representation of the component, including Livewire data attributes.
      */
-    public string function renderIt() {
+    public string function onRender() {
         return template("wires.CounterUsingDataDot");
     }
 

test-harness/wires/DataBindingCount.cfc

@@ -8,7 +8,7 @@ component
         data.count += 1;
     }
 
-    function renderIt(){
+    function onRender(){
         return this.renderView( "wires/dataBindingCount" );
     }
 

test-harness/wires/EmitTo.cfc

@@ -4,7 +4,7 @@ component extends="cbwire.models.Component" {
         this.emitTo( "wires.FireEvent2", "someEvent" );
     }
 
-    function renderIt(){
+    function onRender(){
         return this.renderView( "wires/emitTo" );
     }
 

test-harness/wires/EmitUp.cfc

@@ -28,7 +28,7 @@ component extends="cbwire.models.Component" {
         this.emitUp( "emitUpFired" );
     }
 
-    function renderIt(){
+    function onRender(){
         return this.renderView( "wires/emitUp" );
     }
 

test-harness/wires/FireEvent.cfc

@@ -12,7 +12,7 @@ component extends="cbwire.models.Component" {
         this.emit( "someOtherEvent", [ "grant", "allen", "copley" ] );
     }
 
-    function renderIt(){
+    function onRender(){
         return this.renderView( "wires/fireEvent" );
     }
 

test-harness/wires/FireEvent2.cfc

@@ -15,7 +15,7 @@ component extends="cbwire.models.Component" {
         data.message = "We have fired someListener() from a second listener!";
     }
 
-    function renderIt(){
+    function onRender(){
         return this.renderView( "wires/fireEvent" );
     }
 

test-harness/wires/FireEventFromComponent.cfc

@@ -12,7 +12,7 @@ component extends="cbwire.models.Component" {
         data.message = "We have fired someListener() using this.emit in our component!";
     }
 
-    function renderIt(){
+    function onRender(){
         return this.renderView( "wires/fireEvent" );
     }
 

test-harness/wires/HelloWorldWithRenderViewPropertyAndArgs.cfc

@@ -2,7 +2,7 @@ component extends="cbwire.models.Component" {
 
     data = { "message" : "Hello world" };
 
-    function renderIt(){
+    function onRender(){
         return this.view( "wires/helloWorldWithRenderViewPropertyAndArgs" );
     }
 

test-harness/wires/Loading.cfc

@@ -4,7 +4,7 @@ component extends="cbwire.models.Component" {
         sleep( 5000 );
     }
 
-    function renderIt(){
+    function onRender(){
         return this.renderView( "wires/loading" );
     }
 

test-harness/wires/LoadingAndDisablingButton.cfc

@@ -4,7 +4,7 @@ component extends="cbwire.models.Component" {
         sleep( 5000 );
     }
 
-    function renderIt(){
+    function onRender(){
         return this.renderView( "wires/loadingAndDisablingButton" );
     }
 

test-harness/wires/LogBox.cfc

@@ -4,7 +4,7 @@ component extends="cbwire.models.Component"{
         log.debug( "Loaded mount()" );
     }
 
-    function renderIt(){
+    function onRender(){
         return renderView( "wires/logbox" );
     }
 

test-harness/wires/Mount.cfc

@@ -8,7 +8,7 @@ component extends="cbwire.models.Component" {
         data.message = "Mounted value";
     }
 
-    function renderIt(){
+    function onRender(){
         return this.renderView( "wires/mount" );
     }
 

test-harness/wires/MountHasRequestContext.cfc

@@ -7,7 +7,7 @@ component extends="cbwire.models.Component" {
         this.setMessage( event.getValue( "message" ) );
     }
 
-    function renderIt(){
+    function onRender(){
         return this.renderView( "wires/mount" );
     }
 

test-harness/wires/NestedComponent1.cfc

@@ -6,7 +6,7 @@ component extends="cbwire.models.Component" {
         data.message = "Something";
     }
 
-    function renderIt(){
+    function onRender(){
         return this.renderView( "wires/nestedComponent1" );
     }
 

test-harness/wires/NestedComponent2.cfc

@@ -6,7 +6,7 @@ component extends="cbwire.models.Component" {
         data.message = "Something ( again )!";
     }
 
-    function renderIt(){
+    function onRender(){
         return this.renderView( "wires/nestedComponent2" );
     }
 

test-harness/wires/OnUpdate.cfc

@@ -14,7 +14,7 @@ component extends="cbwire.models.Component" {
         data.onUpdateMessage = true;
     }
 
-    function renderIt() {
+    function onRender() {
         return "
             <div>
                 <div>onUpdate() called: #data.onUpdate#</div>

test-harness/wires/PassActionArgs.cfc

@@ -8,7 +8,7 @@ component extends="cbwire.models.Component" {
         data.message = "Well hello " & arguments.firstname & " " & arguments.lastname;
     }
 
-    function renderIt(){
+    function onRender(){
         return renderView( "wires/passActionArgs" );
     }
 

test-harness/wires/Poll.cfc

@@ -8,7 +8,7 @@ component extends="cbwire.models.Component" {
         return now() & "what!";
     }
 
-    function renderIt(){
+    function onRender(){
         return this.renderView( "wires/poll" );
     }
 

test-harness/wires/PostEmit.cfc

@@ -10,7 +10,7 @@ component extends="cbwire.models.Component" {
         data.message = "Called postEmit for event '#arguments.eventName#'!";
     }
 
-    function renderIt(){
+    function onRender(){
         return this.renderView( "wires/postEmit" );
     }
 

test-harness/wires/PreEmit.cfc

@@ -10,7 +10,7 @@ component extends="cbwire.models.Component" {
         data.message = "Called preEmit for event '#arguments.eventName#'!";
     }
 
-    function renderIt(){
+    function onRender(){
         return this.renderView( "wires/preEmit" );
     }
 

test-harness/wires/QueryString.cfc

@@ -9,7 +9,7 @@ component extends="cbwire.models.Component" {
         data[ "search" ] = event.getValue( "search", "" );
     }
 
-    function renderIt(){
+    function onRender(){
         return template( "wires.queryString" );
     }
 

test-harness/wires/Relocate.cfc

@@ -7,7 +7,7 @@ component
         return relocate( url = "https://www.google.com" );
     }
 
-    function renderIt(){
+    function onRender(){
         return renderView( "wires/relocate" );
     }
 

test-harness/wires/ResetPropertiesToInitialState.cfc

@@ -5,7 +5,7 @@ component extends="cbwire.models.Component" {
     /**
      * Render our wire object.
      */
-    function renderIt(){
+    function onRender(){
         return this.renderView( "wires/resetPropertiesToInitialState" );
     }
 

test-harness/wires/SlowComponent.cfc

@@ -13,7 +13,7 @@ component extends="cbwire.models.Component" {
         return "<div>Loading...</div>";
     }
 
-    function renderIt() {
+    function onRender() {
         return "<div>Loaded after #data.sleepTime# ms</div>";
     }
 }

test-harness/wires/TaskList.cfc

@@ -10,7 +10,7 @@ component extends="cbwire.models.Component" {
         reset( "newTask" );
     }
 
-    function renderIt() {
+    function onRender() {
         return template( "wires.TaskList" );
     }