Merge branch 'master' of github.com:algolia/algoliasearch-laravel

Author: maxiloc

.gitignore

@@ -1,3 +1,4 @@
 /vendor
 composer.lock
 phpunit.xml
+*.sublime*

README.md

@@ -89,6 +89,12 @@ class Contact extends Model
 }
 ```
 
+After setting up your model, you need to manually do the initial import of your data. You can do this by calling `reindex` on your model class. Using our previous example, this would be:
+
+```php
+Contact::reindex();
+```
+
 ### Ranking & Relevance
 
 We provide many ways to configure your index settings to tune the overall relevancy but the most important ones are the **searchable attributes** and the attributes reflecting the **record popularity**. You can configure them with the following code:
@@ -396,6 +402,17 @@ To keep settings that you set on the Algolia dashboard when reindexing and setti
 Contact::reindex(true, true, true);
 ```
 
+To implement a callback that gets called everytime a batch of entities is indexed:
+
+```php
+Contact::reindex(true, true, false, function ($entities)
+{
+    foreach ($entities as $entity)
+    {
+        var_dump($entity->id); // Contact::$id
+    }
+});
+```
 
 ### Clearing an Index
 

src/AlgoliaEloquentTrait.php

@@ -18,7 +18,7 @@ trait AlgoliaEloquentTrait
      * @param bool $setSettings
      * @param bool $mergeOldSettings
      */
-    public function _reindex($safe = true, $setSettings = true, $mergeOldSettings = false)
+    public function _reindex($safe = true, $setSettings = true, $mergeOldSettings = false, \Closure $onInsert = null)
     {
         /** @var \AlgoliaSearch\Laravel\ModelHelper $modelHelper */
         $modelHelper = App::make('\AlgoliaSearch\Laravel\ModelHelper');
@@ -31,18 +31,27 @@ public function _reindex($safe = true, $setSettings = true, $mergeOldSettings =
             $this->_setSettings($setToTmpIndices, $mergeOldSettings);
         }
 
-        static::chunk(100, function ($models) use ($indicesTmp, $modelHelper) {
+        static::chunk(100, function ($models) use ($indicesTmp, $modelHelper, $onInsert) {
             /** @var \AlgoliaSearch\Index $index */
             foreach ($indicesTmp as $index) {
-                $records = [];
+                $records         = [];
+                $recordsAsEntity = [];
 
                 foreach ($models as $model) {
                     if ($modelHelper->indexOnly($model, $index->indexName)) {
                         $records[] = $model->getAlgoliaRecordDefault($index->indexName);
+
+                        if ($onInsert && is_callable($onInsert)) {
+                            $recordsAsEntity[] = $model;
+                        }
                     }
                 }
 
                 $index->addObjects($records);
+
+                if ($onInsert && is_callable($onInsert)) {
+                    call_user_func_array($onInsert, [$recordsAsEntity]);
+                }
             }
 
         });

src/EloquentSubscriber.php

@@ -21,6 +21,8 @@ public function saved($model)
         foreach ($this->modelHelper->getIndices($model) as $index) {
             if ($this->modelHelper->indexOnly($model, $index->indexName)) {
                 $index->addObject($this->modelHelper->getAlgoliaRecord($model, $index->indexName), $this->modelHelper->getObjectId($model));
+            } elseif ($this->modelHelper->wouldBeIndexed($model, $index->indexName)) {
+                $index->deleteObject($this->modelHelper->getObjectId($model));
             }
         }
 

src/ModelHelper.php

@@ -45,6 +45,19 @@ private function hasAlgoliaTrait(Model $class, $autoload = false)
         return (isset($traits['AlgoliaSearch\Laravel\AlgoliaEloquentTrait']));
     }
 
+    public function wouldBeIndexed(Model $model, $index_name)
+    {
+        if (! method_exists($model, 'indexOnly')) {
+            return false;
+        }
+
+        $cloned = clone $model;
+
+        $cloned->setRawAttributes($cloned->getOriginal());
+
+        return $cloned->indexOnly($index_name) === true;
+    }
+
     public function isAutoIndex(Model $model)
     {
         return ($this->hasAlgoliaTrait($model) && $model->autoIndex());