Merge pull request #2 from duncanmcclean/patch-1

Accept asset IDs, Paths & URLs as parameters

Author: ryanmitchell

Readme.md

@@ -29,7 +29,23 @@ This add-on provides a number of tags:
 
 ### Outputting a BlurHash image
 
- `{{ blur_hash:image }}` or `{{ blur_hash image="path_or_asset" }}`
+ `{{ blur_hash:image }}` 
+
+or 
+
+`{{ blur_hash :image="asset" }}` 
+
+or 
+
+`{{ blur_hash :url="url" }}` 
+
+or
+
+`{{ blur_hash :id="asset_id" }}`
+
+or 
+
+`{{ blur_hash :path="local_path" }}`
 
 This tag will output an encoded image in the following format:
 
@@ -56,6 +72,18 @@ it will then be found at `resources/views/vendor/statamic-blurhash/output.blade.
 
 `{{ blur_hash:encode image="path_or_asset" }}`
 
+or
+
+`{{ blur_hash:encode :url="url" }}`
+
+or
+
+`{{ blur_hash:encode :id="asset_id" }}`
+
+or
+
+`{{ blur_hash:encode :path="path" }}`
+
 This will return a BlurHash encoded URL, useful if you want to return this to JavaScript or a 3rd party service (such as Algolia).
 
 

src/Tags/BlurHash.php

@@ -4,13 +4,14 @@
 
 use Bepsvpt\Blurhash\Facades\BlurHash as BlurHashFacade;
 use Statamic\Contracts\Assets\Asset as AssetContract;
+use Statamic\Facades\Asset;
 use Statamic\Tags\Concerns\RendersAttributes;
 use Statamic\Tags\Tags;
 
 class BlurHash extends Tags
 {
     use RendersAttributes;
-    
+
     private $dimensions = false;
 
     /**
@@ -20,14 +21,14 @@ class BlurHash extends Tags
      */
     public function encode()
     {
-        $image = $this->params->get('image');
+        $image = $this->getImageFromParams();
 
         if ($image instanceof AssetContract) {
             $this->dimensions = $image->dimensions();
-            
+
             $image = $image->contents();
         }
-                                
+
         return BlurHashFacade::encode($image);
     }
 
@@ -41,15 +42,15 @@ public function decode($encodedString = null)
         if (! $encodedString) {
             $encodedString = $this->params->get('hash');
         }
-        
+
         $width = $this->params->get('width', 64);
         $height = $this->params->get('height', 64);
 
         $image = BlurHashFacade::decode($encodedString, $width, $height);
-            
+
         return $image->encode($this->params->get('format', 'data-url'));
     }
-    
+
     /**
      * The {{ blur_hash }} tag.
      * Encodes and outputs an image
@@ -58,41 +59,67 @@ public function decode($encodedString = null)
      */
     public function index()
     {
-        $image = $this->params->get('image');
-        
-        $hash = $this->encode($image);
-        
+        $hash = $this->encode();
+
         if ($this->dimensions) {
-            
             $width = $this->params->get('width', 0);
             $height = $this->params->get('height', 0);
-            
-            // if we have width but not height, we work out the height proportionally
+
+            // If we have width but not height, we work out the height proportionally
             if ($width && ! $height) {
-                $this->params->put('height', $width * $this->dimensions[1]/$this->dimensions[0]);
-                
-            // if we have height but not width, we work out the width proportionally
-            } else if ($height && ! $width) {
-                $this->params->put('width', $height * $this->dimensions[0]/$this->dimensions[1]);
+                $this->params->put('height', $width * $this->dimensions[1] / $this->dimensions[0]);
+
+            // If we have height but not width, we work out the width proportionally
+            } elseif ($height && ! $width) {
+                $this->params->put('width', $height * $this->dimensions[0] / $this->dimensions[1]);
             }
         }
-                
+
         return view('statamic-blurhash::output', [
             'src' => $this->decode($hash),
             'params' => $this->params,
             'render_params' => $this->renderAttributesFromParams(['image']),
-        ]);        
-    } 
+        ]);
+    }
 
     /**
      * The {{ blur_hash:* }} tag.
      *
      * @return string|array
-     */    
+     */
     public function wildcard($tag)
     {
         $this->params->put('image', $this->context->value($tag));
-        
+
         return $this->index();
-    }   
-}
+    }
+    
+    private function getImageFromParams()
+    {
+        if ($id = $this->params->get('id')) {
+            $image = Asset::findById($id);
+                
+            if ($image) {
+                return $image;
+            }
+        }
+
+        if ($path = $this->params->get('path')) {
+            $image = Asset::findByPath($path);
+                
+            if ($image) {
+                return $image;
+            }
+        }
+
+        if ($url = $this->params->get('url')) {
+            $image = Asset::findByUrl($url);
+                
+            if ($image) {
+                return $image;
+            }
+        }
+        
+        return $this->params->get('image');
+    }
+}