Merge pull request #20 from divine/pr/19

merge

Author: divine

.codacy.yml

@@ -0,0 +1,2 @@
+exclude_paths:
+    - '.github/**'

.github/ISSUE_TEMPLATE/BUG_REPORT.md

@@ -0,0 +1,25 @@
+---
+name: "Bug report"
+about: 'Report errors or unexpected behavior.'
+---
+
+- Laravel-mongodb Version: #.#.#
+- PHP Version: #.#.#
+- Database Driver & Version:
+
+### Description:
+
+### Steps to reproduce
+1.
+2.
+3.
+
+### Expected behaviour
+Tell us what should happen
+
+### Actual behaviour
+Tell us what happens instead
+
+<details><summary><b>Logs</b>:</summary>
+Insert log.txt here (if necessary)
+</details>

.github/ISSUE_TEMPLATE/FEATURE-REQUEST.md

@@ -0,0 +1,18 @@
+---
+name: Feature request
+about: Suggest an idea.
+title: "[Feature Request] "
+
+---
+
+### Is your feature request related to a problem?
+A clear and concise description of what the problem is.
+
+### Describe the solution you'd like
+A clear and concise description of what you want to happen.
+
+### Describe alternatives you've considered
+A clear and concise description of any alternative solutions or features you've considered.
+
+### Additional context
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/QUESTION.md

@@ -0,0 +1,8 @@
+---
+name: Question
+about: Ask a question.
+title: "[Question] "
+labels: 'question'
+assignees: ''
+
+---

README.md

