Merge pull request #2 from meilisearch/update-owner

update owner

README.md

@@ -20,14 +20,14 @@ Here is the [MeiliSearch documentation](https://docs.meilisearch.com/) 📖
 ### Composer
 
 ```bash
-$ composer require shokme/laravel-scout-meilisearch
+$ composer require meilisearch/meilisearch-laravel-scout
 ```
 
 ### Export configuration
 
 ```bash
 $ php artisan vendor:publish --provider="Laravel\Scout\ScoutServiceProvider"
-$ php artisan vendor:publish --provider="Shokme\Meilisearch\MeilisearchServiceProvider" --tag="config"
+$ php artisan vendor:publish --provider="Meilisearch\Scout\MeilisearchServiceProvider" --tag="config"
 ```
 
 ### Update .env
@@ -129,7 +129,7 @@ or you can use the artisan command to delete all documents from an index:
 $ php artisan scout:flush "App\Book"
 ```
 
-### Delete an index
+#### Delete an index
 ```bash
 $ php artisan scout:index -d books
 ```

composer.json

@@ -1,5 +1,5 @@
 {
-    "name": "shokme/laravel-scout-meilisearch",
+    "name": "meilisearch/meilisearch-laravel-scout",
     "description": "Laravel Scout custom engine for MeiliSearch",
     "keywords": ["meilisearch", "laravel", "scout", "search"],
     "type": "library",
@@ -22,18 +22,18 @@
     },
     "autoload": {
         "psr-4": {
-            "Shokme\\Meilisearch\\": "src"
+            "Meilisearch\\Scout\\": "src"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Shokme\\Meilisearch\\Tests\\": "tests"
+            "Meilisearch\\Scout\\Tests\\": "tests"
         }
     },
     "extra": {
         "laravel": {
             "providers": [
-                "Shokme\\Meilisearch\\MeilisearchServiceProvider"
+                "Meilisearch\\Scout\\MeilisearchServiceProvider"
             ]
         }
     },

src/Console/IndexMeilisearch.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Shokme\Meilisearch\Console;
+namespace Meilisearch\Scout\Console;
 
 use Illuminate\Console\Command;
 use MeiliSearch\Client;
 use MeiliSearch\Exceptions\HTTPRequestException;
-use Shokme\Meilisearch\Engines\MeilisearchEngine;
+use Meilisearch\Engines\MeilisearchEngine;
 
 class IndexMeilisearch extends Command
 {

src/Engines/MeilisearchEngine.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Shokme\Meilisearch\Engines;
+namespace Meilisearch\Scout\Engines;
 
 use Laravel\Scout\Engines\Engine;
 use MeiliSearch\Client as Meilisearch;

src/MeilisearchServiceProvider.php

@@ -1,13 +1,12 @@
 <?php
 
-namespace Shokme\Meilisearch;
+namespace Meilisearch\Scout;
 
 use Illuminate\Support\ServiceProvider;
 use Laravel\Scout\EngineManager;
 use MeiliSearch\Client;
-use Shokme\Meilisearch\Console\IndexMeilisearch;
-use Shokme\Meilisearch\Console\RequestMeilisearch;
-use Shokme\Meilisearch\Engines\MeilisearchEngine;
+use Meilisearch\Scout\Console\IndexMeilisearch;
+use Meilisearch\Scout\Engines\MeilisearchEngine;
 
 class MeilisearchServiceProvider extends ServiceProvider
 {

tests/Fixtures/SearchableModel.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Shokme\Meilisearch\Tests\Fixtures;
+namespace Meilisearch\Scout\Tests\Fixtures;
 
 use Illuminate\Database\Eloquent\Model;
 use Laravel\Scout\Searchable;
@@ -12,7 +12,7 @@ class SearchableModel extends Model
     /**
      * The attributes that are mass assignable.
      */
-    protected array $fillable = ['id'];
+    protected $fillable = ['id'];
 
     public function searchableAs()
     {

tests/MeilisearchEngineTest.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace Shokme\Meilisearch\Tests;
+namespace Meilisearch\Scout\Tests;
 
 use MeiliSearch\Client;
 use Illuminate\Database\Eloquent\Collection;
 use Laravel\Scout\Builder;
-use Shokme\Meilisearch\Engines\MeilisearchEngine;
-use Shokme\Meilisearch\Tests\Fixtures\SearchableModel;
+use Meilisearch\Scout\Engines\MeilisearchEngine;
+use Meilisearch\Scout\Tests\Fixtures\SearchableModel;
 use Mockery as m;
 use stdClass;
 
@@ -22,9 +22,11 @@ public function update_adds_objects_to_index()
     {
         $client = m::mock(Client::class);
         $client->shouldReceive('getIndex')->with('table')->andReturn($index = m::mock(stdClass::class));
-        $index->shouldReceive('saveObjects')->with([[
-            'id' => 1
-        ]]);
+        $index->shouldReceive('addDocuments')->with([
+            [
+                'id' => 1
+            ]
+        ]);
 
         $engine = new MeilisearchEngine($client);
         $engine->update(Collection::make([new SearchableModel]));
@@ -47,44 +49,46 @@ public function search_sends_correct_parameters_to_meilisearch()
         $client = m::mock(Client::class);
         $client->shouldReceive('getIndex')->with('table')->andReturn($index = m::mock(stdClass::class));
         $index->shouldReceive('search')->with('mustang', [
-            'filters' => ['foo=1'],
+            'filters' => 'foo=1',
         ]);
 
         $engine = new MeilisearchEngine($client);
-        $builder = new Builder(new SearchableModel, 'mustang');
-        $builder->where('filters', ['foo=1']);
+        $builder = new Builder(new SearchableModel, 'mustang', function ($meilisearch, $query, $options) {
+            $options['filters'] = 'foo=1';
+
+            return $meilisearch->search($query, $options);
+        });
         $engine->search($builder);
     }
 
     /** @test */
     public function map_correctly_maps_results_to_models()
     {
-        $this->markTestSkipped('TODO: try to prevent need of sql');
-
         $client = m::mock(Client::class);
         $engine = new MeilisearchEngine($client);
 
         $model = m::mock(stdClass::class);
-        $model->shouldReceive('getScoutModelsByIds')->andReturn(Collection::make([new SearchableModel(['id' => 1])]));
-
+        $model->shouldReceive(['getKeyName' => 'id']);
+        $model->shouldReceive('getScoutModelsByIds')->andReturn($models = Collection::make([new SearchableModel(['id' => 1])]));
         $builder = m::mock(Builder::class);
 
-        $results = $engine->map($builder, ['nbHits' => 1, 'hits' => [
-            ['id' => 1],
-        ]], new SearchableModel());
+        $results = $engine->map($builder, [
+            'nbHits' => 1, 'hits' => [
+                ['id' => 1],
+            ]
+        ], $model);
 
         $this->assertEquals(1, count($results));
     }
 
     /** @test */
     public function map_method_respects_order()
     {
-        $this->markTestSkipped('TODO: try to prevent need of sql');
-
         $client = m::mock(Client::class);
         $engine = new MeilisearchEngine($client);
 
         $model = m::mock(stdClass::class);
+        $model->shouldReceive(['getKeyName' => 'id']);
         $model->shouldReceive('getScoutModelsByIds')->andReturn($models = Collection::make([
             new SearchableModel(['id' => 1]),
             new SearchableModel(['id' => 2]),
@@ -94,12 +98,14 @@ public function map_method_respects_order()
 
         $builder = m::mock(Builder::class);
 
-        $results = $engine->map($builder, ['nbHits' => 4, 'hits' => [
-            ['id' => 1],
-            ['id' => 2],
-            ['id' => 4],
-            ['id' => 3],
-        ]], new SearchableModel());
+        $results = $engine->map($builder, [
+            'nbHits' => 4, 'hits' => [
+                ['id' => 1],
+                ['id' => 2],
+                ['id' => 4],
+                ['id' => 3],
+            ]
+        ], $model);
 
         $this->assertEquals(4, count($results));
         $this->assertEquals([

tests/TestCase.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Shokme\Meilisearch\Tests;
+namespace Meilisearch\Scout\Tests;
 
-use Shokme\Meilisearch\MeilisearchServiceProvider;
+use Meilisearch\Scout\MeilisearchServiceProvider;
 
 class TestCase extends \Orchestra\Testbench\TestCase
 {