Ignore metadata when skipping records

When skipping records during updates on Algolia items, we should ignore any metadata as this shouldn't be a factor on wether to index or not. Only records which have at least one key value pair for indexing should be indexed.

This fixes a bug where empty records with soft deleted enabled were still being updated: laravel#350

src/Engines/AlgoliaEngine.php

@@ -55,15 +55,15 @@ public function update($models)
         }
 
         $objects = $models->map(function ($model) {
-            $array = array_merge(
-                $model->toSearchableArray(), $model->scoutMetadata()
-            );
-
-            if (empty($array)) {
+            if (empty($searchableData = $model->toSearchableArray())) {
                 return;
             }
 
-            return array_merge(['objectID' => $model->getScoutKey()], $array);
+            return array_merge(
+                ['objectID' => $model->getScoutKey()],
+                $searchableData,
+                $model->scoutMetadata()
+            );
         })->filter()->values()->all();
 
         if (! empty($objects)) {

tests/AlgoliaEngineTest.php

@@ -117,4 +117,32 @@ public function test_update_empty_searchable_array_does_not_add_objects_to_index
         $engine = new AlgoliaEngine($client);
         $engine->update(Collection::make([new EmptyTestModel]));
     }
+
+    public function test_update_empty_searchable_array_from_soft_deleted_model_does_not_add_objects_to_index()
+    {
+        $client = m::mock('Algolia\AlgoliaSearch\SearchClient');
+        $client->shouldReceive('initIndex')->with('table')->andReturn($index = m::mock('StdClass'));
+        $index->shouldNotReceive('saveObjects');
+
+        $engine = new AlgoliaEngine($client, true);
+        $engine->update(Collection::make([new SoftDeletedEmptySearchableModel]));
+    }
+}
+
+class SoftDeletedEmptySearchableModel extends EmptyTestModel
+{
+    public function toSearchableArray()
+    {
+        return [];
+    }
+
+    public function pushSoftDeleteMetadata()
+    {
+        //
+    }
+
+    public function scoutMetadata()
+    {
+        return ['__soft_deleted' => 1];
+    }
 }