Merge pull request #8 from hyvor/more-tests

More tests

src/Embed/Embed.php

@@ -2,39 +2,42 @@
 
 namespace Hyvor\Unfold\Embed;
 
-use Hyvor\Unfold\Embed\Exception\ParserException;
-use Hyvor\Unfold\Embed\Exception\UnableToResolveEmbedException;
-use Hyvor\Unfold\Embed\Platforms\Reddit;
-use Hyvor\Unfold\Embed\Platforms\Tiktok;
-use Hyvor\Unfold\Embed\Platforms\Twitter;
-use Hyvor\Unfold\Embed\Platforms\Youtube;
-use Hyvor\Unfold\UnfoldConfigObject;
+//use Hyvor\Unfold\Embed\Platforms\GithubGist;
+//use Hyvor\Unfold\Embed\Platforms\Reddit;
+//use Hyvor\Unfold\Embed\Platforms\Tiktok;
+//use Hyvor\Unfold\Embed\Platforms\Twitter;
+//use Hyvor\Unfold\Embed\Platforms\Youtube;
+use Hyvor\Unfold\Exception\EmbedUnableToResolveException;
+use Hyvor\Unfold\Exception\EmbedParserException;
+use Hyvor\Unfold\Exception\UnfoldException;
+use Hyvor\Unfold\UnfoldCallContext;
+use Hyvor\Unfold\UnfoldConfig;
 use Hyvor\Unfold\Unfolded\Unfolded;
-use Hyvor\Unfold\UnfoldException;
 use Hyvor\Unfold\UnfoldMethod;
