Merge pull request #10 from me2bits/master

Support Laravel 5

Author: Flynsarmy

.gitignore

@@ -8,6 +8,12 @@
             "name": "Flyn San",
             "email": "flynsarmy@gmail.com"
         }
+      ,
+      {
+        "name": "Ebrahim Radi",
+        "email": "ebrahim.radi@gmail.com",
+        "homepage": "http://me2bits.com"
+      }
     ],
     "require": {
         "php": ">=5.3.0"

.travis.yml

@@ -14,4 +14,6 @@
 	 * with DbView::field()
 	 */
 	'model_default_field' => 'content',
+
+    'cache' => false
 );

composer.json

@@ -6,7 +6,7 @@
 This package generates and returns a compiled view from a blade-syntax field in your Eloquent model.
 
 
-### Installation
+### Installation (Laravel v < 5)
 
 Require this package in your composer.json and run composer update (or run `composer require flynsarmy/db-blade-compiler:1.*` directly):
 
@@ -25,6 +25,21 @@ You can also optionally publish the config-file
     php artisan config:publish flynsarmy/db-blade-compiler
 
 
+### Installation (Laravel 5.x)
+
+Require this package in your composer.json and run composer update (or run `composer require flynsarmy/db-blade-compiler:2.*` directly):
+
+    "flynsarmy/db-blade-compiler": "2.*"
+
+After updating composer, add the ServiceProvider to the providers array in app/config/app.php
+
+    'Flynsarmy\DbBladeCompiler\DbBladeCompilerServiceProvider',
+
+You have to also publish the config-file
+
+    php artisan vendor:publish
+
+
 ### Usage
 
 This package offers a `DbView` facade with the same syntax as `View` but accepts a Model instance instead of path to view.
@@ -38,6 +53,7 @@ Because you're passing a model to `DbView::make()`, db-blade-compiler needs to k
     return DbView::make($template)->field('excerpt')->with(['foo' => 'Bar'])->render();
 
 You may set the default column used in the package config.
+You can enable using cache in compiling view from a blade-syntax field in your Eloquent model operation by enabling cache config in package config. By default this option is disabled.
 
 
 ### License

public/.gitkeep config/.gitkeep

@@ -1,10 +1,19 @@
-<?php namespace Flynsarmy\DbBladeCompiler\Compilers;
+<?php namespace Flynsarmy\DbBladeCompiler;
 
-use Config;
 use Illuminate\View\Compilers\BladeCompiler;
 use Illuminate\View\Compilers\CompilerInterface;
 
