support unlisted video url format (#19)

* support unlisted video url format

* fix for parsing when no hash is present

* make second param non-greedy

resources/views/services/vimeo.blade.php

@@ -1,3 +1,3 @@
 <x-embed-responsive-wrapper :aspect-ratio="$aspectRatio">
-    <iframe src="https://player.vimeo.com/video/{{ $videoId }}" frameborder="0" allow="autoplay; fullscreen" allowfullscreen></iframe>
+    <iframe src="https://player.vimeo.com/video/{{ $videoId }}@if($videoHash)?h={{ $videoHash}}@endif" frameborder="0" allow="autoplay; fullscreen" allowfullscreen></iframe>
 </x-embed-responsive-wrapper>

src/Services/Vimeo.php

@@ -9,25 +9,26 @@ class Vimeo extends ServiceBase
 {
     public static function detect(Url $url): bool
     {
-        return (new self($url))->videoId() !== null;
+        return (new self($url))->parseUrl() !== null;
     }
 
     protected function viewData(): array
     {
-        return [
-            'videoId' => $this->videoId(),
-        ];
+        return $this->parseUrl();
     }
 
     /**
      * @link https://stackoverflow.com/a/16841070/3498182
      */
-    protected function videoId(): ?string
+    protected function parseUrl(): ?array
     {
-        preg_match('/(https?:\/\/)?(www\.)?(player\.)?vimeo\.com\/([a-z]*\/)*([0-9]{6,11})[?]?.*/', $this->url, $match);
-
+        preg_match('/(https?:\/\/)?(www\.)?(player\.)?vimeo\.com\/([a-z]*\/)*([0-9]{6,11})\/?([a-z0-9]+)?[?]?.*/', $this->url, $match);
+        
         if (array_key_exists(5, $match)) {
-            return $match[5];
+            return [
+                'videoId' => $match[5],
+                'videoHash' => isset($match[6]) ? $match[6] : NULL
+            ];
         }
 
         return null;

tests/Rules/EmbeddableUrlTest.php

@@ -19,6 +19,8 @@ public function test_it_passes_a_validUrl_for_any_service()
             'https://miro.com/miroverse/category/workshops/remote-ux-workshops',
             'http://www.slideshare.net/haraldf/business-quotes-for-2011',
             'https://vimeo.com/148751763',
+            'https://vimeo.com/148751763/243529c0ef',
+            'https://vimeo.com/148751763/243529c0ef?share=copy',
             'https://youtu.be/dQw4w9WgXcQ',
             'https://www.youtube.com/embed/dQw4w9WgXcQ',
         ];

tests/Services/VimeoTest.php

@@ -28,6 +28,8 @@ protected function validUrls(): array
     {
         return [
             'https://vimeo.com/148751763',
+            'https://vimeo.com/148751763/243529c0ef',
+            'https://vimeo.com/148751763/243529c0ef?share=copy',
         ];
     }
 }