-use Hyvor\Unfold\UnfoldCallContext;
 
 class Embed
 {
+
     /**
-     * @var EmbedParserAbstract[]
+     * @return string[]
      */
-    public const PARSERS = [
-        Youtube::class,
-        Reddit::class,
-        Tiktok::class,
-        Twitter::class,
-        Reddit::class,
-    ];
+    public static function getParsers(): array
+    {
+        $namespace = __NAMESPACE__ . '\\Platforms\\';
+        return array_map(
+            fn($file) => $namespace . pathinfo($file, PATHINFO_FILENAME),
+            glob(__DIR__ . '/Platforms/*.php')
+        );
+    }
 
     /**
-     * @throws ParserException
+     * @throws EmbedParserException
      */
     public static function parse(
         string $url,
-        ?UnfoldConfigObject $config = null,
+        ?UnfoldConfig $config = null,
     ): ?EmbedResponseObject {
-        foreach (self::PARSERS as $parserClass) {
+        foreach (self::getParsers() as $parserClass) {
             $parser = new $parserClass($url, $config);
             if ($parser->match()) {
                 return $parser->parse();
@@ -55,7 +58,7 @@ public static function getUnfoldedObject(
 
         if ($oembed === null) {
             if ($context->method === UnfoldMethod::EMBED) {
-                throw new UnableToResolveEmbedException();
+                throw new EmbedUnableToResolveException();
             } else {
                 return null;
             }

src/Embed/EmbedParserAbstract.php

@@ -4,8 +4,9 @@
 
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Uri;
-use Hyvor\Unfold\Embed\Exception\ParserException;
-use Hyvor\Unfold\UnfoldConfigObject;
+use Hyvor\Unfold\Exception\EmbedParserException;
+use Hyvor\Unfold\Exception\UnfoldException;
+use Hyvor\Unfold\UnfoldConfig;
 use Psr\Http\Client\ClientExceptionInterface;
 use Psr\Http\Message\RequestInterface;
 
@@ -15,13 +16,13 @@
  */
 abstract class EmbedParserAbstract
 {
-    protected UnfoldConfigObject $config;
+    protected UnfoldConfig $config;
 
     public function __construct(
         protected string $url,
-        ?UnfoldConfigObject $config = null,
+        ?UnfoldConfig $config = null,
     ) {
-        $this->config = $config ?? new UnfoldConfigObject();
+        $this->config = $config ?? new UnfoldConfig();
     }
 
 
@@ -65,14 +66,25 @@ public function match(): bool
         return false;
     }
 
-    public function parse(): ?EmbedResponseObject
+    /**
+     * @throws UnfoldException
+     */
+    public function parse(): EmbedResponseObject
     {
-        $oEmbedUrl = $this->oEmbedUrl();
-
-        if (!$oEmbedUrl) {
-            // TODO: Check config option for fallback
-            return null;
+        if ($this instanceof EmbedParserOEmbedInterface) {
+            return $this->parseOEmbed();
+        } elseif ($this instanceof EmbedParserCustomInterface) {
+            return $this->parseCustom();
+        } else {
+            throw new \Exception(
+                'EmbedParserAbstract should be implemented with either EmbedParserOEmbedInterface or EmbedParserCustomInterface'
+            ); // @codeCoverageIgnore
         }
+    }
+
+    public function parseOEmbed(): ?EmbedResponseObject
+    {
+        $oEmbedUrl = $this->oEmbedUrl();
 
         $uri = Uri::withQueryValues(
             new Uri($oEmbedUrl),
@@ -97,7 +109,7 @@ public function parse(): ?EmbedResponseObject
         try {
             $response = $client->sendRequest($request);
         } catch (ClientExceptionInterface $e) {
-            throw new ParserException(
+            throw new EmbedParserException(
                 "Failed to fetch oEmbed data from the endpoint",
                 previous: $e
             );
@@ -107,18 +119,28 @@ public function parse(): ?EmbedResponseObject
         $content = $response->getBody()->getContents();
 
         if ($status !== 200) {
-            throw new ParserException(
+            throw new EmbedParserException(
                 "Failed to fetch oEmbed data from the endpoint. Status: $status. Response: $content"
             );
         }
 
         $parsed = json_decode($content, true);
 
         if (!is_array($parsed)) {
-            throw new ParserException("Failed to parse JSON response from oEmbed endpoint");
+            throw new EmbedParserException("Failed to parse JSON response from oEmbed endpoint");
         }
 
         return EmbedResponseObject::fromArray($parsed);
     }
 
+    private function parseCustom()
+    {
+        $html = $this->getEmbedHtml();
+
+        return EmbedResponseObject::fromArray([
+            'type' => 'embed',
+            'html' => $html
+        ]);
+    }
+
 }

src/Embed/EmbedParserOEmbedInterface.php

@@ -4,6 +4,6 @@
 
 interface EmbedParserOEmbedInterface
 {
-    public function oEmbedUrl(): ?string;
+    public function oEmbedUrl(): string;
 
 }

src/Embed/Platforms/Instagram.php

@@ -5,7 +5,7 @@
 use GuzzleHttp\Psr7\Uri;
 use Hyvor\Unfold\Embed\EmbedParserAbstract;
 use Hyvor\Unfold\Embed\EmbedParserOEmbedInterface;
-use Hyvor\Unfold\Embed\Exception\ParserException;
+use Hyvor\Unfold\Exception\EmbedParserException;
 use Psr\Http\Message\RequestInterface;
 
 // TODO:
@@ -17,7 +17,7 @@ public function oEmbedRequestFilter(RequestInterface $request): RequestInterface
         $facebookAccessToken = $this->config->facebookAccessToken;
 
         if (!$facebookAccessToken) {
-            throw new ParserException('Facebook Access Token is required for Instagram embeds');
+            throw new EmbedParserException('Facebook Access Token is required for Instagram embeds');
         }
 
         $uri = Uri::withQueryValue($uri, 'access_token', $facebookAccessToken);
@@ -57,7 +57,7 @@ public function regex()
         ];
     }
 
-    public function oEmbedUrl(): ?string
+    public function oEmbedUrl(): string
     {
         return 'https://graph.facebook.com/v16.0/instagram_oembed';
     }

src/Embed/Platforms/Reddit.php

@@ -19,7 +19,7 @@ public function regex()
         ];
     }
 
-    public function oEmbedUrl(): ?string
+    public function oEmbedUrl(): string
     {
         return 'https://www.reddit.com/oembed';
     }

src/Embed/Platforms/Tiktok.php

@@ -3,8 +3,9 @@
 namespace Hyvor\Unfold\Embed\Platforms;
 
 use Hyvor\Unfold\Embed\EmbedParserAbstract;
+use Hyvor\Unfold\Embed\EmbedParserOEmbedInterface;
 
-class Tiktok extends EmbedParserAbstract
+class Tiktok extends EmbedParserAbstract implements EmbedParserOEmbedInterface
 {
     public function regex()
     {
@@ -14,7 +15,7 @@ public function regex()
         ];
     }
 
-    public function oEmbedUrl(): ?string
+    public function oEmbedUrl(): string
     {
         return 'https://www.tiktok.com/oembed';
     }

src/Embed/Platforms/Twitter.php

@@ -19,7 +19,7 @@ public function regex()
         ];
     }
 
-    public function oEmbedUrl(): ?string
+    public function oEmbedUrl(): string
     {
         return 'https://publish.twitter.com/oembed';
     }

src/Embed/Platforms/Youtube.php

@@ -23,7 +23,7 @@ public function regex()
         ];
     }
 
-    public function oEmbedUrl(): ?string
+    public function oEmbedUrl(): string
     {
         return 'https://www.youtube.com/oembed';
     }

src/Exception/EmbedParserException.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Hyvor\Unfold\Exception;
+
+class EmbedParserException extends UnfoldException
+{
+}

src/Embed/Exception/UnableToResolveEmbedException.php → src/Exception/EmbedUnableToResolveException.php

@@ -1,10 +1,8 @@
 <?php
 
-namespace Hyvor\Unfold\Embed\Exception;
+namespace Hyvor\Unfold\Exception;
 
-use Hyvor\Unfold\UnfoldException;
-
-class UnableToResolveEmbedException extends UnfoldException
+class EmbedUnableToResolveException extends UnfoldException
 {
     public function __construct(string $message = "", int $code = 0, ?\Throwable $previous = null)
     {

src/Exception/LinkScrapeException.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Hyvor\Unfold\Exception;
+
+class LinkScrapeException extends UnfoldException
+{
+
+}

src/UnfoldException.php → src/Exception/UnfoldException.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Hyvor\Unfold;
+namespace Hyvor\Unfold\Exception;
 
 class UnfoldException extends \Exception
 {

src/Link/Link.php

@@ -3,8 +3,9 @@
 namespace Hyvor\Unfold\Link;
 
 use GuzzleHttp\Psr7\Request;
+use Hyvor\Unfold\Exception\LinkScrapeException;
 use Hyvor\Unfold\Link\Metadata\MetadataParser;
-use Hyvor\Unfold\UnfoldConfigObject;
+use Hyvor\Unfold\UnfoldConfig;
 use Hyvor\Unfold\Unfolded\Unfolded;
 use Hyvor\Unfold\UnfoldCallContext;
 use Psr\Http\Client\ClientExceptionInterface;
@@ -13,7 +14,7 @@ class Link
 {
     public function __construct(
         private string $url,
-        private UnfoldConfigObject $config,
+        private UnfoldConfig $config,
     ) {
     }
 
@@ -27,14 +28,16 @@ public function scrape(): string
         try {
             $response = $this->config->httpClient->sendRequest($request);
         } catch (ClientExceptionInterface $e) {
-            //
+            throw new LinkScrapeException($e->getMessage());
         }
 
         $status = $response->getStatusCode();
-        $content = $response->getBody()->getContents();
-        // TODO:
 
-        return $response->getBody();
+        if ($status < 200 || $status >= 300) {
+            throw new LinkScrapeException("Unable to scrape link. HTTP status code: $status");
+        }
+
+        return $response->getBody()->getContents();
     }
 
 

src/Link/Metadata/MetadataKeyType.php

@@ -2,6 +2,9 @@
 
 namespace Hyvor\Unfold\Link\Metadata;
 
+use Hyvor\Unfold\Unfolded\UnfoldedAuthor;
+use Hyvor\Unfold\Unfolded\UnfoldedTag;
+
 enum MetadataKeyType
 {
     case TITLE;
@@ -48,4 +51,40 @@ enum MetadataKeyType
     case TWITTER_DESCRIPTION;
     case TWITTER_TITLE;
     case TWITTER_IMAGE;
+
+    /**
+     * Gets the value of the metadata from a given content string
+     * ex: article:published_time is converted to DateTimeInterface
+     */
+    public function getValue(string $content)
+    {
+        if (
+            $this === MetadataKeyType::OG_ARTICLE_PUBLISHED_TIME ||
+            $this === MetadataKeyType::OG_ARTICLE_MODIFIED_TIME
+        ) {
+            return MetadataParser::getDateTimeFromString($content);
+        }
+
+        if (
+            $this === MetadataKeyType::OG_ARTICLE_AUTHOR ||
+            $this === MetadataKeyType::TWITTER_CREATOR
+        ) {
+            return $this->getAuthorFromString($content);
+        }
+
+        if ($this === MetadataKeyType::OG_ARTICLE_TAG) {
+            return new UnfoldedTag($content);
+        }
+
+        return $content;
+    }
+
+    private function getAuthorFromString(string $value): UnfoldedAuthor
+    {
+        if (str_contains($value, 'http://') || str_contains($value, 'https://')) {
+            return new UnfoldedAuthor(null, $value);
+        } else {
+            return new UnfoldedAuthor($value, null);
+        }
+    }
 }