Simple

Author: spekulatius

README.md

@@ -127,13 +127,10 @@ foreach ($jobs as $job) {
 use TwoGisParser\Client;
 use TwoGisParser\Config;
 
+// Изменить таймаут или базовый URL
 $client = new Client('токен', new Config(
     apiToken: 'токен',
-    placesActorId: 'zen-studio/2gis-places-scraper-api',   // по умолчанию
-    reviewsActorId: 'zen-studio/2gis-reviews-scraper',
-    propertyActorId: 'zen-studio/2gis-property-scraper',
-    jobsActorId: 'zen-studio/2gis-jobs-scraper',
-    timeout: 900,
+    timeout: 600,
 ));
 ```
 

src/Client.php

@@ -67,7 +67,7 @@ public function scrapePlaces(
         $input = array_merge($input, $options);
 
         try {
-            $items = $this->runActor($this->config->placesActorId, $input);
+            $items = $this->runActor(Config::PLACES_ACTOR_ID, $input);
 
             return array_map(
                 static fn (array $item): Place => Place::fromArray($item),
@@ -118,7 +118,7 @@ public function scrapeReviews(
         $input = array_merge($input, $options);
 
         try {
-            $items = $this->runActor($this->config->reviewsActorId, $input);
+            $items = $this->runActor(Config::REVIEWS_ACTOR_ID, $input);
 
             return array_map(
                 static fn (array $item): Review => Review::fromArray($item),
@@ -168,7 +168,7 @@ public function scrapeProperties(
         $input = array_merge($input, $options);
 
         try {
-            $items = $this->runActor($this->config->propertyActorId, $input);
+            $items = $this->runActor(Config::PROPERTY_ACTOR_ID, $input);
 
             return array_map(
                 static fn (array $item): Property => Property::fromArray($item),
@@ -222,7 +222,7 @@ public function scrapeJobs(
         }
 
         try {
-            $items = $this->runActor($this->config->jobsActorId, $input);
+            $items = $this->runActor(Config::JOBS_ACTOR_ID, $input);
 
             return array_map(
                 static fn (array $item): Job => Job::fromArray($item),

src/Config.php

@@ -6,12 +6,16 @@
 
 final readonly class Config
 {
+    public const PLACES_ACTOR_ID = 'zen-studio/2gis-places-scraper-api';
+
+    public const REVIEWS_ACTOR_ID = 'zen-studio/2gis-reviews-scraper';
+
+    public const PROPERTY_ACTOR_ID = 'zen-studio/2gis-property-scraper';
+
+    public const JOBS_ACTOR_ID = 'zen-studio/2gis-jobs-scraper';
+
     public function __construct(
         public string $apiToken,
-        public string $placesActorId = 'zen-studio/2gis-places-scraper-api',
-        public string $reviewsActorId = 'zen-studio/2gis-reviews-scraper',
-        public string $propertyActorId = 'zen-studio/2gis-property-scraper',
-        public string $jobsActorId = 'zen-studio/2gis-jobs-scraper',
         public string $baseUrl = 'https://api.apify.com/v2',
         public int $timeout = 900,
     ) {}

tests/ConfigTest.php

@@ -8,30 +8,25 @@
     $config = new Config('test_api_token');
 
     expect($config->apiToken)->toBe('test_api_token')
-        ->and($config->placesActorId)->toBe('zen-studio/2gis-places-scraper-api')
-        ->and($config->reviewsActorId)->toBe('zen-studio/2gis-reviews-scraper')
-        ->and($config->propertyActorId)->toBe('zen-studio/2gis-property-scraper')
-        ->and($config->jobsActorId)->toBe('zen-studio/2gis-jobs-scraper')
         ->and($config->baseUrl)->toBe('https://api.apify.com/v2')
         ->and($config->timeout)->toBe(900);
 });
 
 it('accepts custom values', function () {
     $config = new Config(
         apiToken: 'custom_token',
-        placesActorId: 'custom/places-actor',
-        reviewsActorId: 'custom/reviews-actor',
-        propertyActorId: 'custom/property-actor',
-        jobsActorId: 'custom/jobs-actor',
         baseUrl: 'https://custom.api.com/v2',
         timeout: 600,
     );
 
     expect($config->apiToken)->toBe('custom_token')
-        ->and($config->placesActorId)->toBe('custom/places-actor')
-        ->and($config->reviewsActorId)->toBe('custom/reviews-actor')
-        ->and($config->propertyActorId)->toBe('custom/property-actor')
-        ->and($config->jobsActorId)->toBe('custom/jobs-actor')
         ->and($config->baseUrl)->toBe('https://custom.api.com/v2')
         ->and($config->timeout)->toBe(600);
 });
+
+it('has hardcoded actor IDs', function () {
+    expect(Config::PLACES_ACTOR_ID)->toBe('zen-studio/2gis-places-scraper-api')
+        ->and(Config::REVIEWS_ACTOR_ID)->toBe('zen-studio/2gis-reviews-scraper')
+        ->and(Config::PROPERTY_ACTOR_ID)->toBe('zen-studio/2gis-property-scraper')
+        ->and(Config::JOBS_ACTOR_ID)->toBe('zen-studio/2gis-jobs-scraper');
+});