Use view composer for comment form andrewelkins#236

With suggestions from @Aristona  and @gcphost

app/Acme/Composers/CommentComposer.php

@@ -0,0 +1,20 @@
+<?php namespace Acme\Composers;
+
+class CommentComposer {
+
+    public function compose($view)
+    {
+
+        $viewData = $view->getData();
+        if (!\Auth::check()) {
+            return $view->nest('commentForm', 'site.partials.comment_auth');
+        }
+
+        if (!$viewData['canComment']) {
+            return $view->nest('commentForm', 'site.partials.comment_perm');
+        }
+
+        return $view->nest('commentForm', 'site.partials.comment_form', $viewData);
+    }
+
+}

app/composers.php

@@ -0,0 +1,3 @@
+<?php
+
+View::composer('site/blog/view_post', 'Acme\Composers\CommentComposer');

app/start/global.php

@@ -99,3 +99,12 @@
 */
 
 require __DIR__.'/../filters.php';
+
+/*
+|--------------------------------------------------------------------------
+| Require The Composers
+|--------------------------------------------------------------------------
+|
+*/
+
+require __DIR__.'/../composers.php';

app/views/site/blog/view_post.blade.php

@@ -73,34 +73,6 @@
 <hr />
 @endif
 
-@if ( ! Auth::check())
-You need to be logged in to add comments.<br /><br />
-Click <a href="{{{ URL::to('user/login') }}}">here</a> to login into your account.
-@elseif ( ! $canComment )
-You don't have the correct permissions to add comments.
-@else
-
-@if($errors->has())
-<div class="alert alert-danger alert-block">
-<ul>
-@foreach ($errors->all() as $error)
-	<li>{{ $error }}</li>
-@endforeach
-</ul>
-</div>
-@endif
+{{ $commentForm }}
 
-<h4>Add a Comment</h4>
-<form  method="post" action="{{{ URL::to($post->slug) }}}">
-	<input type="hidden" name="_token" value="{{{ Session::getToken() }}}" />
-
-	<textarea class="col-md-12 input-block-level" rows="4" name="comment" id="comment">{{{ Request::old('comment') }}}</textarea>
-
-	<div class="form-group">
-		<div class="col-md-12">
-			<input type="submit" class="btn btn-default" id="submit" value="Submit" />
-		</div>
-	</div>
-</form>
-@endif
 @stop

app/views/site/partials/comment_auth.blade.php

@@ -0,0 +1,2 @@
+You need to be logged in to add comments.<br /><br />
+Click <a href="{{{ URL::to('user/login') }}}">here</a> to login into your account.

app/views/site/partials/comment_form.blade.php

@@ -0,0 +1,12 @@
+<h4>Add a Comment</h4>
+<form  method="post" action="{{{ URL::to($post->url()) }}}">
+    <input type="hidden" name="_token" value="{{{ Session::getToken() }}}" />
+
+    <textarea class="col-md-12 input-block-level" rows="4" name="comment" id="comment">{{{ Request::old('comment') }}}</textarea>
+
+    <div class="form-group">
+        <div class="col-md-12">
+            <input type="submit" class="btn btn-default" id="submit" value="Submit" />
+        </div>
+    </div>
+</form>

app/views/site/partials/comment_perm.blade.php

@@ -0,0 +1 @@
+You don't have the correct permissions to add comments.

composer.json

@@ -31,7 +31,10 @@
             "app/database/migrations",
             "app/database/seeds",
             "app/tests/library"
-        ]
+        ],
+        "psr-0": {
+            "Acme": "app/"
+        }
     },
     "scripts": {
         "pre-update-cmd": [