Preparing for laravel 4.1, fixes #60

Author: jenssegers

composer.json

@@ -25,4 +25,4 @@
         }
     },
     "minimum-stability": "dev"
-}
+}

phpunit.xml

@@ -23,5 +23,9 @@
         <testsuite name="cache">
             <directory>tests/CacheTest.php</directory>
         </testsuite>
+        <testsuite name="builder">
+            <directory>tests/QueryBuilderTest.php</directory>
+            <directory>tests/QueryTest.php</directory>
+        </testsuite>
     </testsuites>
 </phpunit>

src/Jenssegers/Mongodb/Builder.php

@@ -277,13 +277,14 @@ public function orderBy($column, $direction = 'asc')
      * @param  string  $column
      * @param  array   $values
      * @param  string  $boolean
-     * @return \Illuminate\Database\Query\Builder
+     * @param  bool  $not
+     * @return Builder
      */
-    public function whereBetween($column, array $values, $boolean = 'and')
+    public function whereBetween($column, array $values, $boolean = 'and', $not = false)
     {
         $type = 'between';
 
-        $this->wheres[] = compact('column', 'type', 'boolean', 'values');
+        $this->wheres[] = compact('column', 'type', 'boolean', 'values', 'not');
 
         return $this;
     }
@@ -739,11 +740,32 @@ protected function compileWhereBetween($where)
     {
         extract($where);
 
-        return array(
-            $column => array(
-                '$gte' => $values[0],
-                '$lte' => $values[1])
+        if ($not)
+        {
+            return array(
+                '$or' => array(
+                    array(
+                        $column => array(
+                            '$lte' => $values[0]
+                        )
+                    ),
+                    array(
+                        $column => array(
+                            '$gte' => $values[1]
+                        )
+                    )
+                )
             );
+        }
+        else
+        {
+            return array(
+                $column => array(
+                    '$gte' => $values[0],
+                    '$lte' => $values[1]
+                )
+            );
+        }
     }
 
     protected function compileWhereRaw($where)

tests/QueryTest.php

@@ -103,6 +103,10 @@ public function testBetween()
 
 		$users = User::whereBetween('age', array(13, 23))->get();
 		$this->assertEquals(2, count($users));
+
+		// testing whereNotBetween for version 4.1
+		$users = User::whereBetween('age', array(0, 25), 'and', true)->get();
+		$this->assertEquals(6, count($users));
 	}
 
 	public function testIn()