From e764ca0a2733b5c3e437ee84dcac7bbc52409a77 Mon Sep 17 00:00:00 2001
From: Brandon Nifong <brandon@tendency.me>
Date: Wed, 23 Aug 2017 14:09:36 -0400
Subject: [PATCH] v1.0.5

---
 README.md              |  2 +-
 src/blade-svg-sage.php | 20 ++++----------------
 src/helpers.php        | 36 +++++++++++++++++++++++++-----------
 3 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/README.md b/README.md
index c1a92b6..79a85a3 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@ add_filter('bladesvg_sprite_prefix', function () {
 ```
 <ul>
   <li>@svg('phone')</li>
-  <li>{{ svg_image('phone-alt') }}</li>
+  <li>{{ \BladeSvgSage\svg_image('phone-alt') }}</li>
 </ul>
 ```
 
diff --git a/src/blade-svg-sage.php b/src/blade-svg-sage.php
index 0de3d6a..30a12b0 100644
--- a/src/blade-svg-sage.php
+++ b/src/blade-svg-sage.php
@@ -1,17 +1,5 @@
 <?php
-/*
-Plugin Name:        Blade SVG for Sage
-Plugin URI:         http://github.com/log1x/blade-svg-sage
-Description:        Simple package to add Blade SVG to Sage 9
-Version:            1.0.5
-Author:             Log1x
-Author URI:         https://log1x.com
-License:            MIT License
-License URI:        http://opensource.org/licenses/MIT
-GitHub Plugin URI:  log1x/blade-svg-sage
-GitHub Branch:      master
-*/
-
+
 namespace BladeSvgSage;
 
 use function App\sage;
@@ -25,7 +13,7 @@
 }
 
 /**
- * Initialize the plugin
+ * Initialize SvgFactory
  */
 function init()
 {
@@ -51,11 +39,11 @@ function directive()
 {
     if (function_exists('\App\sage')) {
         sage('blade')->compiler()->directive('icon', function ($expression) {
-            return "<?php echo e(svg_image($expression)) ?>";
+            return "<?php echo e(\BladeSvgSage\svg_image($expression)) ?>";
         });
 
         sage('blade')->compiler()->directive('svg', function ($expression) {
-            return "<?php echo e(svg_image($expression)) ?>";
+            return "<?php echo e(\BladeSvgSage\svg_image($expression)) ?>";
         });
     }
 }
diff --git a/src/helpers.php b/src/helpers.php
index 3584e60..cfcefe0 100644
--- a/src/helpers.php
+++ b/src/helpers.php
@@ -1,16 +1,30 @@
 <?php
 
-if (!function_exists('get_dist_path')) {
-    function get_dist_path($path)
-    {
-        return trailingslashit(\App\config('theme.dir')) . trailingslashit('dist') . $path;
-    }
+namespace BladeSvgSage;
+
+use function App\sage;
+use function App\config;
+
+/**
+ * Get Sage's dist path
+ *
+ * @param  string $path
+ * @return string
+ */
+function get_dist_path($path)
+{
+    return trailingslashit(config('theme.dir')) . trailingslashit('dist') . $path;
 }
 
-if (!function_exists('svg_image')) {
-    function svg_image($icon, $class = '', $attrs = [])
-    {
-        return wp_die('test');
-        return \App\sage(\BladeSvg\SvgFactory::class)->svg(\App\sage('assets')->get($icon), $class, $attrs);
-    }
+/**
+ * Simple helper for our directive.
+ *
+ * @param  string $icon
+ * @param  string $class
+ * @param  array  $attrs
+ * @return mixed
+ */
+function svg_image($icon, $class = '', $attrs = [])
+{
+    return sage(\BladeSvg\SvgFactory::class)->svg(sage('assets')->get($icon), $class, $attrs);
 }