Merge pull request #104 from TheDragonCode/1.x

Refactored converters and added `ConverterHelper` to simplify usage

Author: andrey-helldar

src/Converters/ConvertToJson.php renamed to src/Converters/JsonConverter.php

@@ -14,7 +14,7 @@
 use function mb_substr;
 use function sprintf;
 
-class ConvertToJson extends Converter
+class JsonConverter extends Converter
 {
     public function __construct(
         #[Config('feeds.converters.json.options')]

src/Converters/ConvertToJsonLines.php renamed to src/Converters/JsonLinesConverter.php

@@ -12,7 +12,7 @@
 use function is_array;
 use function json_encode;
 
-class ConvertToJsonLines extends Converter
+class JsonLinesConverter extends Converter
 {
     public function __construct(
         #[Config('feeds.converters.json.options')]

src/Converters/ConvertToXml.php renamed to src/Converters/XmlConverter.php

@@ -21,7 +21,7 @@
 use function str_starts_with;
 use function trim;
 
-class ConvertToXml extends Converter
+class XmlConverter extends Converter
 {
     protected DOMDocument $document;
 

src/Helpers/ConverterHelper.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DragonCode\LaravelFeed\Helpers;
+
+use DragonCode\LaravelFeed\Converters\Converter;
+use DragonCode\LaravelFeed\Converters\JsonConverter;
+use DragonCode\LaravelFeed\Converters\JsonLinesConverter;
+use DragonCode\LaravelFeed\Converters\XmlConverter;
+use DragonCode\LaravelFeed\Enums\FeedFormatEnum;
+
+use function app;
+
+class ConverterHelper
+{
+    public function get(FeedFormatEnum $format): Converter
+    {
+        return match ($format) {
+            FeedFormatEnum::Xml       => app(XmlConverter::class),
+            FeedFormatEnum::Json      => app(JsonConverter::class),
+            FeedFormatEnum::JsonLines => app(JsonLinesConverter::class),
+        };
+    }
+}

src/Services/GeneratorService.php

@@ -5,11 +5,8 @@
 namespace DragonCode\LaravelFeed\Services;
 
 use DragonCode\LaravelFeed\Converters\Converter;
-use DragonCode\LaravelFeed\Converters\ConvertToJson;
-use DragonCode\LaravelFeed\Converters\ConvertToJsonLines;
-use DragonCode\LaravelFeed\Converters\ConvertToXml;
-use DragonCode\LaravelFeed\Enums\FeedFormatEnum;
 use DragonCode\LaravelFeed\Feeds\Feed;
+use DragonCode\LaravelFeed\Helpers\ConverterHelper;
 use DragonCode\LaravelFeed\Queries\FeedQuery;
 use Illuminate\Console\OutputStyle;
 use Illuminate\Database\Eloquent\Collection;
@@ -23,9 +20,7 @@ class GeneratorService
 {
     public function __construct(
         protected FilesystemService $filesystem,
-        protected ConvertToXml $xmlConverter,
-        protected ConvertToJson $jsonConverter,
-        protected ConvertToJsonLines $jsonLinesConverter,
+        protected ConverterHelper $converter,
         protected FeedQuery $query,
     ) {}
 
@@ -64,7 +59,7 @@ function (Collection $models) use ($file, $feed, $bar, &$progress) {
 
                 foreach ($models as $model) {
                     $content[] = $this->converter($feed)->item(
-                        item  : $feed->item($model),
+                        item: $feed->item($model),
                         isLast: $progress <= 1
                     );
 
@@ -148,11 +143,9 @@ protected function setLastActivity(Feed $feed): void
 
     protected function converter(Feed $feed): Converter
     {
-        return match ($feed->format()) {
-            FeedFormatEnum::Xml       => $this->xmlConverter,
-            FeedFormatEnum::Json      => $this->jsonConverter,
-            FeedFormatEnum::JsonLines => $this->jsonLinesConverter,
-        };
+        return $this->converter->get(
+            $feed->format()
+        );
     }
 
     protected function progressBar(int $count, ?OutputStyle $output): ?ProgressBar

tests/Unit/Architecture/ConverterTest.php

@@ -0,0 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
+arch()
+    ->expect('DragonCode\LaravelFeed\Converters')
+    ->toHaveSuffix('Converter');