Improvements for rebuild and clear commands, removed unused functional (destroy connection, helpers), fix some tests.

Author: nqxcode

composer.json

@@ -21,9 +21,6 @@
         "orchestra/testbench": "3.1.*"
     },
     "autoload": {
-        "files": [
-            "src/Nqxcode/LuceneSearch/Support/helpers.php"
-        ],
         "psr-4": {
             "Nqxcode\\LuceneSearch\\": "src/Nqxcode/LuceneSearch",
             "tests\\": "tests/"

src/Nqxcode/LuceneSearch/Console/ClearCommand.php

@@ -1,4 +1,4 @@
-<?php  namespace Nqxcode\LuceneSearch\Console;
+<?php namespace Nqxcode\LuceneSearch\Console;
 
 use Illuminate\Console\Command;
 use Config;
@@ -15,7 +15,8 @@ public function fire()
             $this->output = new NullOutput;
         }
 
-        if ($result = rmdir_recursive(Config::get('laravel-lucene-search.index.path'))) {
+        if (\File::isDirectory($indexPath = Config::get('laravel-lucene-search.index.path'))) {
+            \File::deleteDirectory($indexPath);
             $this->info('Search index is cleared.');
         } else {
             $this->comment('There is nothing to clear..');

src/Nqxcode/LuceneSearch/Console/RebuildCommand.php

@@ -19,9 +19,7 @@ public function fire()
             $this->output = new NullOutput;
         }
 
-        if (is_dir(Config::get('laravel-lucene-search.index.path'))) {
-            $this->call('search:clear');
-        }
+        $this->call('search:clear');
 
         /** @var Search $search */
         $search = App::make('search');
@@ -36,17 +34,17 @@ public function fire()
 
                 if ($count === 0) {
                     $this->comment(' No available models found. ');
-                    continue;
+                    return;
                 }
 
                 $progress = new ProgressBar($this->getOutput(), $count);
+                $progress->start();
 
-                $modelRepository->chunk(1000, function ($rows) use ($progress, $search) {
-                    foreach ($rows as $model) {
+                $modelRepository->chunk(1000, function ($chunk) use ($progress, $search) {
+                    foreach ($chunk as $model) {
                         $search->update($model);
                         $progress->advance();
                     }
-
                 });
 
                 $progress->finish();

src/Nqxcode/LuceneSearch/Index/Connection.php

@@ -58,16 +58,4 @@ public function __construct($path, AnalyzerConfig $config)
             throw $e;
         }
     }
-
-    /**
-     * Destroy the entire index.
-     */
-    public function destroy()
-    {
-        $this->index = null;
-
-        if (is_dir($this->indexPath)) {
-            rmdir_recursive($this->indexPath);
-        }
-    }
 }

src/Nqxcode/LuceneSearch/Model/Config.php

@@ -175,7 +175,7 @@ private function groupedSearchableIdsAsKeys(array $hits)
     /**
      * Get full list of models instances.
      *
-     * @return Model[]
+     * @return Model[]|Builder[]
      */
     public function repositories()
     {

src/Nqxcode/LuceneSearch/Search.php

@@ -60,16 +60,6 @@ public function __construct(Connection $connection, Config $config)
         $this->config = $config;
     }
 
-    /**
-     * Destroy the entire index.
-     *
-     * @return bool
-     */
-    public function destroy()
-    {
-        $this->connection->destroy();
-    }
-
     /**
      * Find query hits for model in index.
      *

src/Nqxcode/LuceneSearch/Support/helpers.php

@@ -26,11 +26,7 @@ public function testMorphologySearch()
         $query = Search::query('clocks', '*');
         $this->assertEquals(3, $query->count());
 
-        $query = Search::query('bigger', '*');
-        $this->assertEquals(2, $query->count());
-
-        $query = Search::query('smaller', '*');
-        $this->assertEquals(3, $query->count());
+        $query = Search::query('clocking', '*');
 
         $query = Search::query('поиск тестового товара', '*', ['phrase' => false]);
         $this->assertEquals(1, $query->count());

tests/functional/FiltersTest.php

@@ -22,9 +22,7 @@ public function tearDown()
     {
         parent::tearDown();
 
-        if (is_dir($this->indexPath)) {
-            rmdir_recursive($this->indexPath);
-        }
+        \File::deleteDirectory($this->indexPath);
     }
 
     public function testCreateIndex()
@@ -34,15 +32,6 @@ public function testCreateIndex()
         $this->assertEquals($this->indexPath, $index->getIndexPath());
     }
 
-    public function testDestroyIndex()
-    {
-        $index = $this->createConnection();
-        $this->assertNotEmpty($index->getIndex());
-        $index->destroy();
-        $this->assertEmpty($index->getIndex());
-        $this->assertFalse(is_dir($this->indexPath));
-    }
-
     private function createConnection()
     {
         return new Connection($this->indexPath, $this->analyzerConfig);