* Adding Larave 5.1 support, and making it a minimum requirement since they introduced LTE.

* Removing JSQueeze support, atleast temporarily as there is a bug in the Assetic Filter with class reference.

Author: mattrmiller

README.md

@@ -8,7 +8,7 @@ Laravel 5 comes with a great asset manager called Elixir. While there is nothing
 When using Potion the you will often see is "resources" and "assets". Think of resources as the raw resources inside of Laravel resources direction. Think of assets as what Potion will generate and will ultimately be served to visitors.
 
 ###Laravel Support
-At this time Potion only supports Laravel 5. While Laravel 4 support was easy to implement in code, the time needed to support requests was too much.
+At this time Potion only supports Laravel 5.1 or higher. While Laravel 4 support was easy to implement in code, the time needed to support requests was too much.
 
 ###Features
  - Fully integrated into Laravels' artisan commands
@@ -26,7 +26,6 @@ At this time Potion only supports Laravel 5. While Laravel 4 support was easy to
  	 - LessphpFilter
  	 - JSMinFilter
 	 - JpegoptimFilter
- 	 - JSqueezeFilter
  	 - JsCompressorFilter from YUI
  	 - ScssphpFilter
 

composer.json

@@ -41,12 +41,10 @@
     "require": {
         "php": ">=5.4.0",
         "illuminate/support": "5.*",
-	    "kriswallsmith/assetic": "1.2.1",
 	    "kriswallsmith/assetic": "1.2.1",
 	    "natxet/CssMin": "3.0.2",
 	    "leafo/lessphp": "0.5.0",
 	    "leafo/scssphp": "0.1.1",
-	    "patchwork/jsqueeze": "2.0.2",
 	    "ptachoire/cssembed": "1.0.2",
 	    "linkorb/jsmin-php": "1.0.0",
 	    "kriswallsmith/assetic": "1.2.1"

src/ClassyGeeks/Potion/Console/Command/MakeAssetsCommand.php

@@ -129,11 +129,6 @@ public function fire()
             // -- JS Min
             $filter = new JSMinFilter();
             $filters['js_min'] = $filter;
-            // -- Js Squeeze
-            $filter = new JSqueezeFilter();
-            $filter->setSingleLine($this->config['filters']['js_squeeze']['single_line']);
-            $filter->keepImportantComments($this->config['filters']['js_squeeze']['keep_imp_comments']);
-            $filters['js_squeeze'] = $filter;
             // -- Js Yui
             $filter = new JsCompressorFilter($this->config['filters']['js_yui']['path_jar'], $this->config['filters']['js_yui']['path_java']);
             $filter->setNomunge($this->config['filters']['js_yui']['no_munge']);

src/ClassyGeeks/Potion/PotionServiceProvider.php

@@ -46,8 +46,8 @@ public function boot()
             $config_file => config_path('potion.php')
         ], 'config');
 
-        // Handle blade extensions
-        $this->bladeExtensions();
+        // Register blade extensions
+        $this->registerBladeExtensions();
 
     }
 
@@ -81,39 +81,39 @@ public function register()
      */
     public function getConfig()
     {
-        return $this->app['config'];
+        return $this->app['config']['potion'];
     }
 
     /**
-     * Handle blade extensions
+     * Register blade extensions
      */
-    protected function bladeExtensions()
+    protected function registerBladeExtensions()
     {
         // Potion asset url
         \Blade::extend(function($view, $compiler)
         {
-            $pattern = $compiler->createMatcher('potion_asset_url');
+            $pattern = $this->createBladeMatcher('potion_asset_url');
             return preg_replace($pattern, '$1<?php echo(\ClassyGeeks\Potion\BladeHelpers::assetUrl$2); ?>', $view);
         });
 
         // Potion Css
         \Blade::extend(function($view, $compiler)
         {
-            $pattern = $compiler->createMatcher('potion_asset_css');
+            $pattern = $this->createBladeMatcher('potion_asset_css');
             return preg_replace($pattern, '$1<?php echo(\ClassyGeeks\Potion\BladeHelpers::assetCss$2); ?>', $view);
         });
 
         // Potion Js
         \Blade::extend(function($view, $compiler)
         {
-            $pattern = $compiler->createMatcher('potion_asset_js');
+            $pattern = $this->createBladeMatcher('potion_asset_js');
             return preg_replace($pattern, '$1<?php echo(\ClassyGeeks\Potion\BladeHelpers::assetJs$2); ?>', $view);
         });
 
         // Potion Img
         \Blade::extend(function($view, $compiler)
         {
-            $pattern = $compiler->createMatcher('potion_asset_img');
+            $pattern = $this->createBladeMatcher('potion_asset_img');
             return preg_replace($pattern, '$1<?php echo(\ClassyGeeks\Potion\BladeHelpers::assetImg$2); ?>', $view);
         });
     }
@@ -128,4 +128,14 @@ public function provides()
         return ['potion'];
     }
 
+    /**
+     * Create blade
+     * @param $function
+     * @return string
+     */
+    protected function createBladeMatcher($function)
+    {
+        return '/(?<!\w)(\s*)@'.$function.'(\s*\(.*\))/';
+    }
+
 }