Added skip to aggregation

Author: jenssegers

src/Jenssegers/Mongodb/Builder.php

@@ -18,12 +18,12 @@ class Builder extends \Illuminate\Database\Query\Builder {
     * @var array
     */
     protected $conversion = array(
-        '=' => '=',
+        '='  => '=',
         '!=' => '$ne',
         '<>' => '$ne',
-        '<' => '$lt',
+        '<'  => '$lt',
         '<=' => '$lte',
-        '>' => '$gt',
+        '>'  => '$gt',
         '>=' => '$gte',
     );
 
@@ -121,7 +121,8 @@ public function getFresh($columns = array('*'))
 
             // Apply order and limit
             if ($this->orders) $pipeline[] = array('$sort' => $this->orders);
-            if ($this->limit) $pipeline[] = array('$limit' => $this->limit);
+            if ($this->offset) $pipeline[] = array('$skip' => $this->offset);
+            if ($this->limit)  $pipeline[] = array('$limit' => $this->limit);
 
             $results = $this->collection->aggregate($pipeline);
 
@@ -150,7 +151,7 @@ public function getFresh($columns = array('*'))
             // Apply order, offset and limit
             if ($this->orders) $cursor->sort($this->orders);
             if ($this->offset) $cursor->skip($this->offset);
-            if ($this->limit) $cursor->limit($this->limit);
+            if ($this->limit)  $cursor->limit($this->limit);
 
             // Return results
             return iterator_to_array($cursor, false);

src/Jenssegers/Mongodb/Connection.php

@@ -105,14 +105,14 @@ protected function getDsn(array $config)
             $dsn .= "{$username}:{$password}@";
         }
 
-        $dsn.= "{$host}";
+        $dsn .= "{$host}";
 
         if (isset($config['port']))
         {
             $dsn .= ":{$port}";
         }
 
-        $dsn.= "/{$database}";
+        $dsn .= "/{$database}";
 
         return $dsn;
     }

tests/ModelQueryTest.php

@@ -244,10 +244,20 @@ public function testGroupBy()
 		$users = User::groupBy('age')->get();
 		$this->assertEquals(6, count($users));
 
+		$users = User::groupBy('age')->skip(1)->get();
+		$this->assertEquals(5, count($users));
+
+		$users = User::groupBy('age')->take(2)->get();
+		$this->assertEquals(2, count($users));
+
 		$users = User::groupBy('age')->orderBy('age', 'desc')->get();
 		$this->assertEquals(37, $users[0]->age);
 		$this->assertEquals(35, $users[1]->age);
 		$this->assertEquals(33, $users[2]->age);
+
+		$users = User::groupBy('age')->skip(1)->take(2)->orderBy('age', 'desc')->get();
+		$this->assertEquals(35, $users[0]->age);
+		$this->assertEquals(33, $users[1]->age);
 	}
 
 	public function testSubquery()