Merge pull request #11 from The-3Labs-Team/add-after/before-blacklist

Add after/before blacklist

Author: murdercode

README.md

@@ -35,6 +35,16 @@ php artisan vendor:publish --tag="laravel-ads-post-parser-views"
 
 ## Usage
 
+You must encapsulate your post content in a `div` tag with the id `adv__parsed__content`:
+
+```html
+<div id="adv__parsed__content">
+    {!! $parsedContent !!}
+</div>
+```
+
+Then you can use the `AdsPostParser` class to append advertising to your post:
+
 ```php
 $parsedContent = (new AdsPostParser($content))->appendAdvertising();
 ```

config/ads-post-parser.php

@@ -22,7 +22,10 @@
      * Blacklist to avoid adding advertising in some elements
      * The blacklist is a regex
      * Example:
-     * '/\[shortcode|\[image|\[product|\[widget|\[twitter|\[facebook]|\[youtube|\[gallery|\[media|<img|<quote|<h1|<h2|<h3|<h4|<h5/'
+     * '/<img|<quote|<h1|<h2|<h3|<h4|<h5/'
      */
-    'blacklist' => '/\[shortcode|\[image|\[product|\[widget|\[twitter|\[facebook|\[instagram|\[youtube|\[gallery|\[media|\[video|\[quiz|\[challenge|\[spotify|\[faq|\[movie|\[tv|\[spoiler|<img|<quote|<h1|<h2|<h3|<h4|<h5/',
+    'blacklist' => [
+        'before' => '/<iframe|<img|<h2|<h3|<ul|<li|<div/',
+        'after' => '/<iframe|<img|<ul|<li|<table|<div/',
+    ],
 ];

src/AdsPostParser.php

@@ -7,7 +7,9 @@
 
 class AdsPostParser
 {
-    public string $blacklist;
+    public string $blacklistBefore;
+
+    public string $blacklistAfter;
 
     public $dom;
 
@@ -18,7 +20,8 @@ class AdsPostParser
      */
     public function __construct(string $content)
     {
-        $this->blacklist = config('ads-post-parser.blacklist');
+        $this->blacklistBefore = config('ads-post-parser.blacklist.before');
+        $this->blacklistAfter = config('ads-post-parser.blacklist.after');
         $this->dom = HtmlDomParser::str_get_html("<div id='adv__parsed__content'>$content</div>");
         $this->content = $content;
     }
@@ -52,29 +55,18 @@ public function appendSingleAdvertising(int $index, int $advIndex): string
             return $this->dom->save();
         }
 
-        $currentItem = $items[$index];
+        $beforeItem = $items[$index];
         $nextItem = $index < $maxLoop - 1 ? $items[$index + 1] : null;
 
         if (
-            ! preg_match($this->blacklist, $currentItem->outertext)
-            && ($nextItem === null || ! preg_match($this->blacklist, $nextItem->outertext))
+            ! preg_match($this->blacklistBefore, $beforeItem->outertext)
+            && ($nextItem === null || ! preg_match($this->blacklistAfter, $nextItem->outertext))
         ) {
-            $currentItem->outertext .= Blade::render('ads-post-parser::ads'.$advIndex);
+            $beforeItem->outertext .= Blade::render('ads-post-parser::ads'.$advIndex);
         } else {
             $this->appendSingleAdvertising($index + 1, $advIndex);
         }
 
         return $this->dom->save();
     }
-
-    /**
-     * Remove the wrapping div
-     */
-    public function removeWrappingDiv(): string
-    {
-        $contentDiv = $this->dom->find('#adv__parsed__content', 0);
-        $html = $contentDiv->save();
-
-        return $html;
-    }
 }

tests/AdsPostParserTest.php

@@ -38,7 +38,8 @@
     expect($content)->toContain('YOUR AD1 HERE');
 });
 
-//it('can remove wrapping div', function () {
-//    $content = (new AdsPostParser($this->content))->appendAdvertising()->removeWrappingDiv();
-//    expect($content)->not()->toContain('<div id="adv__parsed__content">');
-//});
+it('can append single advertising with index greater than the number of paragraphs', function () {
+    $content = (new AdsPostParser($this->content))
+        ->appendSingleAdvertising(100, 1);
+    expect($content)->not()->toContain('YOUR AD1 HERE');
+});