adding ability to find and filter by attributes

README.md

@@ -452,7 +452,7 @@ Returns a copy of the array containing no duplicate values. Unlike Underscore.js
 __::uniq(array(2, 2, 4, 4, 4, 1, 1, 1)); // array(2, 4, 1)
 ```
 
-## union
+### union
 
 ```php
 __::union(*arrays)

test/CollectionsTest.php

@@ -2,6 +2,12 @@
 
 class UnderscoreCollectionsTest extends PHPUnit_Framework_TestCase {
 
+  public $assoc  = [
+    ["name" => "joe", "job" => "plumber"],
+    ["name" => "fred", "job" => "plumber"],
+    ["name" => "john", "job" => "barber"],
+  ];
+
   public function testEach() {
     // from js
     $test =& $this;
@@ -87,6 +93,13 @@ public function testFind() {
     $this->assertEquals(2, __::find(array(1,2,3), function($num) { return $num * 2 === 4; }), 'found the first "2" and broke the loop');
 
     // extra
+    $this->assertEquals(__::find($this->assoc, ['name' => 'fred'])['name'], 'fred');
+    $this->assertEquals(__::find($this->assoc, ['name' => 'fred', 'job' => 'plumber'])['name'], 'fred');
+
+    $obj = (object) $this->assoc;
+    $this->assertEquals(__::find($obj, ['name' => 'fred'])['name'], 'fred');
+    $this->assertEquals(__::find($obj, ['name' => 'fred', 'job' => 'plumber'])['name'], 'fred');
+
     $iterator = function($n) { return $n % 2 === 0; };
     $this->assertEquals(2, __::find(array(1, 2, 3, 4, 5, 6), $iterator));
     $this->assertEquals(false, __::find(array(1, 3, 5), $iterator));
@@ -112,7 +125,13 @@ public function testFilter() {
     $iterator = function($num) { return $num % 2 !== 0; };
     $this->assertEquals(__::filter(array(1,3,5), $iterator), __::select(array(1,3,5), $iterator), 'alias works');
 
-    // docs
+    $this->assertEquals(__::filter($this->assoc, ['job' => "barber"])[0]['name'], 'john');
+    $this->assertEquals(__::filter($this->assoc, ['job' => "plumber", 'name' => 'fred'])[0]['name'], 'fred');
+
+    $obj = (object) $this->assoc;
+    $this->assertEquals(__::filter($obj, ['job' => "barber"])[0]['name'], 'john');
+    $this->assertEquals(__::filter($obj, ['job' => "plumber", 'name' => 'fred'])[0]['name'], 'fred');
+
     $this->assertEquals(array(2,4), __::filter(array(1, 2, 3, 4), function($num) { return $num % 2 === 0; }));
   }
 

underscore.php

@@ -200,11 +200,13 @@ public function filter($collection=null, $iterator=null) {
     list($collection, $iterator) = self::_wrapArgs(func_get_args(), 2);
 
     $collection = self::_collection($collection);
+    $iterator = __::isArray($iterator) ? $this->matchFunct($iterator) : $iterator;
 
-    $return = array();
+    $return = [];
     foreach($collection as $val) {
-      if(call_user_func($iterator, $val)) $return[] = $val;
+      if (call_user_func($iterator, $val)) $return[] = $val;
     }
+
     return self::_wrap($return);
   }
 
@@ -229,10 +231,11 @@ public function detect($collection=null, $iterator=null) { return self::find($co
   public function find($collection=null, $iterator=null) {
     list($collection, $iterator) = self::_wrapArgs(func_get_args(), 2);
 
+    $iterator = __::isArray($iterator) ? $this->matchFunct($iterator) : $iterator;
     $collection = self::_collection($collection);
 
     foreach($collection as $val) {
-      if(call_user_func($iterator, $val)) return $val;
+      if (call_user_func($iterator, $val)) return $val;
     }
     return self::_wrap(false);
   }
@@ -1128,6 +1131,23 @@ private function _wrapArgs($caller_args, $num_args=null) {
     return array_pad($filled_args, $num_args, null);
   }
 
+  private function matchFunct($keyVals) {
+    return function ($item) use ($keyVals) {
+      foreach($keyVals as $key => $val) {
+        if ($this->getVal($item, $key) !== $val) return false;
+      }
+      return true;
+    };
+  }
+
+  private function getVal($item, $key) {
+    if (__::isObject($item)) {
+      return property_exists($item, $key) ? $item->{$key} : null;
+    } elseif (__::isArray($item)) {
+      return array_key_exists($key, $item) ? $item[$key] : null;
+    }
+    return null;
+  }
 
   // Get a collection in a way that supports strings
   private function _collection($collection) {