A bunch of small fixes and improvements

Author: arrilot

README.md

@@ -89,11 +89,11 @@ The last step is to call the widget.
 You've actually got several ways to do so.
 
 ```php
-{!! Widget::run('recentNews') !!}
+{{ Widget::run('recentNews') }}
 ```
 or
 ```php
-{!! Widget::recentNews() !!}
+{{ Widget::recentNews() }}
 ```
 or even
 ```php
@@ -165,6 +165,8 @@ By default the package tries to find your widget in the ```App\Widgets``` namesp
 
 You can overwrite this by publishing package config and setting `default_namespace` property.
 
+To publish config use: ```php artisan vendor:publish --provider="Arrilot\Widgets\ServiceProvider"```
+
 Although using the default namespace is very convenient, in some situations you may wish to have more flexibility. 
 For example, if you've got dozens of widgets it makes sense to group them in namespaced folders.
 
@@ -173,21 +175,23 @@ You have two ways to call those widgets:
 1) You can pass the full widget name from the `default_namespace` (basically `App\Widgets`) to the `run` method.
 ```php
 @widget('News\RecentNews', $config)
-{!! Widget::run('News\RecentNews', $config) !!}
+{{ Widget::run('News\RecentNews', $config) }}
 ```
 
 2) You can use dot notation instead.
 ```php
 @widget('news.recentNews', $config)
-{!! Widget::run('news.recentNews', $config) !!}
+{{ Widget::run('news.recentNews', $config) }}
 ```
 
-Note: you can pass FQCN too.
+You can pass FQCN too.
 ```php
 @widget('\App\Http\Some\Namespace\Widget', $config)
-{!! Widget::run('\App\Http\Some\Namespace\Widget', $config) !!}
+{{ Widget::run('\App\Http\Some\Namespace\Widget', $config) }}
 ```
 
+*Note: For Laravel 5.0.0 - 5.1.3 you must use `{!! !!}` tags instead of `{{ }}`*
+
 ## Asynchronous widgets
 
 In some situations it can be very beneficial to load widget content with AJAX.
@@ -292,7 +296,7 @@ Widget::group('sidebar')->position(5)->addWidget(<the same arguments list as in
 Widget::group('sidebar')->position(4)->addAsyncWidget(<the same arguments list as in run() method>);
 
 // display them in a view in the correct order
-{!! Widget::group('sidebar')->display() !!}
+{{ Widget::group('sidebar')->display() }}
 //or 
 @widgetGroup('sidebar')
 ```

src/Console/WidgetMakeCommand.php

@@ -138,7 +138,7 @@ protected function replaceView($stub)
      */
     protected function getDefaultNamespace($rootNamespace)
     {
-        return $rootNamespace.'\Widgets';
+        return config('laravel-widgets.default_namespace', $rootNamespace.'\Widgets');
     }
 
     /**

src/Factories/AbstractWidgetFactory.php

@@ -5,11 +5,13 @@
 use Arrilot\Widgets\AbstractWidget;
 use Arrilot\Widgets\Contracts\ApplicationWrapperContract;
 use Arrilot\Widgets\Misc\InvalidWidgetClassException;
+use Arrilot\Widgets\Misc\ViewExpressionTrait;
 use Arrilot\Widgets\WidgetId;
-use Illuminate\View\Expression;
 
 abstract class AbstractWidgetFactory
 {
+    use ViewExpressionTrait;
+
     /**
      * Widget object to work with.
      *
@@ -109,7 +111,7 @@ protected function instantiateWidget(array $params = [])
         $this->widgetConfig = (array) array_shift($params);
         $this->widgetParams = $params;
 
-        $rootNamespace = $this->app->config('arrilot-widget.defaultNamespace', $this->app->getNamespace().'Widgets');
+        $rootNamespace = $this->app->config('laravel-widgets.default_namespace', $this->app->getNamespace().'Widgets');
 
         $widgetClass = class_exists($this->widgetName)
             ? $this->widgetName
@@ -155,20 +157,4 @@ protected function wrapContentInContainer($content)
 
         return '<'.$container['element'].' id="'.$this->javascriptFactory->getContainerId().'" '.$container['attributes'].'>'.$content.'</'.$container['element'].'>';
     }
-
-    /**
-     * Final preparation for display.
-     *
-     * @param string $content
-     * @return \Illuminate\View\Expression|string
-     */
-    protected function displayContent($content)
-    {
-        if (interface_exists('Illuminate\Contracts\Support\Htmlable') && class_exists('Illuminate\View\Expression'))
-        {
-            return new Expression($content);
-        }
-
-        return $content;
-    }
 }