-class DbBladeCompiler extends BladeCompiler implements CompilerInterface {
+class DbBladeCompiler extends BladeCompiler implements CompilerInterface
+    {
+
+    /** @var \Illuminate\Config\Repository */
+    protected $config;
+
+    public function __construct($filesystem, $cache_path, $config)
+        {
+        parent::__construct($filesystem, $cache_path);
+        $this->config = $config;
+        }
 
 	/**
 	 * Compile the view at the given path.
@@ -15,7 +24,7 @@ class DbBladeCompiler extends BladeCompiler implements CompilerInterface {
 	public function compile($path)
 	{
 		// Defaults to '__db_blade_compiler_content_field' property
-		$property = Config::get('db-blade-compiler::model_property');
+		$property = $this->config->get('db-blade-compiler.model_property');
 		// Defaults to 'contents' column
 		$column = $path->{$property};
 		// Grab the column contents
@@ -44,7 +53,7 @@ public function getCompiledPath($model)
 		 *
 		 * e.g db_table_name_id_4
 		 */
-		$field = Config::get('db-blade-compiler::model_property');
+		$field = $this->config->get('db-blade-compiler.model_property');
 		$path = 'db_' . $model->getTable() . '_' . $model->{$field} . '_';
 		if ( is_null($model->primaryKey) )
 			$path .= $model->id;
@@ -66,8 +75,10 @@ public function getCompiledPath($model)
 	 */
 	public function isExpired($path)
 	{
-		if(Config::get('app.debug')) return true;
-		
+    if(!$this->config->get('cache'))
+        {
+        return true;
+        }
 		$compiled = $this->getCompiledPath($path);
 
 		// If the compiled file doesn't exist we will indicate that the view is expired

src/config/config.php config/db-blade-compiler.php

@@ -1,6 +1,7 @@
 <?php namespace Flynsarmy\DbBladeCompiler;
 
 use Illuminate\Support\ServiceProvider;
+use Illuminate\View\Engines\CompilerEngine;
 
 class DbBladeCompilerServiceProvider extends ServiceProvider {
 
@@ -18,7 +19,11 @@ class DbBladeCompilerServiceProvider extends ServiceProvider {
 	 */
 	public function boot()
 	{
-		$this->package('flynsarmy/db-blade-compiler');
+    $config_path = __DIR__ . '/../../../config/db-blade-compiler.php';
+    $this->publishes([$config_path => config_path('db-blade-compiler.php')], 'config');
+
+    $views_path = __DIR__ . '/../../../config/.gitkeep';
+    $this->publishes([$views_path => storage_path('app/db-blade-compiler/views/.gitkeep')]);
 	}
 
 	/**
@@ -28,7 +33,24 @@ public function boot()
 	 */
 	public function register()
 	{
-		$this->app->bind('dbview', 'Flynsarmy\DbBladeCompiler\DbView');
+    $config_path = __DIR__ . '/../../../config/db-blade-compiler.php';
+    $this->mergeConfigFrom($config_path, 'db-blade-compile');
+
+    $this->app['dbview'] = $this->app->share(function($app)
+        {
+        $cache_path = storage_path('app/db-blade-compiler/views');
+
+        $db_view = new DbView($app['config']);
+        $compiler = new DbBladeCompiler($app['files'], $cache_path, $app['config']);
+        $db_view->setEngine(new CompilerEngine($compiler));
+
+        return $db_view;
+        });
+    $this->app->booting(function()
+        {
+        $loader = \Illuminate\Foundation\AliasLoader::getInstance();
+        $loader->alias('DbView', 'Flynsarmy\DbBladeCompiler\Facades\DbView');
+        });
 	}
 
 	/**

phpunit.xml

@@ -1,25 +1,27 @@
 <?php namespace Flynsarmy\DbBladeCompiler;
 
-use App, View, Closure, Config, ArrayAccess;
-use Illuminate\Support\MessageBag;
-use Illuminate\View\Engines\EngineInterface;
-use Illuminate\Support\Contracts\MessageProviderInterface;
-use Illuminate\Support\Contracts\ArrayableInterface as Arrayable;
-use Illuminate\Support\Contracts\RenderableInterface as Renderable;
-use Flynsarmy\DbBladeCompiler\Compilers\DbBladeCompiler;
-use Illuminate\View\Engines\CompilerEngine;
+use View, Closure, ArrayAccess;
+use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Contracts\Support\Renderable;
 
 class DbView extends \Illuminate\View\View implements ArrayAccess, Renderable {
 
 	protected $content_field = null;
 
-	public function __construct()
+    /** @var \Illuminate\Config\Repository */
+    protected $config;
+
+	public function __construct($config)
 	{
-		$cache = App::make('path.storage').'/views';
-		$compiler = new DbBladeCompiler(App::make('files'), $cache);
-		$this->engine = new CompilerEngine($compiler);
+    $this->config = $config;
 	}
 
+    public function setEngine($compiler)
+        {
+        $this->engine = $compiler;
+        return $this;
+        }
+
 	/**
 	 * Get a evaluated view contents for the given view.
 	 *
@@ -34,7 +36,7 @@ public function make($view, $data = array(), $mergeData = array(), $content_fiel
 		$this->path = $view;
 		$this->data = array_merge($mergeData, $this->parseData($data));
 		if ( !is_null($content_field) ) $this->content_field = $content_field;
-		else $this->content_field = Config::get('db-blade-compiler::model_default_field');
+		else $this->content_field = $this->config->get('db-blade-compiler.model_default_field');
 
 		return $this;
 	}
@@ -90,7 +92,7 @@ protected function renderContents()
 
 	protected function getContents()
 	{
-		$field = Config::get('db-blade-compiler::model_property');
+		$field = $this->config->get('db-blade-compiler.model_property');
 		$this->path->{$field} = $this->content_field;
 
 		return parent::getContents();

readme.md

@@ -9,5 +9,9 @@ class DbView extends Facade {
 	 *
 	 * @return string
 	 */
-	protected static function getFacadeAccessor() { return 'dbview'; }
+	protected static function getFacadeAccessor()
+        {
+        return 'dbview';
+        }
+
 }