@@ -16,6 +16,7 @@ This package adds functionalities to the Eloquent model and Query builder for Mo
     - [Lumen](#lumen)
     - [Non-Laravel projects](#non-laravel-projects)
   - [Testing](#testing)
+  - [Database Testing](#database-testing)
   - [Configuration](#configuration)
   - [Eloquent](#eloquent)
     - [Extending the base model](#extending-the-base-model)
@@ -113,6 +114,25 @@ To run the test for this package, run:
 docker-compose up
 ```
 
+Database Testing
+-------
+
+To reset the database after each test, add:
+
+```php
+use Illuminate\Foundation\Testing\DatabaseMigrations;
+```
+
+Also inside each test classes, add:
+
+```php
+use DatabaseMigrations;
+```
+
+Keep in mind that these traits are not yet supported:
+- `use Database Transactions;`
+- `use RefreshDatabase;`
+
 Configuration
 -------------
 You can use MongoDB either as the main database, either as a side database. To do so, add a new `mongodb` connection to `config/database.php`:
@@ -460,7 +480,7 @@ Selects documents where values match a specified regular expression.
 ```php
 use MongoDB\BSON\Regex;
 
-User::where('name', 'regex', new Regex("/.*doe/i"))->get();
+User::where('name', 'regex', new Regex('.*doe', 'i'))->get();
 ```
 
 **NOTE:** you can also use the Laravel regexp operations. These are a bit more flexible and will automatically convert your regular expression string to a `MongoDB\BSON\Regex` object.

composer.json

@@ -23,15 +23,15 @@
         "illuminate/container": "^5.8|^6.0|^7.0",
         "illuminate/database": "^5.8|^6.0|^7.0",
         "illuminate/events": "^5.8|^6.0|^7.0",
-        "mongodb/mongodb": "^1.4",
-        "cedx/coveralls": "^11.2"
+        "mongodb/mongodb": "^1.4"
     },
     "require-dev": {
         "phpunit/phpunit": "^6.0|^7.0|^8.0",
         "orchestra/testbench": "^3.1|^4.0",
         "mockery/mockery": "^1.0",
         "doctrine/dbal": "^2.5",
-        "phpunit/phpcov": "^6.0"
+        "phpunit/phpcov": "^6.0",
+        "cedx/coveralls": "^11.2"
     },
     "autoload": {
         "psr-0": {

src/Jenssegers/Mongodb/Connection.php

@@ -38,7 +38,7 @@ public function __construct(array $config)
         $this->connection = $this->createConnection($dsn, $config, $options);
 
         // Select database
-        $this->db = $this->connection->selectDatabase($config['database']);
+        $this->db = $this->connection->selectDatabase($this->getDatabaseDsn($dsn, $config['database']));
 
         $this->useDefaultPostProcessor();
 
@@ -188,10 +188,21 @@ protected function getHostDsn(array $config)
 
         // Check if we want to authenticate against a specific database.
         $auth_database = isset($config['options']) && !empty($config['options']['database']) ? $config['options']['database'] : null;
-
         return 'mongodb://' . implode(',', $hosts) . ($auth_database ? '/' . $auth_database : '');
     }
 
+    /**
+     * Get database name from DSN string, if there is no database in DSN path - returns back $database argument.
+     * @param string $dsn
+     * @param $database
+     * @return string
+     */
+    protected function getDatabaseDsn($dsn, $database)
+    {
+        $dsnDatabase = trim(parse_url($dsn, PHP_URL_PATH), '/');
+        return trim($dsnDatabase) ? $dsnDatabase : $database;
+    }
+
     /**
      * Create a DSN string from a configuration.
      * @param array $config

src/Jenssegers/Mongodb/Query/Builder.php

@@ -384,10 +384,12 @@ public function getFresh($columns = [])
             if ($this->limit) {
                 $options['limit'] = $this->limit;
             }
+            if ($this->hint) {
+                $options['hint'] = $this->hint;
+            }
             if ($columns) {
                 $options['projection'] = $columns;
             }
-            // if ($this->hint)    $cursor->hint($this->hint);
 
             // Fix for legacy support, converts the results to arrays instead of objects.
             $options['typeMap'] = ['root' => 'array', 'document' => 'array'];
@@ -698,7 +700,11 @@ public function from($collection, $as = null)
      */
     public function truncate()
     {
-        $result = $this->collection->drop();
+        $options = [
+            'typeMap' => ['root' => 'object', 'document' => 'object'],
+        ];
+
+        $result = $this->collection->drop($options);
 
         return (1 == (int) $result->ok);
     }

src/Jenssegers/Mongodb/Schema/Blueprint.php

@@ -129,8 +129,18 @@ protected function transformColumns($indexOrColumns)
             // Transform the columns to the index name.
             $transform = [];
 
-            foreach ($indexOrColumns as $column) {
-                $transform[$column] = $column . '_1';
+            foreach ($indexOrColumns as $key => $value) {
+                if (is_int($key)) {
+                    // There is no sorting order, use the default.
+                    $column = $value;
+                    $sorting = '1';
+                } else {
+                    // This is a column with sorting order e.g 'my_column' => -1.
+                    $column = $key;
+                    $sorting = $value;
+                }
+
+                $transform[$column] = $column . "_" . $sorting;
             }
 
             $indexOrColumns = implode('_', $transform);

tests/ModelTest.php

@@ -572,4 +572,13 @@ public function testChunkById(): void
 
         $this->assertEquals(3, $count);
     }
+
+    public function testTruncateModel()
+    {
+        User::create(['name' => 'John Doe']);
+
+        User::truncate();
+
+        $this->assertEquals(0, User::count());
+    }
 }

tests/QueryBuilderTest.php

@@ -175,7 +175,8 @@ public function testDelete()
     public function testTruncate()
     {
         DB::collection('users')->insert(['name' => 'John Doe']);
-        DB::collection('users')->truncate();
+        $result = DB::collection('users')->truncate();
+        $this->assertEquals(1, $result);
         $this->assertEquals(0, DB::collection('users')->count());
     }
 
@@ -737,4 +738,25 @@ public function testValue()
         $this->assertEquals('Herman', DB::collection('books')->value('author.first_name'));
         $this->assertEquals('Melville', DB::collection('books')->value('author.last_name'));
     }
+
+    public function testHintOptions()
+    {
+        DB::collection('items')->insert([
+            ['name' => 'fork',  'tags' => ['sharp', 'pointy']],
+            ['name' => 'spork', 'tags' => ['sharp', 'pointy', 'round', 'bowl']],
+            ['name' => 'spoon', 'tags' => ['round', 'bowl']],
+        ]);
+
+        $results = DB::collection('items')->hint(['$natural' => -1])->get();
+
+        $this->assertEquals('spoon', $results[0]['name']);
+        $this->assertEquals('spork', $results[1]['name']);
+        $this->assertEquals('fork', $results[2]['name']);
+
+        $results = DB::collection('items')->hint(['$natural' => 1])->get();
+
+        $this->assertEquals('spoon', $results[2]['name']);
+        $this->assertEquals('spork', $results[1]['name']);
+        $this->assertEquals('fork', $results[0]['name']);
+    }
 }

tests/SchemaTest.php

@@ -132,6 +132,20 @@ public function testDropIndex(): void
         $index = $this->getIndex('newcollection', 'field_a_1_field_b_1');
         $this->assertFalse($index);
 
+        Schema::collection('newcollection', function ($collection) {
+            $collection->index(['field_a' => -1, 'field_b' => 1]);
+        });
+
+        $index = $this->getIndex('newcollection', 'field_a_-1_field_b_1');
+        $this->assertNotNull($index);
+
+        Schema::collection('newcollection', function ($collection) {
+            $collection->dropIndex(['field_a' => -1, 'field_b' => 1]);
+        });
+
+        $index = $this->getIndex('newcollection', 'field_a_-1_field_b_1');
+        $this->assertFalse($index);
+
         Schema::collection('newcollection', function ($collection) {
             $collection->index(['field_a', 'field_b'], 'custom_index_name');
         });