src/Factories/AsyncWidgetFactory.php

@@ -17,6 +17,6 @@ public function run()
         $loader = $this->javascriptFactory->getLoader();
         $content =  $this->wrapContentInContainer($placeholder.$loader);
 
-        return $this->displayContent($content);
+        return $this->convertToViewExpression($content);
     }
 }

src/Factories/WidgetFactory.php

@@ -37,7 +37,7 @@ public function run()
             $content = $this->wrapContentInContainer($content);
         }
 
-        return $this->displayContent($content);
+        return $this->convertToViewExpression($content);
     }
 
     /**

src/Misc/ViewExpressionTrait.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Arrilot\Widgets\Misc;
+
+use Illuminate\View\Expression;
+
+trait ViewExpressionTrait
+{
+    /**
+     * Convert a given html to View Expression object that was introduced in Laravel 5.1.
+     *
+     * @param string $html
+     * @return \Illuminate\View\Expression|string
+     */
+    protected function convertToViewExpression($html)
+    {
+        if (interface_exists('Illuminate\Contracts\Support\Htmlable') && class_exists('Illuminate\View\Expression'))
+        {
+            return new Expression($html);
+        }
+
+        return $html;
+    }
+}

src/WidgetGroup.php

@@ -3,10 +3,12 @@
 namespace Arrilot\Widgets;
 
 use Arrilot\Widgets\Contracts\ApplicationWrapperContract;
-use Arrilot\Widgets\Misc\LaravelApplicationWrapper;
+use Arrilot\Widgets\Misc\ViewExpressionTrait;
 
 class WidgetGroup
 {
+    use ViewExpressionTrait;
+
     /**
      * The widget group name.
      *
@@ -17,7 +19,7 @@ class WidgetGroup
     /**
      * The application wrapper.
      *
-     * @var string
+     * @var ApplicationWrapperContract
      */
     protected $app;
 
@@ -62,7 +64,7 @@ public function display()
             }
         }
 
-        return $output;
+        return $this->convertToViewExpression($output);
     }
 
     /**

tests/TestApplicationWrapper.php

@@ -47,7 +47,7 @@ public function call($method, $params = [])
      */
     public function config($key, $default = null)
     {
-        if ($key == 'arrilot-widget.defaultNamespace') {
+        if ($key == 'laravel-widgets.default_namespace') {
             return 'Arrilot\Widgets\Test\Dummies';
         }
 

tests/WidgetFactoryTest.php

@@ -4,6 +4,7 @@
 
 use Arrilot\Widgets\Factories\WidgetFactory;
 use Arrilot\Widgets\Test\Dummies\TestCachedWidget;
+use Arrilot\Widgets\WidgetGroup;
 use Arrilot\Widgets\WidgetId;
 use PHPUnit_Framework_TestCase;
 
@@ -131,4 +132,13 @@ public function testItCanCacheWidgets()
 
         $this->assertEquals('Cached output. Key: '.$key.', minutes: '.$widget->cacheTime, $output);
     }
+
+    public function testItGrantsAccessToWidgetGroup()
+    {
+        $groupObject = $this->factory->group('sidebar');
+
+        $expectedObject = new WidgetGroup('sidebar', new TestApplicationWrapper());
+
+        $this->assertEquals($expectedObject, $groupObject);
+    }
 }