Merge remote-tracking branch 'origin/master'

Author: babenkoivan

README.md

@@ -134,7 +134,7 @@ More about index settings you can find in the [index management section](https:/
 To create an index just run the artisan command:
 
 ```
-php artisan elastic:create-index App\\MyIndexConfigurator
+php artisan elastic:create-index "App\MyIndexConfigurator"
 ```
 
 Note, that every searchable model requires its own index configurator.
@@ -200,7 +200,7 @@ We'll take a closer look at it in [the search rules section](#search-rules).
 After setting up a mapping in your model you can update an Elasticsearch type mapping:
 
 ```
-php artisan elastic:update-mapping App\\MyModel
+php artisan elastic:update-mapping "App\MyModel"
 ```
 
 ## Usage
@@ -461,13 +461,13 @@ Before you run the command, make sure that your index configurator uses the `Sco
 If it's not, add the trait and run the artisan `elastic:update-index` command using your index configurator class name as an argument:
 
 ```
-php artisan elastic:update-index App\\MyIndexConfigurator
+php artisan elastic:update-index "App\MyIndexConfigurator"
 ```
 
 When you are ready, make changes in the model mapping and run the `elastic:migrate` command using the model class as the first argument and desired index name as the second argument:
 
 ```
-php artisan elastic:migrate App\\MyModel my_index_v2
+php artisan elastic:migrate "App\MyModel" my_index_v2
 ``` 
 
 Note, that if you need just to add new fields in your mapping, use the `elastic:update-mapping` command.

src/Builders/FilterBuilder.php

@@ -366,19 +366,21 @@ public function whereGeoPolygon($field, array $points)
     /**
      * Add a whereGeoShape condition.
      *
-     * @see https://www.elastic.co/guide/en/elasticsearch/guide/current/querying-geo-shapes.html Querying Geo Shapes
+     * @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-geo-shape-query.html Querying Geo Shapes
      *
      * @param string $field
      * @param array $shape
+     * @param string $relation 
      * @return $this
      */
-    public function whereGeoShape($field, array $shape)
+    public function whereGeoShape($field, array $shape, $relation = 'INTERSECTS')
     {
         $this->wheres['must'][] = [
             'geo_shape' => [
                 $field => [
                     'shape' => $shape,
-                ],
+                    'relation' => $relation
+                ]
             ],
         ];
 

tests/Builders/FilterBuilderTest.php

@@ -350,8 +350,10 @@ public function testWhereGeoShape()
             ],
         ];
 
+        $relation = 'WITHIN';
+        
         $builder = (new FilterBuilder($this->mockModel()))
-            ->whereGeoShape('foo', $shape);
+            ->whereGeoShape('foo', $shape, $relation);
 
         $this->assertEquals(
             [
@@ -360,6 +362,7 @@ public function testWhereGeoShape()
                         'geo_shape' => [
                             'foo' => [
                                 'shape' => $shape,
+                                'relation' => $relation
                             ],
                         ],
                     ],