Merge pull request #31 from 5am-code/feature/new-blocks

johguentner · web-flow · commit 23fe48d2de01 · 2021-09-12T01:10:28.000+02:00
Feature/new blocks
diff --git a/src/Entities/Blocks/BaseFileBlock.php b/src/Entities/Blocks/BaseFileBlock.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace FiveamCode\LaravelNotionApi\Entities\Blocks;
+
+use DateTime;
+use FiveamCode\LaravelNotionApi\Entities\Contracts\Modifiable;
+use Illuminate\Support\Arr;
+use FiveamCode\LaravelNotionApi\Entities\Entity;
+use FiveamCode\LaravelNotionApi\Entities\PropertyItems\RichText;
+use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
+
+/**
+ * Class TextBlock
+ * @package FiveamCode\LaravelNotionApi\Entities\Blocks
+ */
+class BaseFileBlock extends Block implements Modifiable
+{
+    protected static function createFileBlock(BaseFileBlock $fileBlock, string $url, string $caption = ""): BaseFileBlock
+    {
+        $fileBlock->rawContent = [
+            'type' => 'external',
+            'caption' => [
+                [
+                    'type' => 'text',
+                    'text' => [
+                        'content' => $caption
+                    ]
+                ]
+            ],
+            'external' => [
+                'url' => $url,
+            ]
+        ];
+
+        $fileBlock->fillContent();
+
+        return $fileBlock;
+    }
+
+    private string $hostingType = "";
+    private string $url = "";
+    private RichText $caption;
+
+
+    /**
+     * 
+     */
+    protected function fillFromRaw(): void
+    {
+        parent::fillFromRaw();
+        $this->fillContent();
+    }
+
+    /**
+     * 
+     */
+    protected function fillContent(): void
+    {
+        $this->hostingType = $this->rawContent['type'];
+        $this->url = $this->rawContent[$this->hostingType]['url'];
+        $this->caption = new RichText($this->rawContent['caption']);
+        $this->content = $this->url;
+    }
+
+    public function getUrl()
+    {
+        return $this->url;
+    }
+
+    public function getHostingType()
+    {
+        return $this->hostingType;
+    }
+
+    public function getCaption()
+    {
+        return $this->caption;
+    }
+}
diff --git a/src/Entities/Blocks/Block.php b/src/Entities/Blocks/Block.php
@@ -69,7 +69,7 @@ protected function fillFromRaw(): void
     {
         $this->fillId();
         $this->fillType();
-        $this->fillContent();
+        $this->fillRawContent();
         $this->fillHasChildren();
         $this->fillCreatedTime();
         $this->fillLastEditedTime();
@@ -88,7 +88,7 @@ private function fillType(): void
     /**
      *
      */
-    private function fillContent(): void
+    private function fillRawContent(): void
     {
         if (Arr::exists($this->responseData, $this->getType())) {
             $this->rawContent = $this->responseData[$this->getType()];
@@ -156,12 +156,13 @@ public function getContent()
     /**
      * @return string
      */
-    public function asText() : string
+    public function asText(): string
     {
         return $this->text;
     }
 
-    public function setContent($content){
+    public function setContent($content)
+    {
         $this->content = $content;
     }
 
@@ -194,6 +195,11 @@ private static function mapTypeToClass(string $type): string
             case 'paragraph':
             case 'to_do':
             case 'toggle':
+            case 'embed':
+            case 'image':
+            case 'video':
+            case 'file':
+            case 'pdf':
                 $class = str_replace('_', '', ucwords($type, '_'));
                 return "FiveamCode\\LaravelNotionApi\\Entities\\Blocks\\" . $class;
             case 'heading_1':
diff --git a/src/Entities/Blocks/ChildPage.php b/src/Entities/Blocks/ChildPage.php
@@ -13,6 +13,11 @@
  */
 class ChildPage extends Block
 {
+    function __construct(array $responseData = null){
+        $this->type = "child_page";
+        parent::__construct($responseData);
+    }
+
     /**
      * 
      */
diff --git a/src/Entities/Blocks/Embed.php b/src/Entities/Blocks/Embed.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace FiveamCode\LaravelNotionApi\Entities\Blocks;
+
+use DateTime;
+use FiveamCode\LaravelNotionApi\Entities\Contracts\Modifiable;
+use Illuminate\Support\Arr;
+use FiveamCode\LaravelNotionApi\Entities\Entity;
+use FiveamCode\LaravelNotionApi\Entities\PropertyItems\RichText;
+use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
+
+/**
+ * Class Paragraph
+ * @package FiveamCode\LaravelNotionApi\Entities\Blocks
+ */
+class Embed extends Block implements Modifiable
+{
+    private RichText $caption;
+    private string $url = "";
+
+    public static function create(string $url, string $caption = ""): Embed
+    {
+        $embed = new Embed();
+
+        $embed->rawContent = [
+            'url' => $url,
+            'caption' => [
+                [
+                    'type' => 'text',
+                    'text' => [
+                        'content' => $caption
+                    ]
+                ]
+            ]
+        ];
+
+        $embed->fillContent();
+
+        return $embed;
+    }
+
+    function __construct(array $responseData = null)
+    {
+        $this->type = "embed";
+        parent::__construct($responseData);
+    }
+
+    /**
+     * 
+     */
+    protected function fillFromRaw(): void
+    {
+        parent::fillFromRaw();
+        $this->fillContent();
+    }
+
+    /**
+     * 
+     */
+    protected function fillContent(): void
+    {
+        $this->url = $this->rawContent['url'];
+        $this->caption = new RichText($this->rawContent['caption']);
+        $this->content = $this->url;
+    }
+
+    public function getUrl()
+    {
+        return $this->url;
+    }
+
+    public function getCaption()
+    {
+        return $this->caption;
+    }
+}
diff --git a/src/Entities/Blocks/File.php b/src/Entities/Blocks/File.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace FiveamCode\LaravelNotionApi\Entities\Blocks;
+
+use DateTime;
+use Illuminate\Support\Arr;
+use FiveamCode\LaravelNotionApi\Entities\Entity;
+use FiveamCode\LaravelNotionApi\Entities\PropertyItems\RichText;
+use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
+
+/**
+ * Class Paragraph
+ * @package FiveamCode\LaravelNotionApi\Entities\Blocks
+ */
+class File extends BaseFileBlock
+{
+    public static function create(string $url, string $caption = ""): File
+    {
+        $file = new File();
+        BaseFileBlock::createFileBlock($file, $url, $caption);
+        return $file;
+    }
+
+    function __construct(array $responseData = null)
+    {
+        $this->type = "file";
+        parent::__construct($responseData);
+    }
+
+}
diff --git a/src/Entities/Blocks/Image.php b/src/Entities/Blocks/Image.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace FiveamCode\LaravelNotionApi\Entities\Blocks;
+
+use DateTime;
+use Illuminate\Support\Arr;
+use FiveamCode\LaravelNotionApi\Entities\Entity;
+use FiveamCode\LaravelNotionApi\Entities\PropertyItems\RichText;
+use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
+
+/**
+ * Class Paragraph
+ * @package FiveamCode\LaravelNotionApi\Entities\Blocks
+ */
+class Image extends BaseFileBlock
+{
+    public static function create(string $url, string $caption = ""): Image
+    {
+        $image = new Image();
+        BaseFileBlock::createFileBlock($image, $url, $caption);
+        return $image;
+    }
+
+    function __construct(array $responseData = null)
+    {
+        $this->type = "image";
+        parent::__construct($responseData);
+    }
+
+}
diff --git a/src/Entities/Blocks/Pdf.php b/src/Entities/Blocks/Pdf.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace FiveamCode\LaravelNotionApi\Entities\Blocks;
+
+use DateTime;
+use Illuminate\Support\Arr;
+use FiveamCode\LaravelNotionApi\Entities\Entity;
+use FiveamCode\LaravelNotionApi\Entities\PropertyItems\RichText;
+use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
+
+/**
+ * Class Paragraph
+ * @package FiveamCode\LaravelNotionApi\Entities\Blocks
+ */
+class Pdf extends BaseFileBlock
+{
+    public static function create(string $url, string $caption = ""): Pdf
+    {
+        $pdf = new Pdf();
+        BaseFileBlock::createFileBlock($pdf, $url, $caption);
+        return $pdf;
+    }
+
+    function __construct(array $responseData = null)
+    {
+        $this->type = "pdf";
+        parent::__construct($responseData);
+    }
+
+}
diff --git a/src/Entities/Blocks/Video.php b/src/Entities/Blocks/Video.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace FiveamCode\LaravelNotionApi\Entities\Blocks;
+
+use DateTime;
+use Illuminate\Support\Arr;
+use FiveamCode\LaravelNotionApi\Entities\Entity;
+use FiveamCode\LaravelNotionApi\Entities\PropertyItems\RichText;
+use FiveamCode\LaravelNotionApi\Exceptions\HandlingException;
+
+/**
+ * Class Paragraph
+ * @package FiveamCode\LaravelNotionApi\Entities\Blocks
+ */
+class Video extends BaseFileBlock
+{
+    public static function create(string $url, string $caption = ""): Video
+    {
+        $video = new Video();
+        BaseFileBlock::createFileBlock($video, $url, $caption);
+        return $video;
+    }
+
+    function __construct(array $responseData = null)
+    {
+        $this->type = "video";
+        parent::__construct($responseData);
+    }
+
+}
diff --git a/tests/EndpointBlocksTest.php b/tests/EndpointBlocksTest.php
diff --git a/tests/stubs/endpoints/blocks/response_specific_supported_blocks_200.json b/tests/stubs/endpoints/blocks/response_specific_supported_blocks_200.json

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,11 @@`
`13`	`13`	`*/`
`14`	`14`	`class ChildPage extends Block`
`15`	`15`	`{`
	`16`	`+ function __construct(array $responseData = null){`
	`17`	`+ $this->type = "child_page";`
	`18`	`+ parent::__construct($responseData);`
	`19`	`+ }`
	`20`	`+`
`16`	`21`	`/**`
`17`	`22`	`*`
`18`	`23`	`*/`