Merge pull request #21 from The-3Labs-Team/New-AdsPostParser-logic

New AdsPostParser logic

Author: murdercode

src/AdsPostParser.php

@@ -30,6 +30,42 @@ public function __construct(string $content)
      * Append all the advertising
      */
     public function appendAdvertising(): string
+    {
+        $thresholds = config('ads-post-parser.thresholds');
+        $items = $this->dom->find('#adv__parsed__content > *');
+        $adsCount = 0;
+
+        foreach ($items as $index => $item) {
+            // === BLACKLIST ===
+            $blacklist = explode('|', trim($this->blacklistAfter, '/'));
+
+            $currentElement = $item;
+            $afterElement = $index < count($items) - 1 ? $items[$index + 1] : null;
+            $isBlackList = preg_match('/'.implode('|', $blacklist).'/', $currentElement->outertext) || ($afterElement ? preg_match('/'.implode('|', $blacklist).'/', $afterElement->outertext) : false);
+            // === END BLACKLIST ===
+
+            if (in_array($index, $thresholds)) {
+                if ($isBlackList) {
+                    $thresholds = array_map(function ($value) {
+                        return $value + 1;
+                    }, $thresholds);
+
+                    continue;
+                }
+
+                try {
+                    $currentElement->outertext .= Blade::render('ads-post-parser::ads'.array_keys($thresholds)[$adsCount]);
+                } catch (\Exception $e) {
+                    // Content without ADV
+                }
+                $adsCount++;
+            }
+        }
+
+        return $this->dom->save();
+    }
+
+    public function oldappendAdvertising(): string
     {
         $thresholds = config('ads-post-parser.thresholds');
 
@@ -59,8 +95,7 @@ public function appendSingleAdvertising(int $index, int $advIndex): string
         $nextItem = $index < $maxLoop - 1 ? $items[$index + 1] : null;
 
         if (
-            ! preg_match($this->blacklistBefore, $beforeItem->outertext)
-            && ($nextItem === null || ! preg_match($this->blacklistAfter, $nextItem->outertext))
+            ! preg_match($this->blacklistBefore, $beforeItem->outertext) && ($nextItem === null || ! preg_match($this->blacklistAfter, $nextItem->outertext))
         ) {
             try {
                 $beforeItem->outertext .= Blade::render('ads-post-parser::ads'.$advIndex);

tests/AdsPostParserTest.php

@@ -19,7 +19,71 @@
     <p>Paragraph10</p>
     <p>Paragraph11</p>
     <p>Paragraph12</p>
+    <p>Paragraph13</p>
+    <p>Paragraph15</p>
+    <p>Paragraph16</p>
+    <p>Paragraph17</p>
+    <p>Paragraph18</p>
+    <p>Paragraph19</p>
+    <p>Paragraph20</p>
     HTML;
+
+    $this->smallContent = <<<'HTML'
+        <p>Paragraph1</p>
+        <p>Paragraph2</p>
+        <p>Paragraph3</p>
+        <img src="https://example.com/image.jpg" alt="Image">
+        <p>Paragraph4</p>
+        <p>Paragraph5</p>
+    HTML;
+
+    $this->contentOnlyParagraphs = <<<'HTML'
+        <p>Paragraph1</p>
+        <p>Paragraph2</p>
+        <p>Paragraph3</p>
+        <p>Paragraph4</p>
+        <p>Paragraph5</p>
+        <p>Paragraph6</p>
+        <p>Paragraph7</p>
+        <p>Paragraph8</p>
+        <p>Paragraph9</p>
+        <p>Paragraph10</p>
+        <p>Paragraph11</p>
+        <p>Paragraph12</p>
+        <p>Paragraph13</p>
+        <p>Paragraph14</p>
+        <p>Paragraph15</p>
+        <p>Paragraph16</p>
+        <p>Paragraph17</p>
+        <p>Paragraph18</p>
+        <p>Paragraph19</p>
+        <p>Paragraph20</p>
+    HTML;
+
+});
+
+it('can append first and second advertising only paragraphs', function () {
+    $content = (new AdsPostParser($this->contentOnlyParagraphs))->appendAdvertising();
+
+    expect($content)
+        ->toContain('<p>Paragraph1</p><div>--- YOUR AD1 HERE ---</div>')
+        ->toContain('<p>Paragraph4</p><div>--- YOUR AD2 HERE ---</div>');
+});
+
+it('can append first and second advertising', function () {
+    $content = (new AdsPostParser($this->content))->appendAdvertising();
+
+    expect($content)
+        ->toContain("<p>Paragraph1</p>\n<div>--- YOUR AD1 HERE ---</div>")
+        ->toContain("<p>Paragraph7</p>\n<div>--- YOUR AD2 HERE ---</div>");
+});
+
+it('can append advertising in small content with specific position', function () {
+    $content = (new AdsPostParser($this->smallContent))->appendAdvertising();
+
+    expect($content)
+        ->toContain("<p>Paragraph1</p>\n<div>--- YOUR AD1 HERE ---</div>")
+        ->toContain("<p>Paragraph4</p>\n<div>--- YOUR AD2 HERE ---</div>");
 });
 
 it('can append advertising', function () {
@@ -32,6 +96,24 @@
         ->toContain('YOUR AD4 HERE');
 });
 
+it('can append advertising in small content', function () {
+    $content = (new AdsPostParser($this->smallContent))->appendAdvertising();
+
+    expect($content)
+        ->toContain('YOUR AD1 HERE')
+        ->toContain('YOUR AD2 HERE');
+});
+
+it('can append advertising only paragraphs', function () {
+    $content = (new AdsPostParser($this->content))->appendAdvertising();
+
+    expect($content)
+        ->toContain('YOUR AD1 HERE')
+        ->toContain('YOUR AD2 HERE')
+        ->toContain('YOUR AD3 HERE')
+        ->toContain('YOUR AD4 HERE');
+});
+
 it('can append single advertising', function () {
     $content = (new AdsPostParser($this->content))
         ->appendSingleAdvertising(2, 1);